From 333013f148ee3cff4bd4a9f1d33b16660e858fc5 Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Fri, 23 Mar 2018 14:35:30 -0500
Subject: [PATCH] Bug 1443823 Apply no-keep-inline-dllexport to MinGW x64 also
 r=glandium

MozReview-Commit-ID: 2Nyw738ZHou

--HG--
extra : rebase_source : 4a18e47f8f1cb425864811230fd33c6620760021
---
 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 5f1fb780816a..b3d00ab81fb9 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -797,11 +797,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 71cb1f9586de..7e80fccf4902 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1041,11 +1041,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"