[tbb-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1443823 - Apply no-keep-inline-dllexport to MinGW x64 also. r=glandium, a=jcristau

[gk at torproject.org]

commit 934c7b276556e7060cceddd5843dbc52ce548a78
Author: Tom Ritter <tom at mozilla.com>
Date:   Fri Mar 23 14:35:30 2018 -0500

    Bug 1443823 - Apply no-keep-inline-dllexport to MinGW x64 also. r=glandium, a=jcristau
    
    MozReview-Commit-ID: 2Nyw738ZHou
    
    --HG--
    extra : source : cab870519a15f4c097b64f0d12295133fb5db90f
---
 js/src/old-configure.in | 9 +++++++--
 old-configure.in        | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 3fec4ece4d24..b9aa86c0d83b 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -798,11 +798,16 @@ case "$target" in
         ;;
     esac
 
+    if test -n "$GNU_CC"; then
+        CFLAGS="$CFLAGS -fno-keep-inline-dllexport"
+        CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport"
+    fi
+
     case "$target" in
     i*86-*)
         if test -n "$GNU_CC"; then
-            CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport"
-            CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport"
+            CFLAGS="$CFLAGS -mstackrealign"
+            CXXFLAGS="$CXXFLAGS -mstackrealign"
             LDFLAGS="$LDFLAGS -Wl,--large-address-aware"
         else
             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"
diff --git a/old-configure.in b/old-configure.in
index 774429b228e8..dd2fb701cd79 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1043,11 +1043,16 @@ case "$target" in
         ;;
     esac
 
+    if test -n "$GNU_CC"; then
+        CFLAGS="$CFLAGS -fno-keep-inline-dllexport"
+        CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport"
+    fi
+
     case "$target" in
     i*86-*)
         if test -n "$GNU_CC"; then
-            CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport"
-            CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport"
+            CFLAGS="$CFLAGS -mstackrealign"
+            CXXFLAGS="$CXXFLAGS -mstackrealign"
             LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware"
         else
             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"