bug 658313 - disable PGO on Windows, Linux dep builds and add Window and Linux PGO time based builds r=coop p=jhford
authorJohn Ford <jhford@mozilla.com>
Mon, 03 Oct 2011 19:24:03 -0700
changeset 4847 2770bd1abf4d7be18d8d27e6b10574f466beae80
parent 4834 a022be69fbde278f09f9f233c24a40a969e8d33f
child 4848 0c5e26f82dd4df8f5a34c53903e43615458ac79a
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewerscoop
bugs658313
bug 658313 - disable PGO on Windows, Linux dep builds and add Window and Linux PGO time based builds r=coop p=jhford
mozilla-tests/config.py
mozilla/config.py
mozilla/project_branches.py
mozilla2/linux/accessibility/nightly-rpm/mozconfig
mozilla2/linux/accessibility/nightly/mozconfig
mozilla2/linux/accessibility/qt/mozconfig
mozilla2/linux/accessibility/release/mozconfig
mozilla2/linux/electrolysis/nightly/mozconfig
mozilla2/linux/electrolysis/qt/mozconfig
mozilla2/linux/generic/nightly/mozconfig
mozilla2/linux/generic/qt/mozconfig
mozilla2/linux/jaegermonkey/nightly/mozconfig
mozilla2/linux/jaegermonkey/qt/mozconfig
mozilla2/linux/mozilla-aurora/nightly-rpm/mozconfig
mozilla2/linux/mozilla-aurora/nightly/mozconfig
mozilla2/linux/mozilla-aurora/qt/mozconfig
mozilla2/linux/mozilla-aurora/release/mozconfig
mozilla2/linux/mozilla-beta/nightly-rpm/mozconfig
mozilla2/linux/mozilla-beta/nightly/mozconfig
mozilla2/linux/mozilla-beta/qt/mozconfig
mozilla2/linux/mozilla-beta/release/mozconfig
mozilla2/linux/mozilla-central/nightly-rpm/mozconfig
mozilla2/linux/mozilla-central/nightly/mozconfig
mozilla2/linux/mozilla-central/qt/mozconfig
mozilla2/linux/mozilla-central/release/mozconfig
mozilla2/linux/mozilla-release/nightly-rpm/mozconfig
mozilla2/linux/mozilla-release/nightly/mozconfig
mozilla2/linux/mozilla-release/qt/mozconfig
mozilla2/linux/mozilla-release/release/mozconfig
mozilla2/linux/places/nightly-rpm/mozconfig
mozilla2/linux/places/nightly/mozconfig
mozilla2/linux/places/qt/mozconfig
mozilla2/linux/places/release/mozconfig
mozilla2/linux/shadow-central/nightly-rpm/mozconfig
mozilla2/linux/shadow-central/nightly/mozconfig
mozilla2/linux/shadow-central/qt/mozconfig
mozilla2/linux/shadow-central/release/mozconfig
mozilla2/linux/try/nightly/mozconfig
mozilla2/linux/try/qt/mozconfig
mozilla2/linux/ux/nightly-rpm/mozconfig
mozilla2/linux/ux/nightly/mozconfig
mozilla2/linux/ux/qt/mozconfig
mozilla2/linux64/accessibility/nightly-rpm/mozconfig
mozilla2/linux64/accessibility/nightly/mozconfig
mozilla2/linux64/accessibility/release/mozconfig
mozilla2/linux64/electrolysis/nightly/mozconfig
mozilla2/linux64/generic/nightly/mozconfig
mozilla2/linux64/jaegermonkey/nightly/mozconfig
mozilla2/linux64/mozilla-aurora/nightly-rpm/mozconfig
mozilla2/linux64/mozilla-aurora/nightly/mozconfig
mozilla2/linux64/mozilla-aurora/release/mozconfig
mozilla2/linux64/mozilla-beta/nightly-rpm/mozconfig
mozilla2/linux64/mozilla-beta/nightly/mozconfig
mozilla2/linux64/mozilla-beta/release/mozconfig
mozilla2/linux64/mozilla-central/nightly-rpm/mozconfig
mozilla2/linux64/mozilla-central/nightly/mozconfig
mozilla2/linux64/mozilla-central/release/mozconfig
mozilla2/linux64/mozilla-release/nightly-rpm/mozconfig
mozilla2/linux64/mozilla-release/nightly/mozconfig
mozilla2/linux64/mozilla-release/release/mozconfig
mozilla2/linux64/places/nightly-rpm/mozconfig
mozilla2/linux64/places/nightly/mozconfig
mozilla2/linux64/places/release/mozconfig
mozilla2/linux64/shadow-central/nightly-rpm/mozconfig
mozilla2/linux64/shadow-central/nightly/mozconfig
mozilla2/linux64/shadow-central/release/mozconfig
mozilla2/linux64/try/nightly/mozconfig
mozilla2/linux64/ux/nightly-rpm/mozconfig
mozilla2/linux64/ux/nightly/mozconfig
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -781,16 +781,18 @@ for branch in BRANCHES.keys():
 # The following are exceptions to the defaults
 
 ######## mozilla-central
 BRANCHES['mozilla-central']['branch_name'] = "Firefox"
 BRANCHES['mozilla-central']['repo_path'] = "mozilla-central"
 BRANCHES['mozilla-central']['mobile_branch_name'] = "Mobile"
 BRANCHES['mozilla-central']['mobile_talos_branch'] = "mobile"
 BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
+BRANCHES['mozilla-central']['add_pgo_builders'] = True
+BRANCHES['mozilla-central']['pgo_platforms'] = ['linux', 'linux64', 'win32']
 # Let's add win64 tests only for mozilla-central until we have enough capacity - see bug 667024
 # XXX hacking warning - this code could get out of date easily
 BRANCHES['mozilla-central']['platforms']['win64']['enable_opt_unittests'] = True
 for suite in SUITES.keys():
     options = SUITES[suite]['options']
     if options[1] == ALL_PLATFORMS:
         options = (options[0], ALL_PLATFORMS + PLATFORMS['win64']['slave_platforms'])
     if options[1] == NO_MAC:
@@ -805,16 +807,37 @@ BRANCHES['mozilla-central']['platforms']
 BRANCHES['mozilla-central']['xperf_tests'] = (1, True, {}, WIN7_ONLY)
 
 # These are the newer suites that use --mozAfterPaint; they will be gone once they become the default
 BRANCHES['mozilla-central']['chrome_tests'] = (1, True, {}, NO_MAC)
 BRANCHES['mozilla-central']['chrome_mac_tests'] = (1, True, {}, MAC_ONLY)
 BRANCHES['mozilla-central']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-central']['tp_tests'] = (1, True, TALOS_TP_OPTS, ALL_PLATFORMS)
 
+######## mozilla-release
+#BRANCHES['mozilla-release']['repo_path'] = "releases/mozilla-release"
+#BRANCHES['mozilla-release']['platforms']['linux-android']['enable_opt_unittests'] = True
+#BRANCHES['mozilla-release']['platforms']['linux']['enable_mobile_unittests'] = True
+BRANCHES['mozilla-release']['add_pgo_builders'] = True
+BRANCHES['mozilla-release']['pgo_platforms'] = ['linux', 'linux64', 'win32']
+
+######## mozilla-beta
+#BRANCHES['mozilla-beta']['repo_path'] = "releases/mozilla-beta"
+#BRANCHES['mozilla-beta']['platforms']['linux-android']['enable_opt_unittests'] = True
+#BRANCHES['mozilla-beta']['platforms']['linux']['enable_mobile_unittests'] = True
+BRANCHES['mozilla-beta']['add_pgo_builders'] = True
+BRANCHES['mozilla-beta']['pgo_platforms'] = ['linux', 'linux64', 'win32']
+
+######## mozilla-aurora
+#BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
+#BRANCHES['mozilla-aurora']['platforms']['linux-android']['enable_opt_unittests'] = True
+#BRANCHES['mozilla-aurora']['platforms']['linux']['enable_mobile_unittests'] = True
+BRANCHES['mozilla-aurora']['add_pgo_builders'] = True
+BRANCHES['mozilla-aurora']['pgo_platforms'] = ['linux', 'linux64', 'win32']
+
 ######## shadow-central
 BRANCHES['shadow-central']['repo_path'] = "shadow-central"
 
 ######## mozilla-1.9.2
 BRANCHES['mozilla-1.9.2']['branch_name'] = "Firefox3.6"
 BRANCHES['mozilla-1.9.2']['mobile_branch_name'] = "Mobile1.1"
 BRANCHES['mozilla-1.9.2']['build_branch'] = "1.9.2"
 BRANCHES['mozilla-1.9.2']['old_chrome_tests'] = (0, True, {}, OLD_BRANCH_NO_MAC)
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -70,16 +70,19 @@ GLOBAL_VARS = {
         'linux-android': {},
         'linux-android-debug': {},
         'linux-maemo5-gtk': {},
         'linux-maemo5-qt': {},
         'linux-mobile': {},
         'win32-mobile': {},
         'macosx-mobile': {},
     },
+    'enable_pgo': False,
+    'pgo_platforms': ('linux', 'linux64', 'win32'),
+    'periodic_pgo_interval': 4, # in hours
     'product_name': 'firefox', # Not valid for mobile builds
     'app_name': 'browser',     # Not valid for mobile builds
     'brand_name': 'Minefield', # Not valid for mobile builds
     'enable_shark': True,
     'enable_codecoverage': False,
     'enable_blocklist_update': False,
     'blocklist_update_on_closed_tree': False,
     'enable_nightly': True,
@@ -121,16 +124,17 @@ PLATFORM_VARS = {
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 6,
             'upload_symbols': True,
             'download_symbols': True,
             'packageTests': True,
             'slaves': SLAVES['linux'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'linux',
             'update_platform': 'Linux_x86-gcc3',
             'enable_ccache': True,
             'enable_shared_checkouts': True,
             'env': {
                 'DISPLAY': ':2',
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'MOZ_OBJDIR': OBJDIR,
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -162,16 +166,17 @@ PLATFORM_VARS = {
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 6,
             'upload_symbols': True,
             'download_symbols': True,
             'packageTests': True,
             'slaves': SLAVES['linux'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'linuxqt',
             'update_platform': 'Linux_x86-gcc3',
             'enable_ccache': True,
             'enable_shared_checkouts': True,
             'enable_nightly': False,
             'env': {
                 'DISPLAY': ':2',
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'MOZ_OBJDIR': OBJDIR,
@@ -246,16 +251,17 @@ PLATFORM_VARS = {
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 6,
             'upload_symbols': True,
             'download_symbols': False,
             'packageTests': True,
             'slaves': SLAVES['linux64'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'linux64',
             'update_platform': 'Linux_x86_64-gcc3',
             'enable_ccache': True,
             'enable_shared_checkouts': True,
             'env': {
                 'DISPLAY': ':2',
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'MOZ_OBJDIR': OBJDIR,
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -334,16 +340,17 @@ PLATFORM_VARS = {
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 10,
             'upload_symbols': True,
             'download_symbols': True,
             'packageTests': True,
             'slaves': SLAVES['macosx'],
             'platform_objdir': "%s/ppc" % OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'macosx',
             'update_platform': 'Darwin_Universal-gcc3',
             'enable_shared_checkouts': True,
             'enable_shark': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
                 'SYMBOL_SERVER_USER': 'ffxbld',
@@ -370,16 +377,17 @@ PLATFORM_VARS = {
             'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 12,
             'upload_symbols': True,
             'download_symbols': True,
             'slaves': SLAVES['macosx64'],
             'platform_objdir': "%s/i386" % OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'macosx64',
             'update_platform': 'Darwin_x86_64-gcc3',
             'enable_shared_checkouts': True,
             'enable_shark': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
                 'SYMBOL_SERVER_USER': 'ffxbld',
@@ -398,25 +406,26 @@ PLATFORM_VARS = {
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'test_pretty_names': True,
         },
         'win32': {
             'base_name': 'WINNT 5.2 %(branch)s',
             'mozconfig': 'win32/%(branch)s/nightly',
             'src_mozconfig': 'browser/config/mozconfigs/win32/nightly',
             'src_xulrunner_mozconfig': 'xulrunner/config/mozconfigs/win32/xulrunner',
-            'profiled_build': True,
+            'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 12,
             'upload_symbols': True,
             'download_symbols': True,
             'packageTests': True,
             'slaves': SLAVES['win32'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'win32',
             'mochitest_leak_threshold': 484,
             'crashtest_leak_threshold': 484,
             'update_platform': 'WINNT_x86-msvc',
             'enable_shared_checkouts': True,
             'env': {
                 'CVS_RSH': 'ssh',
                 'MOZ_OBJDIR': OBJDIR,
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -444,16 +453,17 @@ PLATFORM_VARS = {
             'profiled_build': True,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 12,
             'upload_symbols': True,
             'packageTests': True,
             'slaves': SLAVES['win64'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'win64',
             'mochitest_leak_threshold': 484,
             'crashtest_leak_threshold': 484,
             'update_platform': 'WINNT_x86_64-msvc',
             'enable_shared_checkouts': True,
             'env': {
                 'CVS_RSH': 'ssh',
                 'MOZ_OBJDIR': OBJDIR,
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
@@ -480,16 +490,17 @@ PLATFORM_VARS = {
             'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'download_symbols': True,
             'packageTests': True,
             'build_space': 7,
             'slaves': SLAVES['linux'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'linux-debug',
             'enable_ccache': True,
             'enable_shared_checkouts': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'DISPLAY': ':2',
                 'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
@@ -510,16 +521,17 @@ PLATFORM_VARS = {
             'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'download_symbols': False,
             'packageTests': True,
             'build_space': 7,
             'slaves': SLAVES['linux64'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'linux64-debug',
             'enable_ccache': True,
             'enable_shared_checkouts': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'DISPLAY': ':2',
                 'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
@@ -540,16 +552,17 @@ PLATFORM_VARS = {
             'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'download_symbols': True,
             'packageTests': True,
             'build_space': 10,
             'slaves': SLAVES['macosx'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'macosx-debug',
             'enable_shared_checkouts': True,
             'enable_shark': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'LC_ALL': 'C',
@@ -565,16 +578,17 @@ PLATFORM_VARS = {
             'packageTests': True,
             'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'download_symbols': True,
             'build_space': 10,
             'slaves': SLAVES['macosx64'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'macosx64-debug',
             'enable_shared_checkouts': True,
             'enable_shark': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'LC_ALL': 'C',
@@ -590,16 +604,17 @@ PLATFORM_VARS = {
             'profiled_build': False,
             'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
             'download_symbols': True,
             'packageTests': True,
             'build_space': 9,
             'slaves': SLAVES['win32'],
             'platform_objdir': OBJDIR,
             'stage_product': 'firefox',
+            'stage_platform': 'win32-debug',
             'enable_shared_checkouts': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
             },
             'enable_unittests': False,
@@ -1076,16 +1091,18 @@ for branch in BRANCHES.keys():
 # HGURL + repo_path should be a valid repository
 BRANCHES['mozilla-central']['repo_path'] = 'mozilla-central'
 BRANCHES['mozilla-central']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['mozilla-central']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-central']['start_hour'] = [3]
 BRANCHES['mozilla-central']['start_minute'] = [2]
 # Enable XULRunner / SDK builds
 BRANCHES['mozilla-central']['enable_xulrunner'] = True
+# Enable PGO Builds on this branch
+BRANCHES['mozilla-central']['enable_pgo'] = True
 # Enable unit tests
 BRANCHES['mozilla-central']['geriatric_masters'] = [
     ('10.250.48.137:9989', False),
 ]
 BRANCHES['mozilla-central']['enable_mac_a11y'] = True
 BRANCHES['mozilla-central']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['mozilla-central']['enable_codecoverage'] = True
@@ -1200,16 +1217,18 @@ del BRANCHES['mozilla-release']['platfor
 BRANCHES['mozilla-beta']['repo_path'] = 'releases/mozilla-beta'
 BRANCHES['mozilla-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
 BRANCHES['mozilla-beta']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-beta']['update_channel'] = 'beta'
 BRANCHES['mozilla-beta']['start_hour'] = [3]
 BRANCHES['mozilla-beta']['start_minute'] = [2]
 # Enable XULRunner / SDK builds
 BRANCHES['mozilla-beta']['enable_xulrunner'] = True
+# Enable PGO Builds on this branch
+BRANCHES['mozilla-beta']['enable_pgo'] = True
 # Enable unit tests
 BRANCHES['mozilla-beta']['geriatric_masters'] = [
     ('10.250.48.137:9989', False),
 ]
 BRANCHES['mozilla-beta']['enable_mac_a11y'] = True
 BRANCHES['mozilla-beta']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['mozilla-beta']['enable_codecoverage'] = True
@@ -1245,16 +1264,18 @@ del BRANCHES['mozilla-beta']['platforms'
 ######## mozilla-aurora
 BRANCHES['mozilla-aurora']['repo_path'] = 'releases/mozilla-aurora'
 BRANCHES['mozilla-aurora']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['mozilla-aurora']['enable_weekly_bundle'] = True
 BRANCHES['mozilla-aurora']['start_hour'] = [4]
 BRANCHES['mozilla-aurora']['start_minute'] = [20]
 # Enable XULRunner / SDK builds
 BRANCHES['mozilla-aurora']['enable_xulrunner'] = True
+# Enable PGO Builds on this branch
+BRANCHES['mozilla-aurora']['enable_pgo'] = True
 # Enable unit tests
 BRANCHES['mozilla-aurora']['geriatric_masters'] = [
     ('10.250.48.137:9989', False),
 ]
 BRANCHES['mozilla-aurora']['enable_mac_a11y'] = True
 BRANCHES['mozilla-aurora']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['mozilla-aurora']['enable_codecoverage'] = True
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -85,16 +85,19 @@ PROJECT_BRANCHES = {
             'remote-twinopen': 1,
         },
     },
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'mozconfig_dir': 'mozilla-central',
         'enable_nightly': True,
         'enable_weekly_bundle': True,
+        'enable_pgo': True,
+        'add_pgo_builders': True,
+        'pgo_platforms': ['linux', 'linux64', 'win32'],
         'platforms': {
             'linux64': {
                 'build_space': 7,
             },
             'linux': {
                 'build_space': 7,
             },
             'linuxqt': {
--- a/mozilla2/linux/accessibility/nightly-rpm/mozconfig
+++ b/mozilla2/linux/accessibility/nightly-rpm/mozconfig
@@ -25,16 +25,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/accessibility/nightly/mozconfig
+++ b/mozilla2/linux/accessibility/nightly/mozconfig
@@ -17,16 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/accessibility/qt/mozconfig
+++ b/mozilla2/linux/accessibility/qt/mozconfig
@@ -17,17 +17,17 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/accessibility/release/mozconfig
+++ b/mozilla2/linux/accessibility/release/mozconfig
@@ -14,13 +14,13 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mozilla2/linux/electrolysis/nightly/mozconfig
+++ b/mozilla2/linux/electrolysis/nightly/mozconfig
@@ -17,16 +17,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/electrolysis/qt/mozconfig
+++ b/mozilla2/linux/electrolysis/qt/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/generic/nightly/mozconfig
+++ b/mozilla2/linux/generic/nightly/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
 if [ -f $topsrcdir/mozconfig-extra-linux ] ; then
--- a/mozilla2/linux/generic/qt/mozconfig
+++ b/mozilla2/linux/generic/qt/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/jaegermonkey/nightly/mozconfig
+++ b/mozilla2/linux/jaegermonkey/nightly/mozconfig
@@ -17,16 +17,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/jaegermonkey/qt/mozconfig
+++ b/mozilla2/linux/jaegermonkey/qt/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/mozilla-aurora/nightly-rpm/mozconfig
+++ b/mozilla2/linux/mozilla-aurora/nightly-rpm/mozconfig
@@ -27,16 +27,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/linux/mozilla-aurora/nightly/mozconfig
@@ -19,16 +19,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-aurora/qt/mozconfig
+++ b/mozilla2/linux/mozilla-aurora/qt/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/mozilla-aurora/release/mozconfig
+++ b/mozilla2/linux/mozilla-aurora/release/mozconfig
@@ -14,15 +14,14 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux/mozilla-beta/nightly-rpm/mozconfig
+++ b/mozilla2/linux/mozilla-beta/nightly-rpm/mozconfig
@@ -27,16 +27,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/linux/mozilla-beta/nightly/mozconfig
@@ -19,16 +19,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-beta/qt/mozconfig
+++ b/mozilla2/linux/mozilla-beta/qt/mozconfig
@@ -17,17 +17,17 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/mozilla-beta/release/mozconfig
+++ b/mozilla2/linux/mozilla-beta/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux/mozilla-central/nightly-rpm/mozconfig
+++ b/mozilla2/linux/mozilla-central/nightly-rpm/mozconfig
@@ -25,16 +25,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-central/nightly/mozconfig
+++ b/mozilla2/linux/mozilla-central/nightly/mozconfig
@@ -22,16 +22,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-central/qt/mozconfig
+++ b/mozilla2/linux/mozilla-central/qt/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/mozilla-central/release/mozconfig
+++ b/mozilla2/linux/mozilla-central/release/mozconfig
@@ -14,15 +14,14 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux/mozilla-release/nightly-rpm/mozconfig
+++ b/mozilla2/linux/mozilla-release/nightly-rpm/mozconfig
@@ -27,16 +27,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-release/nightly/mozconfig
+++ b/mozilla2/linux/mozilla-release/nightly/mozconfig
@@ -19,16 +19,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/mozilla-release/qt/mozconfig
+++ b/mozilla2/linux/mozilla-release/qt/mozconfig
@@ -17,17 +17,17 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/mozilla-release/release/mozconfig
+++ b/mozilla2/linux/mozilla-release/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux/places/nightly-rpm/mozconfig
+++ b/mozilla2/linux/places/nightly-rpm/mozconfig
@@ -25,16 +25,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/places/nightly/mozconfig
+++ b/mozilla2/linux/places/nightly/mozconfig
@@ -22,16 +22,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/places/qt/mozconfig
+++ b/mozilla2/linux/places/qt/mozconfig
@@ -17,17 +17,17 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/places/release/mozconfig
+++ b/mozilla2/linux/places/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux/shadow-central/nightly-rpm/mozconfig
+++ b/mozilla2/linux/shadow-central/nightly-rpm/mozconfig
@@ -25,16 +25,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/shadow-central/nightly/mozconfig
+++ b/mozilla2/linux/shadow-central/nightly/mozconfig
@@ -22,16 +22,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/shadow-central/qt/mozconfig
+++ b/mozilla2/linux/shadow-central/qt/mozconfig
@@ -17,17 +17,17 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux/shadow-central/release/mozconfig
+++ b/mozilla2/linux/shadow-central/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux/try/nightly/mozconfig
+++ b/mozilla2/linux/try/nightly/mozconfig
@@ -15,17 +15,16 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 if [ -f $topsrcdir/mozconfig-extra ] ; then
--- a/mozilla2/linux/try/qt/mozconfig
+++ b/mozilla2/linux/try/qt/mozconfig
@@ -14,17 +14,16 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 if [ -f $topsrcdir/mozconfig-extra ] ; then
--- a/mozilla2/linux/ux/nightly-rpm/mozconfig
+++ b/mozilla2/linux/ux/nightly-rpm/mozconfig
@@ -25,16 +25,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/ux/nightly/mozconfig
+++ b/mozilla2/linux/ux/nightly/mozconfig
@@ -17,16 +17,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux/ux/qt/mozconfig
+++ b/mozilla2/linux/ux/qt/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
--- a/mozilla2/linux64/accessibility/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/accessibility/nightly-rpm/mozconfig
@@ -25,16 +25,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/accessibility/nightly/mozconfig
+++ b/mozilla2/linux64/accessibility/nightly/mozconfig
@@ -17,16 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/accessibility/release/mozconfig
+++ b/mozilla2/linux64/accessibility/release/mozconfig
@@ -14,13 +14,13 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mozilla2/linux64/electrolysis/nightly/mozconfig
+++ b/mozilla2/linux64/electrolysis/nightly/mozconfig
@@ -17,16 +17,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/generic/nightly/mozconfig
+++ b/mozilla2/linux64/generic/nightly/mozconfig
@@ -17,17 +17,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
--- a/mozilla2/linux64/jaegermonkey/nightly/mozconfig
+++ b/mozilla2/linux64/jaegermonkey/nightly/mozconfig
@@ -17,16 +17,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-aurora/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/mozilla-aurora/nightly-rpm/mozconfig
@@ -27,16 +27,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/linux64/mozilla-aurora/nightly/mozconfig
@@ -19,16 +19,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-aurora/release/mozconfig
+++ b/mozilla2/linux64/mozilla-aurora/release/mozconfig
@@ -14,15 +14,14 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux64/mozilla-beta/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/mozilla-beta/nightly-rpm/mozconfig
@@ -27,16 +27,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/linux64/mozilla-beta/nightly/mozconfig
@@ -19,16 +19,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-beta/release/mozconfig
+++ b/mozilla2/linux64/mozilla-beta/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux64/mozilla-central/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/mozilla-central/nightly-rpm/mozconfig
@@ -25,16 +25,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-central/nightly/mozconfig
+++ b/mozilla2/linux64/mozilla-central/nightly/mozconfig
@@ -22,16 +22,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-central/release/mozconfig
+++ b/mozilla2/linux64/mozilla-central/release/mozconfig
@@ -14,15 +14,14 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux64/mozilla-release/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/mozilla-release/nightly-rpm/mozconfig
@@ -27,16 +27,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-release/nightly/mozconfig
+++ b/mozilla2/linux64/mozilla-release/nightly/mozconfig
@@ -19,16 +19,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/mozilla-release/release/mozconfig
+++ b/mozilla2/linux64/mozilla-release/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux64/places/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/places/nightly-rpm/mozconfig
@@ -25,16 +25,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/places/nightly/mozconfig
+++ b/mozilla2/linux64/places/nightly/mozconfig
@@ -22,16 +22,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/places/release/mozconfig
+++ b/mozilla2/linux64/places/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux64/shadow-central/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/shadow-central/nightly-rpm/mozconfig
@@ -25,16 +25,16 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/shadow-central/nightly/mozconfig
+++ b/mozilla2/linux64/shadow-central/nightly/mozconfig
@@ -22,16 +22,16 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/shadow-central/release/mozconfig
+++ b/mozilla2/linux64/shadow-central/release/mozconfig
@@ -14,15 +14,15 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
+
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mozilla2/linux64/try/nightly/mozconfig
+++ b/mozilla2/linux64/try/nightly/mozconfig
@@ -15,17 +15,16 @@ ac_add_options --enable-stdcxx-compat
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
--- a/mozilla2/linux64/ux/nightly-rpm/mozconfig
+++ b/mozilla2/linux64/ux/nightly-rpm/mozconfig
@@ -25,16 +25,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
--- a/mozilla2/linux64/ux/nightly/mozconfig
+++ b/mozilla2/linux64/ux/nightly/mozconfig
@@ -17,16 +17,15 @@ export CXXFLAGS="-gdwarf-2"
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # PGO
-mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache