Bug 627606 - Remove PGO hack on Win64. r=ted a=bsmedberg

dothq · Feb 9, 2011 · 111d919 · 111d919
1 parent f4d7834
commit 111d919
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
@@ -60,8 +60,10 @@ ifeq ($(OS_ARCH),SunOS)
 MODULE_OPTIMIZE_FLAGS = -xO5
 endif
 ifeq ($(OS_ARCH),WINNT)
+ifneq ($(OS_TEST),x86_64)
 # FIXME: bug 413019
 OS_COMPILE_CFLAGS += -GL-
+endif
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif

diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
@@ -55,8 +55,10 @@ ifeq ($(OS_ARCH),SunOS)
 MODULE_OPTIMIZE_FLAGS = -xO5
 endif
 ifeq ($(OS_ARCH),WINNT)
+ifneq ($(OS_TEST),x86_64)
 # FIXME: bug 413019
 OS_COMPILE_CFLAGS += -GL-
+endif
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif

diff --git a/jpeg/Makefile.in b/jpeg/Makefile.in
@@ -47,11 +47,13 @@ LIBRARY_NAME	= mozjpeg
 
 ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= jpeg32$(VERSION_NUMBER)
+ifneq ($(OS_TEST),x86_64)
 # FIXME: bug 413019
 ifndef GNU_CC
 OS_COMPILE_CFLAGS += -GL-
 endif
 endif
+endif
 
 GRE_MODULE	= 1
 

diff --git a/modules/libimg/png/Makefile.in b/modules/libimg/png/Makefile.in
@@ -51,10 +51,12 @@ LIBXUL_LIBRARY = 1
 
 ifndef GNU_CC
 ifeq ($(OS_ARCH),WINNT)
+ifneq ($(OS_TEST),x86_64)
 # FIXME: bug 413019
 OS_COMPILE_CFLAGS += -GL-
 endif
 endif
+endif
 
 
 CSRCS		= \

diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -60,8 +60,10 @@ DEFINES		+= -DMOZ_USE_STDCALL -DMOZ_NEED_LEADING_UNDERSCORE
 endif
 else
 
+ifneq ($(OS_TEST),x86_64)
 # FIXME: bug 413019
 OS_COMPILE_CXXFLAGS += -GL-
+endif
 
 CPPSRCS		= xptcinvoke.cpp xptcstubs.cpp