From 3daf711085889bad1bd68651bc4e8790412ae105 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@dbsoft.org>
Date: Tue, 26 Apr 2022 10:13:11 -0500
Subject: =?UTF-8?q?Issue=20#1829=20-=20Revert=20=E2=80=9CIssue=20#1751=20-?=
 =?UTF-8?q?-=20Remove=20XP=5FMACOSX=20conditionals=20from=20the=20rest=20o?=
 =?UTF-8?q?f=20the=20tree.=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.

This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
---
 js/src/jit/JitOptions.cpp | 8 ++++++--
 js/src/old-configure.in   | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'js/src')

diff --git a/js/src/jit/JitOptions.cpp b/js/src/jit/JitOptions.cpp
index d14aac1941..daae3d53b5 100644
--- a/js/src/jit/JitOptions.cpp
+++ b/js/src/jit/JitOptions.cpp
@@ -126,8 +126,12 @@ DefaultJitOptions::DefaultJitOptions()
     SET_DEFAULT(disableSharedStubs, false);
 
     // Toggles whether sincos optimization is globally disabled.
-    // See bug 984018 as to why this is disabled.
-    SET_DEFAULT(disableSincos, true);
+    // 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
 
     // Toggles whether sink code motion is globally disabled.
     SET_DEFAULT(disableSink, true);
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index ec599b676d..e5ec98a8a2 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1,4 +1,5 @@
 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/.
@@ -561,6 +562,11 @@ 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}"
-- 
cgit v1.2.3