Bug 797525 - Upgrade clang to version >= r163716 to fix ASan issue 109. r=rail.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Sat, 06 Oct 2012 08:28:39 -0400
changeset 109525 e1ac3154b40e7758779061c3ff8c9bf873f954db
parent 109524 20fe6e539f7f3fbd27f6a6737acc44ca0e066347
child 109526 2f3ed2f3905010ea180f917e90c589c28390dad4
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersrail
bugs797525
milestone18.0a1
Bug 797525 - Upgrade clang to version >= r163716 to fix ASan issue 109. r=rail.
build/unix/build-clang/build-clang.py
build/unix/build-clang/compiler-rt-gnu89-inline.patch
--- a/build/unix/build-clang/build-clang.py
+++ b/build/unix/build-clang/build-clang.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-llvm_revision = "162360"
+llvm_revision = "163716"
 moz_version = "moz0"
 
 ##############################################
 
 import os
 import os.path
 import shutil
 import tarfile
@@ -129,17 +129,17 @@ if not os.path.exists(source_dir):
            compiler_rt_source_dir, llvm_revision)
     os.symlink("../../clang", llvm_source_dir + "/tools/clang")
     os.symlink("../../compiler-rt", llvm_source_dir + "/projects/compiler-rt")
     patch("llvm-debug-frame.patch", 1, llvm_source_dir)
     patch("llvm-deterministic.patch", 1, llvm_source_dir)
     patch("clang-deterministic.patch", 1, clang_source_dir)
     if not isDarwin:
         patch("old-ld-hack.patch", 1, llvm_source_dir)
-        patch("compiler-rt-gnu89-inline.patch", 0, compiler_rt_source_dir)
+        patch("compiler-rt-gnu89-inline.patch", 1, compiler_rt_source_dir)
         patch("no-sse-on-linux.patch", 1, clang_source_dir)
 
 if os.path.exists(build_dir):
     shutil.rmtree(build_dir)
 os.makedirs(build_dir)
 
 stage1_dir = build_dir + '/stage1'
 stage1_inst_dir = stage1_dir + '/clang'
--- a/build/unix/build-clang/compiler-rt-gnu89-inline.patch
+++ b/build/unix/build-clang/compiler-rt-gnu89-inline.patch
@@ -1,10 +1,10 @@
-Index: make/config.mk
-===================================================================
---- make/config.mk	(revision 157958)
-+++ make/config.mk	(working copy)
-@@ -43,4 +43,4 @@
+diff --git a/make/config.mk b/make/config.mk
+index 12d8bc2..9a6cab5 100644
+--- a/make/config.mk
++++ b/make/config.mk
+@@ -43,4 +43,4 @@ endif
  ###
  # Common compiler options
- COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables -I${ProjSrcRoot}/lib
+ COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables -I${ProjSrcRoot}/lib -I${ProjSrcRoot}/include
 -COMMON_CFLAGS=-fPIC
 +COMMON_CFLAGS=-fPIC -fgnu89-inline