Bug 1318833 - Part 4: Remove -allow_heap_execute linker flag that is no longer needed for Silverlight. r=ted
authorChris Peterson <cpeterson@mozilla.com>
Mon, 21 Nov 2016 21:11:30 -0800
changeset 323752 4bf6b81fa61a2655de5138ca727c01e140b94b9e
parent 323751 138abd270223714144ab8010e80499909980e406
child 323753 1a3194836cb4c3da6ba3a9742a2d25cf26669b55
child 323792 718387d11e93d8b41cf2389a03c4c3bda44d43df
push id30981
push usercbook@mozilla.com
push dateTue, 22 Nov 2016 14:53:38 +0000
treeherdermozilla-central@1a3194836cb4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1318833
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1318833 - Part 4: Remove -allow_heap_execute linker flag that is no longer needed for Silverlight. r=ted
ipc/app/moz.build
old-configure.in
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -84,18 +84,16 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_
         'mozsandbox',
     ]
 
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
     # a console application.
     WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
-LDFLAGS += CONFIG['MOZ_ALLOW_HEAP_EXECUTE_FLAGS']
-
 # Control the default heap size.
 # This is the heap returned by GetProcessHeap().
 # As we use the CRT heap, the default size is too large and wastes VM.
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.
--- a/old-configure.in
+++ b/old-configure.in
@@ -910,31 +910,16 @@ case "$target" in
             MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip"
         else
             AC_MSG_RESULT([no])
         fi
 
         LDFLAGS=$_SAVE_LDFLAGS
     fi
 
-    dnl With newer linkers we need to pass -allow_heap_execute because of
-    dnl Microsoft Silverlight (5.1.10411.0 at least).
-    AC_MSG_CHECKING([for -allow_heap_execute option to ld])
-    _SAVE_LDFLAGS=$LDFLAGS
-    LDFLAGS="$LDFLAGS -Wl,-allow_heap_execute"
-    AC_TRY_LINK(,[return 0;],_HAVE_ALLOW_HEAP_EXECUTE=1,
-                _HAVE_ALLOW_HEAP_EXECUTE=)
-    if test -n "$_HAVE_ALLOW_HEAP_EXECUTE" ; then
-        AC_MSG_RESULT([yes])
-        MOZ_ALLOW_HEAP_EXECUTE_FLAGS="-Wl,-allow_heap_execute"
-    else
-        AC_MSG_RESULT([no])
-    fi
-    LDFLAGS=$_SAVE_LDFLAGS
-
     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
     ;;
 
 *-android*|*-linuxandroid*)
     AC_DEFINE(NO_PW_GECOS)
     if test -n "$gonkdir"; then
         _PLATFORM_HAVE_RIL=1
         MOZ_SYNTH_PICO=1
@@ -4321,17 +4306,16 @@ if test -n "$MOZ_OPTIMIZE"; then
     CFLAGS=$_SAVE_CFLAGS
 fi
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST(MOZ_OPTIMIZE)
 AC_SUBST(MOZ_FRAMEPTR_FLAGS)
 AC_SUBST(MOZ_OPTIMIZE_FLAGS)
 AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
-AC_SUBST_LIST(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
 AC_SUBST(MOZ_PGO_OPTIMIZE_FLAGS)
 
 dnl ========================================================
 dnl = Enable NS_StackWalk.
 dnl ========================================================
 
 # On Windows, NS_StackWalk will only work correctly if we have frame pointers
 # available. That will only be true for non-optimized builds, debug builds or