Bug 582910 - 64-bit win7: TEST-UNEXPECTED-FAIL | e4x/Regress/regress-347155.js | Exited with code -1073741571 during test run. r=dbaron, a=dbaron
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 09 Aug 2010 12:58:33 +0900
changeset 49184 4e8a688ab358166b38bfbb2c40ec8c2c72c5ccc6
parent 49183 3afff341c3ee103d445441d4796b337e004bbf49
child 49185 f34e7fb567076efced879fe87ebf76c6bdf0f1a0
child 49198 4b0fefe02eb5515bad7d2101809e59d6eafb2fd0
push idunknown
push userunknown
push dateunknown
reviewersdbaron, dbaron
bugs582910, 347155
milestone2.0b4pre
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 582910 - 64-bit win7: TEST-UNEXPECTED-FAIL | e4x/Regress/regress-347155.js | Exited with code -1073741571 during test run. r=dbaron, a=dbaron
browser/app/Makefile.in
embedding/tests/winEmbed/Makefile.in
ipc/app/Makefile.in
xulrunner/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -239,16 +239,20 @@ ifeq ($(OS_ARCH),WINNT)
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.
 #
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
+ifeq ($(OS_TEST),x86_64)
+# set stack to 2MB on x64 build.  See bug 582910
+LDFLAGS += -STACK:2097152
+endif
 endif
 endif
 
 $(PROGRAM): $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 
 ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
 
 $(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -71,14 +71,18 @@ include $(topsrcdir)/config/rules.mk
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.
 #
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
+ifeq ($(OS_TEST),x86_64)
+# set stack to 2MB on x64 build.  See bug 582910
+LDFLAGS += -STACK:2097152
+endif
 endif
 
 # Get rid of console window
 ifdef GNU_CC
 LDFLAGS += -mwindows
 endif
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -104,16 +104,20 @@ ifeq ($(OS_ARCH),WINNT)
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.
 #
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
+ifeq ($(OS_TEST),x86_64)
+# set stack to 2MB on x64 build.  See bug 582910
+LDFLAGS += -STACK:2097152
+endif
 endif
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 libs::
 	$(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app
 	rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/$(PROGRAM).app 
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -191,16 +191,20 @@ ifeq ($(OS_ARCH),WINNT)
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.
 #
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
+ifeq ($(OS_TEST),x86_64)
+# set stack to 2MB on x64 build.  See bug 582910
+LDFLAGS += -STACK:2097152
+endif
 endif
 endif
 
 ifneq (,$(filter-out OS2 WINCE WINNT BeOS,$(OS_ARCH)))
 ifeq (unix, $(MOZ_FS_LAYOUT))
 
 xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \