Bug 556382 - Link 32-bit Windows builds with LARGEADDRESSAWARE. r=khuey, a=blocking2.0-betaN
authorMitchell Field <mitchell.field@live.com.au>
Fri, 19 Nov 2010 19:14:37 +1100
changeset 57891 6957f4aa855f8906c4534964febbe7d28908cfd8
parent 57890 e3d3bcffefa7de908c6e1015ae137f5a94d51390
child 57892 ab4cdb935ccff5059085337664d18f3593e5b570
push id17065
push usermitchell.field@live.com.au
push dateFri, 19 Nov 2010 08:19:47 +0000
treeherdermozilla-central@6957f4aa855f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, blocking2.0-betaN
bugs556382
milestone2.0b8pre
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 556382 - Link 32-bit Windows builds with LARGEADDRESSAWARE. r=khuey, a=blocking2.0-betaN
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -2410,17 +2410,17 @@ ia64*-hpux*)
         MOZ_JS_STATIC_LIBS='$(LIBXUL_DIST)/lib/js_static.lib'
         MOZ_JS_SHARED_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib'
         MOZ_FIX_LINK_PATHS=
         DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
         XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
         LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
         MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
         if test $_MSC_VER -ge 1400; then
-            LDFLAGS="$LDFLAGS -NXCOMPAT"
+            LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT"
             dnl For profile-guided optimization
             PROFILE_GEN_CFLAGS="-GL"
             PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT"
             dnl XXX: PGO builds can fail with warnings treated as errors,
             dnl specifically "no profile data available" appears to be
             dnl treated as an error sometimes. This might be a consequence
             dnl of using WARNINGS_AS_ERRORS in some modules, combined
             dnl with the linker doing most of the work in the whole-program
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2390,17 +2390,17 @@ ia64*-hpux*)
         fi
         MOZ_JS_LIBS='$(libdir)/mozjs.lib'
         MOZ_FIX_LINK_PATHS=
         DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
         XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
         LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
         MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
         if test $_MSC_VER -ge 1400; then
-            LDFLAGS="$LDFLAGS -NXCOMPAT"
+            LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT"
             dnl For profile-guided optimization
             PROFILE_GEN_CFLAGS="-GL"
             PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT"
             dnl XXX: PGO builds can fail with warnings treated as errors,
             dnl specifically "no profile data available" appears to be
             dnl treated as an error sometimes. This might be a consequence
             dnl of using WARNINGS_AS_ERRORS in some modules, combined
             dnl with the linker doing most of the work in the whole-program