roll clang 239765:241602

tools/clang/scripts/update.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Windows can't run .sh files, so this is a Python implementation of
 update.sh. This script should replace update.sh on all platforms eventually."""
 
 import argparse
 import contextlib
@@ skipping 203 matching lines @@
     '%(clang)s/lib/Parse/ParseExpr.cpp',
     '%(clang)s/lib/Parse/ParseTemplate.cpp',
     '%(clang)s/lib/Sema/SemaDeclCXX.cpp',
     '%(clang)s/lib/Sema/SemaExprCXX.cpp',
     '%(clang)s/test/SemaCXX/default2.cpp',
     '%(clang)s/test/SemaCXX/typo-correction-delayed.cpp',
     '%(compiler_rt)s/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc',
     '%(compiler_rt)s/test/tsan/signal_segv_handler.cc',
     '%(compiler_rt)s/lib/sanitizer_common/sanitizer_coverage_libcdep.cc',
     '%(compiler_rt)s/cmake/config-ix.cmake',
+    '%(compiler_rt)s/CMakeLists.txt',
     '%(compiler_rt)s/lib/ubsan/ubsan_platform.h',
     ]
   for f in files:
     f = f % {
         'clang': CLANG_DIR,
         'compiler_rt': COMPILER_RT_DIR,
         'llvm': LLVM_DIR,
         }
     if os.path.exists(f):
       os.remove(f)  # For unversioned files.
@@ skipping 41 matching lines @@
 -; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm
 +; RUN: true
  
  ; REQUIRES: shell
 """
       ]
 
   # The UBSan run-time, which is now bundled with the ASan run-time, doesn't
   # work on Mac OS X 10.8 (PR23539).
   compiler_rt_patches = [ r"""\
---- cmake/config-ix.cmake
-+++ cmake/config-ix.cmake
-@@ -319,7 +319,7 @@ else()
- endif()
- 
- if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD")
-+    OS_NAME MATCHES "Linux|FreeBSD")
-   set(COMPILER_RT_HAS_UBSAN TRUE)
- else()
-   set(COMPILER_RT_HAS_UBSAN FALSE)
-diff --git a/lib/ubsan/ubsan_platform.h b/lib/ubsan/ubsan_platform.h
-index 8ba253b..d5dce8d 100644
---- lib/ubsan/ubsan_platform.h
-+++ lib/ubsan/ubsan_platform.h
-@@ -14,7 +14,7 @@
- #define UBSAN_PLATFORM_H
- 
- // Other platforms should be easy to add, and probably work as-is.
--#if (defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)) && \
-+#if (defined(__linux__) || defined(__FreeBSD__)) && \
-     (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || \
-      defined(__aarch64__) || defined(__mips__) || defined(__powerpc64__))
- # define CAN_SANITIZE_UB 1
+--- CMakeLists.txt      (revision 241602)
++++ CMakeLists.txt      (working copy)
+@@ -305,6 +305,7 @@
+       list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim)
+     endif()
+   endif()
++  set(SANITIZER_MIN_OSX_VERSION "10.7")
+   if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7")
+     message(FATAL_ERROR "Too old OS X version: ${SANITIZER_MIN_OSX_VERSION}")
+   endif()
 """
       ]
 
   for path, patches in [(LLVM_DIR, llvm_patches),
                         (CLANG_DIR, clang_patches),
                         (COMPILER_RT_DIR, compiler_rt_patches)]:
     print 'Applying patches in', path
     for patch in patches:
       print patch
       p = subprocess.Popen( ['patch', '-p0', '-d', path], stdin=subprocess.PIPE)
@@ skipping 212 matching lines @@
          '-current_version', '1', '-compatibility_version', '1', '-lSystem',
          '-install_name', '@executable_path/libc++.dylib',
          '-Wl,-unexported_symbols_list,' + libdir + '/libc++unexp.exp',
          '-Wl,-force_symbols_not_weak_list,' + libdir + '/notweak.exp',
          '-Wl,-force_symbols_weak_list,' + libdir + '/weak.exp'])
     if os.path.exists('libc++.dylib'):
       os.remove('libc++.dylib')
     os.symlink('libc++.1.dylib', 'libc++.dylib')
     ldflags += ['-stdlib=libc++', '-L' + libcxxbuild]
 
+    if args.bootstrap:
+      # Now that the libc++ headers have been installed and libc++.dylib is
+      # built, delete the libc++ checkout again so that it's not part of the
+      # main build below -- the libc++(abi) tests don't pass on OS X in
+      # bootstrap builds (http://llvm.org/PR24068)
+      RmTree(LIBCXX_DIR)
+      RmTree(LIBCXXABI_DIR)
+      cxxflags = ['-stdlib=libc++', '-nostdinc++',
+                  '-I' + os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR,
+                                      'include/c++/v1')
+                  ] + cflags
+
   # Build clang.
   binutils_incdir = ''
   if sys.platform.startswith('linux'):
     binutils_incdir = os.path.join(BINUTILS_DIR, 'Linux_x64/Release/include')
 
   # If building at head, define a macro that plugins can use for #ifdefing
   # out code that builds at head, but not at LLVM_WIN_REVISION or vice versa.
   if use_head_revision:
     cflags += ['-DLLVM_FORCE_HEAD_REVISION']
     cxxflags += ['-DLLVM_FORCE_HEAD_REVISION']
@@ skipping 202 matching lines @@
 
     args.force_local_build = True
     # Skip local patches when using HEAD: they probably don't apply anymore.
     args.with_patches = False
 
   return UpdateClang(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())