Bug 904831 - Part b: Move unconditional MSVC_ENABLE_PGO definitions into moz.build; r=gps

2013-08-22 08:56:01 +02:00 · 2013-08-22 08:56:01 +02:00 · bdfaa84f5b
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= -I$(srcdir)/../include \
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@ -20,3 +20,5 @@ LIBRARY_NAME = 'caps_s'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME    = chrome_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@ -19,3 +19,5 @@ CPP_SOURCES += [

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconbase_s
-MSVC_ENABLE_PGO := 1
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@ -174,3 +174,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconcvs_s
-MSVC_ENABLE_PGO := 1
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@ -78,3 +78,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconevents_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@ -71,3 +71,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconhtmlcon_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@ -158,3 +158,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += \
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@ -29,3 +29,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@ -10,7 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = gkconmedia_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/moz.build
+++ b/content/media/moz.build
@ -139,3 +139,5 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconxbl_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@ -40,3 +40,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= \
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@ -26,3 +26,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@ -25,3 +25,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@ -39,3 +39,5 @@ LIBRARY_NAME = 'gkconxultmpl_s'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -11,7 +11,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = basedocshell_s
-MSVC_ENABLE_PGO := 1
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@ -66,3 +66,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += -I$(srcdir)/../../base
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= jsdombase_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/dom/dom-config.mk

 ifdef MOZ_JSDEBUGGER
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -113,3 +113,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@ -10,7 +10,6 @@ VPATH            = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = dombindings_s
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY   = 1

 # Need this to find all our DOM source files.
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@ -30,3 +30,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@ -21,7 +21,6 @@ VPATH += $(srcdir)/fallback
 endif

 LIBRARY_NAME     = dom_mobilemessage_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/dom/dom-config.mk

 LOCAL_INCLUDES = \
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@ -83,3 +83,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkplugin
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@ -97,3 +97,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@ -10,7 +10,6 @@ VPATH            = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = domquota_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/dom/dom-config.mk

 LOCAL_INCLUDES = \
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@ -43,3 +43,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -9,7 +9,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= -I$(topsrcdir)/dom/base
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@ -16,3 +16,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@ -10,7 +10,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = jsdomstorage_s
-MSVC_ENABLE_PGO := 1
 LOCAL_INCLUDES = \
                -I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/events/src
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@ -27,3 +27,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@ -9,7 +9,6 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/base/src \
  -I$(topsrcdir)/content/events/src \
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@ -61,3 +61,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= cookie
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@ -24,3 +24,5 @@ CPP_SOURCES += [

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@ -11,7 +11,6 @@ VPATH		=  $(srcdir) $(srcdir)/unittest
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gfx2d
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY	= 1

 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@ -104,3 +104,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@ -9,7 +9,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@ -112,3 +112,5 @@ LIBRARY_NAME = 'angle'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@ -9,7 +9,6 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 ifdef GNU_CC
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@ -82,3 +82,5 @@ LIBRARY_NAME = 'mozcairo'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= mozlibpixman
-MSVC_ENABLE_PGO := 1
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@ -29,3 +29,5 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']:

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@ -10,7 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = gl
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY   = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef MOZ_WEBGL
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@ -118,3 +118,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/graphite2/src/Makefile.in
+++ b/gfx/graphite2/src/Makefile.in
@ -21,9 +21,6 @@ endif
 # get the lists of source files and exported headers
 include $(srcdir)/files.mk

-MSVC_ENABLE_PGO := 1
-
-# on Windows, we're going to link graphite with gkmedias instead of libxul
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 FORCE_STATIC_LIB = 1
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@ -65,3 +65,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'mozgraphite2'

+MSVC_ENABLE_PGO = True
+
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@ -32,7 +32,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 ifeq ($(OS_ARCH),WINNT)
 FORCE_STATIC_LIB = 1
 endif
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@ -57,3 +57,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'mozharfbuzz'

+MSVC_ENABLE_PGO = True
+
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@ -21,7 +21,6 @@ VPATH       = \
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = layers
-MSVC_ENABLE_PGO := 1
 ifdef MOZ_DEBUG
 DEFINES += -DD3D_DEBUG_INFO
 endif
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@ -270,3 +270,5 @@ IPDL_SOURCES = [

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@ -32,8 +32,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
-
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 FORCE_STATIC_LIB = 1
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@ -53,3 +53,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'mozots'

+MSVC_ENABLE_PGO = True
+
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@ -9,7 +9,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 CSRCS = \
  chain.c \
  iccread.c \
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@ -15,3 +15,5 @@ LIBRARY_NAME = 'mozqcms'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY  = 1

 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@ -551,3 +551,5 @@ LIBRARY_NAME = 'skia'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -10,7 +10,6 @@ VPATH       = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk

--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@ -61,3 +61,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= thebes
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY	= 1

 # gfxSVGGlyphs needs nsDOMParser.h
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@ -272,3 +272,5 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/intl/hyphenation/src/Makefile.in
+++ b/intl/hyphenation/src/Makefile.in
@ -9,7 +9,6 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 CSRCS            = hyphen.c \
                   $(NULL)

--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@ -16,3 +16,5 @@ LIBRARY_NAME = 'hyphenation_s'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@ -37,3 +37,5 @@ EXTRA_JS_MODULES += [

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk3)
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@ -33,3 +33,5 @@ LIBRARY_NAME = 'lwbrk_s'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@ -10,5 +10,4 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk
--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@ -15,3 +15,5 @@ LIBRARY_NAME = 'strres_s'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES	= -I$(srcdir)/../util \
 		  -I$(srcdir)/../ucvlatin \
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@ -33,3 +33,5 @@ LIBRARY_NAME = 'uconv'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 CSRCS		= \
 		ugen.c \
--- a/intl/uconv/util/moz.build
+++ b/intl/uconv/util/moz.build
@ -17,3 +17,5 @@ LIBRARY_NAME = 'ucvutil_s'

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -20,7 +20,6 @@ LIBRARY_NAME	= mozjs
 endif

 STATIC_LIBRARY_NAME = js_static
-MSVC_ENABLE_PGO := 1
 LIBS		= $(NSPR_LIBS)

 # JavaScript must be built shared, even for static builds, as it is used by
--- a/js/src/moz.build
+++ b/js/src/moz.build
@ -339,3 +339,6 @@ else:
    CPP_SOURCES += [
        'pm_stub.cpp'
    ]
+
+MSVC_ENABLE_PGO = True
+
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@ -9,7 +9,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 LOCAL_INCLUDES += \
  -I$(srcdir)/../src \
  -I$(srcdir)/../wrappers \
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME    = xpconnect_s
-MSVC_ENABLE_PGO := 1
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@ -57,3 +57,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@ -9,7 +9,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 LOCAL_INCLUDES = \
                -I$(srcdir)/../src \
                -I$(srcdir)/../../../dom/base \
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@ -26,3 +26,5 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkbase_s
-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@ -103,3 +103,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -16,7 +16,6 @@ SHELL := ksh
 endif

 LIBRARY_NAME	= gklayout
-MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 	../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@ -22,3 +22,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MSVC_ENABLE_PGO := 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@ -42,3 +42,5 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+MSVC_ENABLE_PGO = True
+
--- a/Показать больше
+++ b/Показать больше