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}"