Bug 627606 - Remove PGO hack on Win64. r=ted a=bsmedberg
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 09 Feb 2011 15:51:25 +0900
changeset 62216 fd0817e454feac162e709a0125967b65a76147fc
parent 62215 a74a5384f005c6e95483ea7f0e2ae779d0260564
child 62217 1c05e64aab5423ad08785b731b96139ccfaf12b7
push id18644
push userm_kato@ga2.so-net.ne.jp
push dateWed, 09 Feb 2011 06:52:06 +0000
treeherdermozilla-central@fd0817e454fe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, bsmedberg
bugs627606
milestone2.0b12pre
first release with
nightly linux32
fd0817e454fe / 4.0b12pre / 20110209030359 / files
nightly linux64
fd0817e454fe / 4.0b12pre / 20110209030359 / files
nightly mac
fd0817e454fe / 4.0b12pre / 20110209030359 / files
nightly win32
fd0817e454fe / 4.0b12pre / 20110209030359 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 627606 - Remove PGO hack on Win64. r=ted a=bsmedberg
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/libpixman/src/Makefile.in
jpeg/Makefile.in
modules/libimg/png/Makefile.in
xpcom/reflect/xptcall/src/md/win32/Makefile.in
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -55,18 +55,20 @@ LIBXUL_LIBRARY = 1
 ifdef GNU_CC
 OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
 MODULE_OPTIMIZE_FLAGS = -O2
 else
 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
 
 
 CSRCS   = \
         cairo.c \
         cairo-analysis-surface.c \
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -50,18 +50,20 @@ LIBXUL_LIBRARY = 1
 
 ifdef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -O2
 else
 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
 
 DEFINES += -DPIXMAN_NO_TLS
 
 # Build MMX code either with VC or with gcc-on-x86
 ifdef _MSC_VER
--- a/jpeg/Makefile.in
+++ b/jpeg/Makefile.in
@@ -42,21 +42,23 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= jpeg
 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
 
 CSRCS		= \
 		jdapimin.c \
 		jdapistd.c \
 		jdatasrc.c \
 		jdatadst.c \
--- a/modules/libimg/png/Makefile.in
+++ b/modules/libimg/png/Makefile.in
@@ -46,20 +46,22 @@ MODULE		= png
 LIBRARY_NAME	= mozpng
 ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= png
 endif
 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		= \
 		png.c \
 		pngerror.c \
 		pngget.c \
 		pngmem.c \
 		pngset.c \
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -55,18 +55,20 @@ CPPSRCS		= \
 		xptcstubs.cpp \
 		$(NULL)
 LOCAL_INCLUDES	= -I$(srcdir)/../unix
 ifneq ($(TARGET_CPU),x86_64)
 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
 
 endif
 
 
 LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src