Add --enable-pgo option to build clang with PGO

tools/clang/scripts/package.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This script will check out llvm and clang, and then package the results up
 to a tgz file."""
 
 import argparse
 import fnmatch
 import itertools
 import os
 import shutil
 import subprocess
 import sys
 import tarfile
 
 # Path constants.
 THIS_DIR = os.path.dirname(__file__)
 CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', '..'))
 THIRD_PARTY_DIR = os.path.join(THIS_DIR, '..', '..', '..', 'third_party')
 LLVM_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm')
 LLVM_BOOTSTRAP_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-bootstrap')
 LLVM_BOOTSTRAP_INSTALL_DIR = os.path.join(THIRD_PARTY_DIR,
                                           'llvm-bootstrap-install')
 LLVM_BUILD_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-build')
-LLVM_RELEASE_DIR = os.path.join(LLVM_BUILD_DIR, 'Release+Asserts')
+
+if sys.platform == 'win32':
+  LLVM_RELEASE_DIR = os.path.join(LLVM_BUILD_DIR, 'Release+Asserts', 'tools',
+                                  'clang', 'stage2-bins')
+else:
+  LLVM_RELEASE_DIR = os.path.join(LLVM_BUILD_DIR, 'Release+Asserts', 'tools',
+                                  'clang', 'stage2-instrumented-bins', 'tools',
+                                  'clang', 'stage2-bins')
 LLVM_LTO_GOLD_PLUGIN_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-lto-gold-plugin')
 BINUTILS_LIB_DIR = os.path.join(THIRD_PARTY_DIR, 'binutils', 'Linux_x64',
                                 'Release', 'lib')
 STAMP_FILE = os.path.join(LLVM_BUILD_DIR, 'cr_build_revision')
 
 
 def Tee(output, logfile):
   logfile.write(output)
   print output,
 
@@ skipping 183 matching lines @@
     TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'projects', 'libcxx')],
            log, fail_hard=False)
 
     Tee('Starting build\n', log)
 
     # Do a clobber build.
     shutil.rmtree(LLVM_BOOTSTRAP_DIR, ignore_errors=True)
     shutil.rmtree(LLVM_BOOTSTRAP_INSTALL_DIR, ignore_errors=True)
     shutil.rmtree(LLVM_BUILD_DIR, ignore_errors=True)
 
-    opt_flags = []
+    opt_flags = ['--bootstrap' if sys.platform == 'win32' else '--enable-pgo']
     if sys.platform.startswith('linux'):
       opt_flags += ['--lto-gold-plugin']
+
     build_cmd = [sys.executable, os.path.join(THIS_DIR, 'update.py'),
-                 '--bootstrap', '--force-local-build',
-                 '--run-tests'] + opt_flags
+                 '--force-local-build', '--run-tests'] + opt_flags
     TeeCmd(build_cmd, log)
 
   stamp = open(STAMP_FILE).read().rstrip()
   if stamp != expected_stamp:
     print 'Actual stamp (%s) != expected stamp (%s).' % (stamp, expected_stamp)
     return 1
 
   shutil.rmtree(pdir, ignore_errors=True)
 
   # Copy a whitelist of files to the directory we're going to tar up.
@@ skipping 67 matching lines @@
   # Set up symlinks.
   if sys.platform != 'win32':
     os.symlink('clang', os.path.join(pdir, 'bin', 'clang++'))
     os.symlink('clang', os.path.join(pdir, 'bin', 'clang-cl'))
 
   if sys.platform.startswith('linux'):
     os.symlink('lld', os.path.join(pdir, 'bin', 'ld.lld'))
 
   # Copy libc++ headers.
   if sys.platform == 'darwin':
-    shutil.copytree(os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'include', 'c++'),
+    shutil.copytree(os.path.join(LLVM_RELEASE_DIR, 'include', 'c++'),
                     os.path.join(pdir, 'include', 'c++'))
 
   # Copy tcmalloc from the binutils package.
   # FIXME: We should eventually be building our own copy.
   if sys.platform.startswith('linux'):
     shutil.copy(os.path.join(BINUTILS_LIB_DIR, 'libtcmalloc_minimal.so.4'),
                 os.path.join(pdir, 'lib'))
 
   # Copy buildlog over.
   shutil.copy('buildlog.txt', pdir)
@@ skipping 31 matching lines @@
   MaybeUpload(args, objdumpdir, platform)
 
   if sys.platform == 'win32' and args.upload:
     UploadPDBToSymbolServer()
 
   # FIXME: Warn if the file already exists on the server.
 
 
 if __name__ == '__main__':
   sys.exit(main())