Merge branch 'master' into Pale_Moon-release

# Conflicts:
#	application/palemoon/config/version.txt
#	old-configure.in

7 files changed, 3 insertions, 77 deletions

diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index 55b59ca83..072bd9ff9 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -145,7 +145,6 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/ipc',
     '/testing/gtest/mozilla',
-    '/toolkit/crashreporter',
     '/xpcom/build',
 ]
 
diff --git a/toolkit/xre/nsAndroidStartup.cpp b/toolkit/xre/nsAndroidStartup.cpp
index 47b9ec6e5..68ad75c01 100644
--- a/toolkit/xre/nsAndroidStartup.cpp
+++ b/toolkit/xre/nsAndroidStartup.cpp
@@ -17,7 +17,6 @@
 #include "nsIFile.h"
 #include "nsAppRunner.h"
 #include "APKOpen.h"
-#include "nsExceptionHandler.h"
 
 #define LOG(args...) __android_log_print(ANDROID_LOG_INFO, MOZ_APP_NAME, args)
 
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 26e432b3c..4ae70fd43 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2462,7 +2462,7 @@ RemoveComponentRegistries(nsIFile* aProfileDir, nsIFile* aLocalProfileDir,
   if (!file)
     return false;
 
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
 #define PLATFORM_FASL_SUFFIX ".mfasl"
 #elif defined(XP_WIN)
 #define PLATFORM_FASL_SUFFIX ".mfl"
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 3757dec2f..52b443770 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -32,7 +32,6 @@
 #include "nsAppRunner.h"
 #include "nsAutoRef.h"
 #include "nsDirectoryServiceDefs.h"
-#include "nsExceptionHandler.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
 #include "nsJSUtils.h"
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 &&
diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index ab0bdf005..aac856d6e 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -212,10 +212,8 @@ GetStatusFileContents(nsIFile *statusFile, char (&buf)[Size])
 typedef enum {
   eNoUpdateAction,
   ePendingUpdate,
-  ePendingService,
   ePendingElevate,
   eAppliedUpdate,
-  eAppliedService,
 } UpdateStatus;
 
 /**
@@ -233,22 +231,14 @@ GetUpdateStatus(nsIFile* dir, nsCOMPtr<nsIFile> &statusFile)
     char buf[32];
     if (GetStatusFileContents(statusFile, buf)) {
       const char kPending[] = "pending";
-      const char kPendingService[] = "pending-service";
       const char kPendingElevate[] = "pending-elevate";
       const char kApplied[] = "applied";
-      const char kAppliedService[] = "applied-service";
       if (!strncmp(buf, kPendingElevate, sizeof(kPendingElevate) - 1)) {
         return ePendingElevate;
       }
-      if (!strncmp(buf, kPendingService, sizeof(kPendingService) - 1)) {
-        return ePendingService;
-      }
       if (!strncmp(buf, kPending, sizeof(kPending) - 1)) {
         return ePendingUpdate;
       }
-      if (!strncmp(buf, kAppliedService, sizeof(kAppliedService) - 1)) {
-        return eAppliedService;
-      }
       if (!strncmp(buf, kApplied, sizeof(kApplied) - 1)) {
         return eAppliedUpdate;
       }
@@ -760,9 +750,6 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
 
   // We used to write out "Applying" to the update.status file here.
   // Instead we do this from within the updater application now.
-  // This is so that we don't overwrite the status of pending-service
-  // in the Windows case.  This change was made for all platforms so
-  // that it stays consistent across all OS.
 
   // On platforms where we are not calling execv, we may need to make the
   // updater executable wait for the calling process to exit.  Otherwise, the
@@ -969,17 +956,15 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
       }
       break;
     }
-    // Intentional fallthrough to ePendingUpdate and ePendingService.
+    // Intentional fallthrough to ePendingUpdate.
     MOZ_FALLTHROUGH;
   }
-  case ePendingUpdate:
-  case ePendingService: {
+  case ePendingUpdate: {
     ApplyUpdate(greDir, updatesDir, statusFile, appDir, argc, argv, restart,
                 isOSUpdate, osApplyToDir, pid);
     break;
   }
   case eAppliedUpdate:
-  case eAppliedService:
     // An update was staged and needs to be switched so the updated application
     // is used.
     SwitchToUpdatedApp(greDir, updatesDir, appDir, argc, argv);
diff --git a/toolkit/xre/nsX11ErrorHandler.cpp b/toolkit/xre/nsX11ErrorHandler.cpp
index 0fb0d29c5..9a6888adf 100644
--- a/toolkit/xre/nsX11ErrorHandler.cpp
+++ b/toolkit/xre/nsX11ErrorHandler.cpp
@@ -7,7 +7,6 @@
 
 #include "prenv.h"
 #include "nsXULAppAPI.h"
-#include "nsExceptionHandler.h"
 #include "nsDebug.h"
 
 #include "mozilla/X11Util.h"