Merge remote-tracking branch 'origin/master' into custom

js/src/jit/JitOptions.cpp

@@ -126,12 +126,8 @@ DefaultJitOptions::DefaultJitOptions()
     SET_DEFAULT(disableSharedStubs, false);
 
     // Toggles whether sincos optimization is globally disabled.
-    // See bug984018: The MacOS is the only one that has the sincos fast.
-    #if defined(XP_MACOSX)
-        SET_DEFAULT(disableSincos, false);
-    #else
-        SET_DEFAULT(disableSincos, true);
-    #endif
+    // See bug 984018 as to why this is disabled.
+    SET_DEFAULT(disableSincos, true);
 
     // Toggles whether sink code motion is globally disabled.
     SET_DEFAULT(disableSink, true);

js/src/old-configure.in

@@ -1,5 +1,4 @@
 dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
-dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4:
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -567,11 +566,6 @@ case "$host" in
     esac
     ;;
 
-*-darwin*)
-    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-    ;;
-
 *-linux*|*-kfreebsd*-gnu|*-gnu*)
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"

js/xpconnect/shell/xpcshell.cpp

@@ -10,9 +10,6 @@
 #include "mozilla/WindowsDllBlocklist.h"
 
 #include "nsXULAppAPI.h"
-#ifdef XP_MACOSX
-#include "xpcshellMacUtils.h"
-#endif
 #ifdef XP_WIN
 #include <windows.h>
 #include <shlobj.h>
@@ -37,10 +34,6 @@ main(int argc, char** argv, char** envp)
     gtk_parse_args(&argc, &argv);
 #endif
 
-#ifdef XP_MACOSX
-    InitAutoreleasePool();
-#endif
-
     // unbuffer stdout so that output is in the correct order; note that stderr
     // is unbuffered by default
     setbuf(stdout, 0);
@@ -51,9 +44,5 @@ main(int argc, char** argv, char** envp)
 
     int result = XRE_XPCShellMain(argc, argv, envp);
 
-#ifdef XP_MACOSX
-    FinishAutoreleasePool();
-#endif
-
     return result;
 }

js/xpconnect/src/Sandbox.cpp

@@ -127,16 +127,6 @@ SandboxDump(JSContext* cx, unsigned argc, Value* vp)
     if (!cstr)
         return false;
 
-#if defined(XP_MACOSX)
-    // Be nice and convert all \r to \n.
-    char* c = cstr;
-    char* cEnd = cstr + strlen(cstr);
-    while (c < cEnd) {
-        if (*c == '\r')
-            *c = '\n';
-        c++;
-    }
-#endif
 #ifdef ANDROID
     __android_log_write(ANDROID_LOG_INFO, "GeckoDump", cstr);
 #endif

js/xpconnect/src/XPCJSContext.cpp

@@ -3209,12 +3209,7 @@ XPCJSContext::Initialize()
     // the web to base this decision primarily on the default stack size that the
     // underlying platform makes available, but that seems to be what we do. :-(
 
-#if defined(XP_MACOSX) || defined(DARWIN)
-    // MacOS has a gargantuan default stack size of 8MB. Go wild with 7MB,
-    // and give trusted script 180k extra. The stack is huge on mac anyway.
-    const size_t kStackQuota = 7 * 1024 * 1024;
-    const size_t kTrustedScriptBuffer = 180 * 1024;
-#elif defined(MOZ_ASAN)
+#if defined(MOZ_ASAN)
     // ASan requires more stack space due to red-zones, so give it double the
     // default (1MB on 32-bit, 2MB on 64-bit). ASAN stack frame measurements
     // were not taken at the time of this writing, so we hazard a guess that

js/xpconnect/src/XPCShellImpl.cpp

@@ -1288,22 +1288,6 @@ XRE_XPCShellMain(int argc, char** argv, char** envp)
         argc -= 2;
         argv += 2;
     } else {
-#ifdef XP_MACOSX
-        // On OSX, the GreD needs to point to Contents/Resources in the .app
-        // bundle. Libraries will be loaded at a relative path to GreD, i.e.
-        // ../MacOS.
-        nsCOMPtr<nsIFile> tmpDir;
-        XRE_GetFileFromPath(argv[0], getter_AddRefs(greDir));
-        greDir->GetParent(getter_AddRefs(tmpDir));
-        tmpDir->Clone(getter_AddRefs(greDir));
-        tmpDir->SetNativeLeafName(NS_LITERAL_CSTRING("Resources"));
-        bool dirExists = false;
-        tmpDir->Exists(&dirExists);
-        if (dirExists) {
-            greDir = tmpDir.forget();
-        }
-        dirprovider.SetGREDirs(greDir);
-#else
         nsAutoString workingDir;
         if (!GetCurrentWorkingDirectory(workingDir)) {
             printf("GetCurrentWorkingDirectory failed.\n");
@@ -1314,7 +1298,6 @@ XRE_XPCShellMain(int argc, char** argv, char** envp)
             printf("NS_NewLocalFile failed.\n");
             return 1;
         }
-#endif
     }
 
     if (argc > 1 && !strcmp(argv[1], "-a")) {
@@ -1570,13 +1553,6 @@ XPCShellDirProvider::SetGREDirs(nsIFile* greDir)
 {
     mGREDir = greDir;
     mGREDir->Clone(getter_AddRefs(mGREBinDir));
-#ifdef XP_MACOSX
-    nsAutoCString leafName;
-    mGREDir->GetNativeLeafName(leafName);
-    if (leafName.Equals("Resources")) {
-        mGREBinDir->SetNativeLeafName(NS_LITERAL_CSTRING("MacOS"));
-    }
-#endif
 }
 
 void