diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-30 19:10:17 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-30 19:10:17 +0100 |
| commit | 25779d371c571e4f51792af3e3c5588b3186e934 (patch) | |
| tree | 5399f1a5456fb395b3780bfce49b4b170bd634b8 /toolkit/xre | |
| parent | 60d420b0ad6dc722b62b5c2948c865e2e61b8212 (diff) | |
| download | UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar.gz UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar.lz UXP-25779d371c571e4f51792af3e3c5588b3186e934.tar.xz UXP-25779d371c571e4f51792af3e3c5588b3186e934.zip | |
Issue #187: Remove solaris conditional code.
Diffstat (limited to 'toolkit/xre')
| -rw-r--r-- | toolkit/xre/nsSigHandlers.cpp | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp index 098d9ae7e..454882c1b 100644 --- a/toolkit/xre/nsSigHandlers.cpp +++ b/toolkit/xre/nsSigHandlers.cpp @@ -32,11 +32,6 @@ #endif #endif -#if defined(SOLARIS) -#include <sys/resource.h> -#include <ucontext.h> -#endif - static const char* gProgname = "huh?"; // Note: some tests manipulate this value. @@ -198,32 +193,6 @@ static void fpehandler(int signum, siginfo_t *si, void *context) *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ #endif #endif -#ifdef SOLARIS - ucontext_t *uc = (ucontext_t *)context; - -#if defined(__i386) - uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; - *cw |= FPU_EXCEPTION_MASK; - - uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; - *sw &= ~FPU_STATUS_FLAGS; - - /* address of the instruction that caused the exception */ - uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; - uc->uc_mcontext.gregs[REG_PC] = *ip; -#endif -#if defined(__amd64__) - uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; - *cw |= FPU_EXCEPTION_MASK; - - uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; - *sw &= ~FPU_STATUS_FLAGS; - - uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ -#endif -#endif } #endif @@ -286,30 +255,6 @@ void InstallSignalHandlers(const char *aProgname) } #endif -#if defined(SOLARIS) -#define NOFILES 512 - - // Boost Solaris file descriptors - { - struct rlimit rl; - - if (getrlimit(RLIMIT_NOFILE, &rl) == 0) - - if (rl.rlim_cur < NOFILES) { - rl.rlim_cur = NOFILES; - - if (setrlimit(RLIMIT_NOFILE, &rl) < 0) { - perror("setrlimit(RLIMIT_NOFILE)"); - fprintf(stderr, "Cannot exceed hard limit for open files"); - } -#if defined(DEBUG) - if (getrlimit(RLIMIT_NOFILE, &rl) == 0) - printf("File descriptors set to %d\n", rl.rlim_cur); -#endif //DEBUG - } - } -#endif //SOLARIS - #if defined(MOZ_WIDGET_GTK) && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6)) const char *assertString = PR_GetEnv("XPCOM_DEBUG_BREAK"); if (assertString && |