From 7ee25894d8bfd329c3c797ead25aa9e014f0edc6 Mon Sep 17 00:00:00 2001 From: bferturk Date: Tue, 5 Apr 2016 20:37:56 +0300 Subject: [PATCH] llvm --- programming/build/llvm/actions.py | 165 +++---- ...MSan-mapping-layout-compiler-rt-part.patch | 142 ------ ...01-New-MSan-mapping-layout-llvm-part.patch | 115 ----- ...ools-extra-3.7.0-install-clang-query.patch | 9 - .../lldb-3.7.0-avoid-linking-to-libLLVM.patch | 20 - .../llvm-3.5.0-fix-cmake-llvm-exports.patch | 39 -- .../files/llvm-3.5.0-force-link-pass.o.patch | 28 -- ...lvm-3.6.0-use-ocamlfind-for-ocamldoc.patch | 30 -- .../llvm-3.7.0-export-more-symbols.patch | 11 - ...lvm-3.7.0-link-tools-against-libLLVM.patch | 440 ------------------ .../llvm/files/llvm-IntrusiveRefCntPtr.patch | 13 - programming/build/llvm/pspec.xml | 80 ++-- 12 files changed, 128 insertions(+), 964 deletions(-) delete mode 100644 programming/build/llvm/files/0001-New-MSan-mapping-layout-compiler-rt-part.patch delete mode 100644 programming/build/llvm/files/0001-New-MSan-mapping-layout-llvm-part.patch delete mode 100644 programming/build/llvm/files/clang-tools-extra-3.7.0-install-clang-query.patch delete mode 100644 programming/build/llvm/files/lldb-3.7.0-avoid-linking-to-libLLVM.patch delete mode 100644 programming/build/llvm/files/llvm-3.5.0-fix-cmake-llvm-exports.patch delete mode 100644 programming/build/llvm/files/llvm-3.5.0-force-link-pass.o.patch delete mode 100644 programming/build/llvm/files/llvm-3.6.0-use-ocamlfind-for-ocamldoc.patch delete mode 100644 programming/build/llvm/files/llvm-3.7.0-export-more-symbols.patch delete mode 100644 programming/build/llvm/files/llvm-3.7.0-link-tools-against-libLLVM.patch delete mode 100644 programming/build/llvm/files/llvm-IntrusiveRefCntPtr.patch diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index bf18e2bfc9..f1a2ef7b91 100644 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -7,108 +7,91 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools -from pisi.actionsapi import pkgconfig from pisi.actionsapi import get -from pisi.actionsapi import kde4 +from pisi.actionsapi import cmaketools -#WorkDir = "%s-%s.src" % (get.srcNAME(), get.srcVERSION()) libdir = "/usr/lib32/llvm" if get.buildTYPE() == "emul32" else "/usr/lib/llvm" lib = "lib32" if get.buildTYPE() == "emul32" else "lib" -def setup(): - if not shelltools.isDirectory("tools/clang"): - pisitools.dosed("tools/cfe-3.5.0.src/lib/Driver/ToolChains.cpp", '"ld"', '"ld.gold"') - shelltools.move("tools/cfe-%s.src" % get.srcVERSION(), "tools/clang") - shelltools.move("tools/clang-tools-extra-*", "tools/clang/extra") - if not shelltools.isDirectory("projects/compiler-rt"): - shelltools.move("projects/compiler-rt-3.5*", "projects/compiler-rt") - pisitools.dosed("utils/llvm-build/llvm-build", "python", "python2.7") - pisitools.dosed("bindings/ocaml/Makefile.ocaml", '\$\(PROJ_libdir\)', libdir) - pisitools.dosed("Makefile.config.in", "\$\(PROJ_prefix\)/etc/llvm", "/etc/llvm") - pisitools.dosed("Makefile.config.in", "\$\(PROJ_prefix\)/lib", "$(PROJ_prefix)/%s/llvm" % lib) - pisitools.dosed("Makefile.config.in", "\$\(PROJ_prefix\)/docs/llvm", "$(PROJ_prefix)/share/doc/llvm") - pisitools.dosed("tools/llvm-config/llvm-config.cpp", '(ActiveLibDir\s=\sActivePrefix\s\+\s\"\/lib)(.*)', r'\1/llvm\2') - pisitools.dosed("autoconf/configure.ac", '\LLVM_LIBDIR="\$\{prefix\}/lib"', 'LLVM_LIBDIR="${prefix}/%s/llvm"' % lib) +def setup(): + if get.buildTYPE() != "emul32": + if not shelltools.can_access_directory("tools/clang"): + shelltools.system("tar xf ../cfe-%s.src.tar.xz -C tools" % get.srcVERSION()) + shelltools.move("tools/cfe-%s.src" % get.srcVERSION(), "tools/clang") - pisitools.dosed("Makefile.rules", "\$\(RPATH\)\s-Wl,\$\(ExmplDir\)\s\$\(DynamicFlag\)", "$(DynamicFlag)") - pisitools.dosed("Makefile.rules", "\$\(RPATH\)\s-Wl,\$\(ToolDir\)\s\$\(DynamicFlag\)", "$(DynamicFlag)") + shelltools.system("tar xf ../clang-tools-extra-%s.src.tar.xz -C tools" % get.srcVERSION()) + shelltools.move("tools/clang-tools-extra-*", "tools/clang/extra") + + shelltools.system("tar xf ../lldb-%s.src.tar.xz -C tools" % get.srcVERSION()) + shelltools.move("tools/lldb-*", "tools/lldb") - shelltools.export("CPPFLAGS","%s %s" % (get.CXXFLAGS(),pkgconfig.getLibraryCFLAGS("libffi"))) - - #pic_option = "enable" if get.ARCH() == "x86_64" else "disable" - shelltools.export("CC", "gcc") - shelltools.export("CXX", "g++") - - options = "--libdir=%s \ - --datadir=/usr/share/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --disable-assertions \ - --with-python=/usr/bin/python2.7 \ - --with-binutils-include=/usr/include \ - " % libdir - - autotools.configure(options) - - -#def check(): -# autotools.make("check") -# autotools.make("-C tools/clang test") + if not shelltools.can_access_directory("projects/compiler-rt"): + shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION()) + shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt") + + + shelltools.export("CC", "gcc") + shelltools.export("CXX", "g++") + shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") + + if get.buildTYPE() == "emul32": + shelltools.export("CC", "gcc -m32") + shelltools.export("CXX", "g++ -m32") + + + shelltools.makedirs("build") + + shelltools.cd("build") + + if get.buildTYPE() != "emul32": + options = "-DCMAKE_C_FLAGS:STRING=-m64 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_CXX_FLAGS:STRING=-m64 \ + -DLLVM_TARGET_ARCH:STRING=x86_64 \ + -DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST() + + + if get.buildTYPE() == "emul32": + options = " -DCMAKE_C_FLAGS:STRING=-m32 \ + -DCMAKE_INSTALL_PREFIX=/emul32 \ + -DLLVM_TARGET_ARCH:STRING=i686 \ + -DLLVM_LIBDIR_SUFFIX=32 \ + -DLLVM_DEFAULT_TARGET_TRIPLE='i686-pc-linux-gnu' \ + -DCMAKE_CXX_FLAGS:STRING=-m32" + + + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + %s \ + -DLLVM_ENABLE_FFI=ON \ + -DLLVM_BUILD_DOCS=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_INCLUDEDIR=/usr/include \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include \ + -DENABLE_SHARED=ON" % options, sourceDir=".." ) def build(): - autotools.make("REQUIRES_RTTI=1") + shelltools.makedirs("build") + shelltools.cd("build") + + cmaketools.make() def install(): + shelltools.makedirs("build") + shelltools.cd("build") + + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + if get.buildTYPE() == "emul32": - - autotools.rawInstall("DESTDIR=%s \ - PROJ_etcdir=/etc/llvm \ - PROJ_libdir=/usr/lib32/llvm \ - PROJ_docsdir=/%s/llvm" - % (get.installDIR(), get.docDIR())) - shelltools.chmod("%s/usr/lib32/llvm/*.a" % get.installDIR(), mode = 0644) - pisitools.dosym("llvm/LLVMgold.so", "/usr/lib32/LLVMgold.so") - pisitools.remove("/usr/lib32/llvm/*LLVMHello.*") - return - else: - autotools.rawInstall("DESTDIR=%s \ - PROJ_etcdir=/etc/llvm \ - PROJ_libdir=%s \ - PROJ_docsdir=/%s/llvm" - % (get.installDIR(), libdir, get.docDIR())) - - - shelltools.chmod("%s/usr/lib/llvm/*.a" % get.installDIR(), 0644) - - # Install static analyzers which aren't installed by default - for exe in ("scan-build", "scan-view"): - pisitools.insinto("/usr/lib/clang-analyzer/%s" % exe, "tools/clang/tools/%s/%s" % (exe, exe)) - pisitools.dosym("/usr/lib/clang-analyzer/%s/%s" % (exe, exe), "/usr/bin/%s" % exe) - - pisitools.dodir("/etc/ld.so.conf.d") - shelltools.echo("%s/etc/ld.so.conf.d/51-llvm.conf" % get.installDIR(), "/usr/lib/llvm") - - # Symlink the gold plugin where clang expects it - pisitools.dosym("llvm/LLVMgold.so", "/usr/lib/LLVMgold.so") - - # Remove example file - pisitools.remove("/usr/lib/llvm/*LLVMHello.*") - - pisitools.remove("/usr/share/doc/llvm/*.tar.gz") - pisitools.remove("/usr/share/doc/llvm/ocamldoc/html/*.tar.gz") - pisitools.removeDir("/usr/share/doc/llvm/ps") - - # Install vim syntax files for .ll and .td files - # llvm.vim additional file add ftdetct vim file to detect .ll and .td as llvm files - pisitools.insinto("/usr/share/vim/vimfiles/syntax", "utils/vim/*.vim") - - # Install kate syntax file - pisitools.insinto("%s/katepart/syntax" % kde4.appsdir, "utils/kate/*.xml") - + + pisitools.domove("/emul32/lib32/", "/usr/") + pisitools.insinto("/usr/include/llvm/Config/","%s/emul32/include/llvm/Config/llvm-config.h" % get.installDIR(),"llvm-config-32.h") + pisitools.insinto("/usr/bin/","%s/emul32/bin/llvm-config" % get.installDIR(),"llvm-config-32") + pisitools.removeDir("/emul32") + + shelltools.cd ("..") + pisitools.dodoc("CREDITS.TXT", "LICENSE.TXT", "README.txt") + diff --git a/programming/build/llvm/files/0001-New-MSan-mapping-layout-compiler-rt-part.patch b/programming/build/llvm/files/0001-New-MSan-mapping-layout-compiler-rt-part.patch deleted file mode 100644 index d5e06a750e..0000000000 --- a/programming/build/llvm/files/0001-New-MSan-mapping-layout-compiler-rt-part.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 0bee2d927c97454e629b0789c7f4e3d509cf4178 Mon Sep 17 00:00:00 2001 -From: Evgeniy Stepanov -Date: Thu, 8 Oct 2015 21:35:34 +0000 -Subject: [PATCH] New MSan mapping layout (compiler-rt part). - -This is an implementation of -https://github.com/google/sanitizers/issues/579 - -It has a number of advantages over the current mapping: -* Works for non-PIE executables. -* Does not require ASLR; as a consequence, debugging MSan programs in - gdb no longer requires "set disable-randomization off". -* Supports linux kernels >=4.1.2. -* The code is marginally faster and smaller. - -This is an ABI break. We never really promised ABI stability, but -this patch includes a courtesy escape hatch: a compile-time macro -that reverts back to the old mapping layout. - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@249754 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/msan/msan.h | 23 ++++++++++++++++++++++ - lib/msan/msan_allocator.cc | 8 +++++++- - test/msan/mmap.cc | 4 +++- - test/msan/strlen_of_shadow.cc | 2 +- - .../TestCases/Posix/decorate_proc_maps.cc | 4 ++-- - 5 files changed, 36 insertions(+), 5 deletions(-) - -diff --git a/lib/msan/msan.h b/lib/msan/msan.h -index 3776fa9..2d77983 100644 ---- a/lib/msan/msan.h -+++ b/lib/msan/msan.h -@@ -135,6 +135,7 @@ const MappingDesc kMemoryLayout[] = { - - #elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 - -+#ifdef MSAN_LINUX_X86_64_OLD_MAPPING - // Requries PIE binary and ASLR enabled. - // Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000). - // Heap at 0x600000000000. -@@ -146,6 +147,28 @@ const MappingDesc kMemoryLayout[] = { - - #define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x400000000000ULL) - #define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x200000000000ULL) -+#else // MSAN_LINUX_X86_64_OLD_MAPPING -+// All of the following configurations are supported. -+// ASLR disabled: main executable and DSOs at 0x555550000000 -+// PIE and ASLR: main executable and DSOs at 0x7f0000000000 -+// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000 -+// Heap at 0x700000000000. -+const MappingDesc kMemoryLayout[] = { -+ {0x000000000000ULL, 0x010000000000ULL, MappingDesc::APP, "app-1"}, -+ {0x010000000000ULL, 0x100000000000ULL, MappingDesc::SHADOW, "shadow-2"}, -+ {0x100000000000ULL, 0x110000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x110000000000ULL, 0x200000000000ULL, MappingDesc::ORIGIN, "origin-2"}, -+ {0x200000000000ULL, 0x300000000000ULL, MappingDesc::SHADOW, "shadow-3"}, -+ {0x300000000000ULL, 0x400000000000ULL, MappingDesc::ORIGIN, "origin-3"}, -+ {0x400000000000ULL, 0x500000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x500000000000ULL, 0x510000000000ULL, MappingDesc::SHADOW, "shadow-1"}, -+ {0x510000000000ULL, 0x600000000000ULL, MappingDesc::APP, "app-2"}, -+ {0x600000000000ULL, 0x610000000000ULL, MappingDesc::ORIGIN, "origin-1"}, -+ {0x610000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x700000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}}; -+#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x500000000000ULL) -+#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL) -+#endif // MSAN_LINUX_X86_64_OLD_MAPPING - - #else - #error "Unsupported platform" -diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc -index 865a458..b7d3947 100644 ---- a/lib/msan/msan_allocator.cc -+++ b/lib/msan/msan_allocator.cc -@@ -49,15 +49,21 @@ struct MsanMapUnmapCallback { - typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata), - SizeClassMap, kRegionSizeLog, ByteMap, - MsanMapUnmapCallback> PrimaryAllocator; -+ - #elif defined(__x86_64__) -+#if SANITIZER_LINUX && !defined(MSAN_LINUX_X86_64_OLD_MAPPING) -+ static const uptr kAllocatorSpace = 0x700000000000ULL; -+#else - static const uptr kAllocatorSpace = 0x600000000000ULL; -- static const uptr kAllocatorSize = 0x80000000000; // 8T. -+#endif -+ static const uptr kAllocatorSize = 0x80000000000; // 8T. - static const uptr kMetadataSize = sizeof(Metadata); - static const uptr kMaxAllowedMallocSize = 8UL << 30; - - typedef SizeClassAllocator64 PrimaryAllocator; -+ - #elif defined(__powerpc64__) - static const uptr kAllocatorSpace = 0x300000000000; - static const uptr kAllocatorSize = 0x020000000000; // 2T -diff --git a/test/msan/mmap.cc b/test/msan/mmap.cc -index 250ce34..962836c 100644 ---- a/test/msan/mmap.cc -+++ b/test/msan/mmap.cc -@@ -15,7 +15,9 @@ bool AddrIsApp(void *p) { - #if defined(__FreeBSD__) && defined(__x86_64__) - return addr < 0x010000000000ULL || addr >= 0x600000000000ULL; - #elif defined(__x86_64__) -- return addr >= 0x600000000000ULL; -+ return (addr >= 0x000000000000ULL && addr < 0x010000000000ULL) || -+ (addr >= 0x510000000000ULL && addr < 0x600000000000ULL) || -+ (addr >= 0x700000000000ULL && addr < 0x800000000000ULL); - #elif defined(__mips64) - return addr >= 0x00e000000000ULL; - #elif defined(__powerpc64__) -diff --git a/test/msan/strlen_of_shadow.cc b/test/msan/strlen_of_shadow.cc -index fee9223..0594f00 100644 ---- a/test/msan/strlen_of_shadow.cc -+++ b/test/msan/strlen_of_shadow.cc -@@ -12,7 +12,7 @@ - - const char *mem_to_shadow(const char *p) { - #if defined(__x86_64__) -- return (char *)((uintptr_t)p & ~0x400000000000ULL); -+ return (char *)((uintptr_t)p ^ 0x500000000000ULL); - #elif defined (__mips64) - return (char *)((uintptr_t)p & ~0x4000000000ULL); - #elif defined(__powerpc64__) -diff --git a/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc b/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc -index 8744c3f..36d4df5 100644 ---- a/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc -+++ b/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc -@@ -47,8 +47,8 @@ int main(void) { - // CHECK-asan: rw-p {{.*}} [high shadow] - - // CHECK-msan: ---p {{.*}} [invalid] --// CHECK-msan: rw-p {{.*}} [shadow] --// CHECK-msan: ---p {{.*}} [origin] -+// CHECK-msan: rw-p {{.*}} [shadow{{.*}}] -+// CHECK-msan: ---p {{.*}} [origin{{.*}}] - - // CHECK-tsan: rw-p {{.*}} [shadow] - // CHECK-tsan: rw-p {{.*}} [meta shadow] --- -2.6.1 - diff --git a/programming/build/llvm/files/0001-New-MSan-mapping-layout-llvm-part.patch b/programming/build/llvm/files/0001-New-MSan-mapping-layout-llvm-part.patch deleted file mode 100644 index 28fe6871e7..0000000000 --- a/programming/build/llvm/files/0001-New-MSan-mapping-layout-llvm-part.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 2c87d24da09ecd2c14c38a0b4f7a0e3f332b08ee Mon Sep 17 00:00:00 2001 -From: Evgeniy Stepanov -Date: Thu, 8 Oct 2015 21:35:26 +0000 -Subject: [PATCH] New MSan mapping layout (llvm part). - -This is an implementation of -https://github.com/google/sanitizers/issues/579 - -It has a number of advantages over the current mapping: -* Works for non-PIE executables. -* Does not require ASLR; as a consequence, debugging MSan programs in - gdb no longer requires "set disable-randomization off". -* Supports linux kernels >=4.1.2. -* The code is marginally faster and smaller. - -This is an ABI break. We never really promised ABI stability, but -this patch includes a courtesy escape hatch: a compile-time macro -that reverts back to the old mapping layout. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249753 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Transforms/Instrumentation/MemorySanitizer.cpp | 22 +++++++++++++++------- - .../MemorySanitizer/origin-alignment.ll | 10 ++++++---- - 2 files changed, 21 insertions(+), 11 deletions(-) - -diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp -index 9d4c7de..bc6da5a 100644 ---- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp -+++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp -@@ -232,10 +232,17 @@ static const MemoryMapParams Linux_I386_MemoryMapParams = { - - // x86_64 Linux - static const MemoryMapParams Linux_X86_64_MemoryMapParams = { -+#ifdef MSAN_LINUX_X86_64_OLD_MAPPING - 0x400000000000, // AndMask - 0, // XorMask (not used) - 0, // ShadowBase (not used) - 0x200000000000, // OriginBase -+#else -+ 0, // AndMask (not used) -+ 0x500000000000, // XorMask -+ 0, // ShadowBase (not used) -+ 0x100000000000, // OriginBase -+#endif - }; - - // mips64 Linux -@@ -926,16 +933,17 @@ struct MemorySanitizerVisitor : public InstVisitor { - /// - /// Offset = (Addr & ~AndMask) ^ XorMask - Value *getShadowPtrOffset(Value *Addr, IRBuilder<> &IRB) { -+ Value *OffsetLong = IRB.CreatePointerCast(Addr, MS.IntptrTy); -+ - uint64_t AndMask = MS.MapParams->AndMask; -- assert(AndMask != 0 && "AndMask shall be specified"); -- Value *OffsetLong = -- IRB.CreateAnd(IRB.CreatePointerCast(Addr, MS.IntptrTy), -- ConstantInt::get(MS.IntptrTy, ~AndMask)); -+ if (AndMask) -+ OffsetLong = -+ IRB.CreateAnd(OffsetLong, ConstantInt::get(MS.IntptrTy, ~AndMask)); - - uint64_t XorMask = MS.MapParams->XorMask; -- if (XorMask != 0) -- OffsetLong = IRB.CreateXor(OffsetLong, -- ConstantInt::get(MS.IntptrTy, XorMask)); -+ if (XorMask) -+ OffsetLong = -+ IRB.CreateXor(OffsetLong, ConstantInt::get(MS.IntptrTy, XorMask)); - return OffsetLong; - } - -diff --git a/test/Instrumentation/MemorySanitizer/origin-alignment.ll b/test/Instrumentation/MemorySanitizer/origin-alignment.ll -index ce0dbfc..562d194 100644 ---- a/test/Instrumentation/MemorySanitizer/origin-alignment.ll -+++ b/test/Instrumentation/MemorySanitizer/origin-alignment.ll -@@ -24,7 +24,7 @@ entry: - ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) --; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 and (i64 ptrtoint {{.*}} to i32*), align 8 -+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 xor (i64 ptrtoint (i8* @a8 to i64), i64 {{.*}}), i64 {{.*}}) to i32*), align 8 - ; CHECK: ret void - - -@@ -39,7 +39,7 @@ entry: - ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) --; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 and (i64 ptrtoint {{.*}} to i32*), align 4 -+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 xor (i64 ptrtoint (i8* @a4 to i64), i64 {{.*}}), i64 {{.*}}) to i32*), align 4 - ; CHECK: ret void - - -@@ -54,7 +54,8 @@ entry: - ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) --; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 and (i64 ptrtoint {{.*}} i64 -4) to i32*), align 4 -+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 xor (i64 ptrtoint (i8* @a2 to i64), i64 {{.*}}), i64 {{.*}}), i64 -4) to i32*), align 4 -+ - ; CHECK: ret void - - -@@ -69,5 +70,6 @@ entry: - ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls - ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) --; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 and (i64 ptrtoint {{.*}} i64 -4) to i32*), align 4 -+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 xor (i64 ptrtoint (i8* @a1 to i64), i64 {{.*}}), i64 {{.*}}), i64 -4) to i32*), align 4 -+ - ; CHECK: ret void --- -2.6.1 - diff --git a/programming/build/llvm/files/clang-tools-extra-3.7.0-install-clang-query.patch b/programming/build/llvm/files/clang-tools-extra-3.7.0-install-clang-query.patch deleted file mode 100644 index a632baf125..0000000000 --- a/programming/build/llvm/files/clang-tools-extra-3.7.0-install-clang-query.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -upr clang-tools-extra-3.7.0.src.orig/clang-query/tool/CMakeLists.txt clang-tools-extra-3.7.0.src/clang-query/tool/CMakeLists.txt ---- clang-tools-extra-3.7.0.src.orig/clang-query/tool/CMakeLists.txt 2015-06-20 22:28:07.000000000 +0300 -+++ clang-tools-extra-3.7.0.src/clang-query/tool/CMakeLists.txt 2015-09-28 11:51:14.724472237 +0300 -@@ -10,3 +10,5 @@ target_link_libraries(clang-query - clangQuery - clangTooling - ) -+ -+install(TARGETS clang-query RUNTIME DESTINATION bin) diff --git a/programming/build/llvm/files/lldb-3.7.0-avoid-linking-to-libLLVM.patch b/programming/build/llvm/files/lldb-3.7.0-avoid-linking-to-libLLVM.patch deleted file mode 100644 index f4859edad8..0000000000 --- a/programming/build/llvm/files/lldb-3.7.0-avoid-linking-to-libLLVM.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -upr lldb-3.7.0.src.orig/cmake/modules/AddLLDB.cmake lldb-3.7.0.src/cmake/modules/AddLLDB.cmake ---- lldb-3.7.0.src.orig/cmake/modules/AddLLDB.cmake 2015-09-28 11:42:23.439084000 +0300 -+++ lldb-3.7.0.src/cmake/modules/AddLLDB.cmake 2015-09-28 11:43:03.200237733 +0300 -@@ -56,7 +56,7 @@ macro(add_lldb_library name) - if (PARAM_OBJECT) - add_library(${name} ${libkind} ${srcs}) - else() -- llvm_add_library(${name} ${libkind} ${srcs}) -+ llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs}) - - lldb_link_common_libs(${name} "${libkind}") - -@@ -93,6 +93,6 @@ macro(add_lldb_library name) - endmacro(add_lldb_library) - - macro(add_lldb_executable name) -- add_llvm_executable(${name} ${ARGN}) -+ add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "lldb executables") - endmacro(add_lldb_executable) diff --git a/programming/build/llvm/files/llvm-3.5.0-fix-cmake-llvm-exports.patch b/programming/build/llvm/files/llvm-3.5.0-fix-cmake-llvm-exports.patch deleted file mode 100644 index 7a7d42a3d4..0000000000 --- a/programming/build/llvm/files/llvm-3.5.0-fix-cmake-llvm-exports.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: cmake/modules/Makefile -=================================================================== ---- cmake/modules/Makefile (revision 217483) -+++ cmake/modules/Makefile (revision 217484) -@@ -33,6 +33,16 @@ - LLVM_ENABLE_RTTI := 0 - endif - -+LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error)) -+ -+ifeq ($(LLVM_LIBS_TO_EXPORT),Error) -+$(error llvm-config --libs failed) -+endif -+ -+ifndef LLVM_LIBS_TO_EXPORT -+$(error LLVM_LIBS_TO_EXPORT cannot be empty) -+endif -+ - OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake - - $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) -@@ -45,7 +55,7 @@ - -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \ - -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ - -e 's/@LLVM_COMMON_DEPENDS@//' \ -- -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \ -+ -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \ - -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \ - -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \ - -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ -@@ -83,7 +93,7 @@ - $(Echo) 'Generating LLVM CMake target exports file' - $(Verb) ( \ - echo '# LLVM CMake target exports. Do not include directly.' && \ -- for lib in $(subst -l,,$(LLVMConfigLibs)); do \ -+ for lib in $(LLVM_LIBS_TO_EXPORT); do \ - echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ - echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \ - done && \ diff --git a/programming/build/llvm/files/llvm-3.5.0-force-link-pass.o.patch b/programming/build/llvm/files/llvm-3.5.0-force-link-pass.o.patch deleted file mode 100644 index acc4c13396..0000000000 --- a/programming/build/llvm/files/llvm-3.5.0-force-link-pass.o.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile -=================================================================== ---- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/bugpoint/Makefile -+++ llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile -@@ -12,6 +12,9 @@ TOOLNAME := bugpoint - LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \ - bitwriter irreader vectorize objcarcopts codegen - -+# Crappy workaround to make sure it links correctly. -+LLVMLibsOptions := ../../lib/IR/Release*/Pass.o -+ - # Support plugins. - NO_DEAD_STRIP := 1 - -Index: llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile -=================================================================== ---- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/opt/Makefile -+++ llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile -@@ -10,7 +10,9 @@ - LEVEL := ../.. - TOOLNAME := opt - LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen -+# Crappy workaround to make sure it links correctly. - -+LLVMLibsOptions := ../../lib/IR/Release*/Pass.o - # Support plugins. - NO_DEAD_STRIP := 1 - diff --git a/programming/build/llvm/files/llvm-3.6.0-use-ocamlfind-for-ocamldoc.patch b/programming/build/llvm/files/llvm-3.6.0-use-ocamlfind-for-ocamldoc.patch deleted file mode 100644 index 8a838c3a7c..0000000000 --- a/programming/build/llvm/files/llvm-3.6.0-use-ocamlfind-for-ocamldoc.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -upr llvm-3.6.0.src.orig/docs/Makefile llvm-3.6.0.src/docs/Makefile ---- llvm-3.6.0.src.orig/docs/Makefile 2014-10-29 00:45:25.000000000 +0200 -+++ llvm-3.6.0.src/docs/Makefile 2015-02-28 10:12:35.647351241 +0200 -@@ -41,7 +41,7 @@ install_targets := install-html - ifeq ($(ENABLE_DOXYGEN),1) - install_targets += install-doxygen - endif --ifdef OCAMLDOC -+ifdef OCAMLFIND - ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD))) - install_targets += install-ocamldoc - endif -@@ -49,7 +49,7 @@ endif - install-local:: $(install_targets) - - generated_targets := doxygen --ifdef OCAMLDOC -+ifdef OCAMLFIND - generated_targets += ocamldoc - endif - -@@ -120,7 +120,7 @@ regen-ocamldoc: - $(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc - $(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html - $(Verb) \ -- $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \ -+ $(OCAMLFIND) ocamldoc -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \ - `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \ - -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'` - diff --git a/programming/build/llvm/files/llvm-3.7.0-export-more-symbols.patch b/programming/build/llvm/files/llvm-3.7.0-export-more-symbols.patch deleted file mode 100644 index bc3d141da6..0000000000 --- a/programming/build/llvm/files/llvm-3.7.0-export-more-symbols.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/llvm/tools/llvm-shlib/CMakeLists.txt.orig 2015-09-06 12:31:21.765250429 +0300 -+++ src/llvm/tools/llvm-shlib/CMakeLists.txt 2015-09-06 13:17:10.820174432 +0300 -@@ -64,7 +64,7 @@ - - if (LLVM_DYLIB_EXPORT_ALL) - add_custom_command(OUTPUT ${LLVM_EXPORTED_SYMBOL_FILE} -- COMMAND echo \"LLVM*\" > ${LLVM_EXPORTED_SYMBOL_FILE} && echo \"_Z*llvm*\" >> ${LLVM_EXPORTED_SYMBOL_FILE} -+ COMMAND echo -e \"LLVM*\\n_Z*llvm*\\nConvertUTF*\\ngetNumBytesForUTF8\\nisLegalUTF8*\" > ${LLVM_EXPORTED_SYMBOL_FILE} - WORKING_DIRECTORY ${LIB_DIR} - DEPENDS ${LLVM_DYLIB_REQUIRED_EXPORTS} - COMMENT "Generating combined export list...") diff --git a/programming/build/llvm/files/llvm-3.7.0-link-tools-against-libLLVM.patch b/programming/build/llvm/files/llvm-3.7.0-link-tools-against-libLLVM.patch deleted file mode 100644 index e8c16ca29a..0000000000 --- a/programming/build/llvm/files/llvm-3.7.0-link-tools-against-libLLVM.patch +++ /dev/null @@ -1,440 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac3b978..dd50236 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -342,9 +342,21 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_BUILD_EXTERNAL_COMPILER_RT - "Build compiler-rt as an external project." OFF) - --option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" OFF) --option(LLVM_DYLIB_EXPORT_ALL "Export all symbols from libLLVM.dylib (default is C API only" OFF) --option(LLVM_DISABLE_LLVM_DYLIB_ATEXIT "Disable llvm-shlib's atexit destructors." ON) -+# You can configure which libraries from LLVM you want to include in the -+# shared library by setting LLVM_DYLIB_COMPONENTS to a semi-colon delimited -+# list of LLVM components. All component names handled by llvm-config are valid. -+if(NOT DEFINED LLVM_DYLIB_COMPONENTS) -+ set(LLVM_DYLIB_COMPONENTS "all" CACHE STRING -+ "Semicolon-separated list of components to include in libLLVM, or \"all\".") -+endif() -+option(LLVM_LINK_LLVM_DYLIB "Link tools against the libllvm dynamic library" OFF) -+option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" ${LLVM_LINK_LLVM_DYLIB}) -+option(LLVM_DYLIB_EXPORT_ALL "Export all symbols from libLLVM.dylib (default is C API only" ${LLVM_LINK_LLVM_DYLIB}) -+set(LLVM_DISABLE_LLVM_DYLIB_ATEXIT_DEFAULT ON) -+if (LLVM_LINK_LLVM_DYLIB) -+ set(LLVM_DISABLE_LLVM_DYLIB_ATEXIT_DEFAULT OFF) -+endif() -+option(LLVM_DISABLE_LLVM_DYLIB_ATEXIT "Disable llvm-shlib's atexit destructors." ${LLVM_DISABLE_LLVM_DYLIB_ATEXIT_DEFAULT}) - if(LLVM_DISABLE_LLVM_DYLIB_ATEXIT) - set(DISABLE_LLVM_DYLIB_ATEXIT 1) - endif() -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 45f6746..6b6e6e0 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -41,7 +41,7 @@ function(llvm_update_compile_flags name) - # Assume that; - # - LLVM_COMPILE_FLAGS is list. - # - PROPERTY COMPILE_FLAGS is string. -- string(REPLACE ";" " " target_compile_flags "${LLVM_COMPILE_FLAGS}") -+ string(REPLACE ";" " " target_compile_flags " ${LLVM_COMPILE_FLAGS}") - - if(update_src_props) - foreach(fn ${sources}) -@@ -303,6 +303,9 @@ endfunction(set_windows_version_resource_properties) - # MODULE - # Target ${name} might not be created on unsupported platforms. - # Check with "if(TARGET ${name})". -+# DISABLE_LLVM_LINK_LLVM_DYLIB -+# Do not link this library to libLLVM, even if -+# LLVM_LINK_LLVM_DYLIB is enabled. - # OUTPUT_NAME name - # Corresponds to OUTPUT_NAME in target properties. - # DEPENDS targets... -@@ -316,7 +319,7 @@ endfunction(set_windows_version_resource_properties) - # ) - function(llvm_add_library name) - cmake_parse_arguments(ARG -- "MODULE;SHARED;STATIC" -+ "MODULE;SHARED;STATIC;DISABLE_LLVM_LINK_LLVM_DYLIB" - "OUTPUT_NAME" - "ADDITIONAL_HEADERS;DEPENDS;LINK_COMPONENTS;LINK_LIBS;OBJLIBS" - ${ARGN}) -@@ -444,10 +447,14 @@ function(llvm_add_library name) - # property has been set to an empty value. - get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name}) - -- llvm_map_components_to_libnames(llvm_libs -- ${ARG_LINK_COMPONENTS} -- ${LLVM_LINK_COMPONENTS} -- ) -+ if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_STATIC AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB) -+ set(llvm_libs LLVM) -+ else() -+ llvm_map_components_to_libnames(llvm_libs -+ ${ARG_LINK_COMPONENTS} -+ ${LLVM_LINK_COMPONENTS} -+ ) -+ endif() - - if(CMAKE_VERSION VERSION_LESS 2.8.12) - # Link libs w/o keywords, assuming PUBLIC. -@@ -562,7 +569,22 @@ endmacro(add_llvm_loadable_module name) - - - macro(add_llvm_executable name) -- llvm_process_sources( ALL_FILES ${ARGN} ) -+ cmake_parse_arguments(ARG "DISABLE_LLVM_LINK_LLVM_DYLIB" "" "" ${ARGN}) -+ llvm_process_sources( ALL_FILES ${ARG_UNPARSED_ARGUMENTS} ) -+ -+ # Generate objlib -+ if(LLVM_ENABLE_OBJLIB) -+ # Generate an obj library for both targets. -+ set(obj_name "obj.${name}") -+ add_library(${obj_name} OBJECT EXCLUDE_FROM_ALL -+ ${ALL_FILES} -+ ) -+ llvm_update_compile_flags(${obj_name}) -+ set(ALL_FILES "$") -+ -+ set_target_properties(${obj_name} PROPERTIES FOLDER "Object Libraries") -+ endif() -+ - add_windows_version_resource_file(ALL_FILES ${ALL_FILES}) - - if( EXCLUDE_FROM_ALL ) -@@ -588,9 +610,13 @@ macro(add_llvm_executable name) - add_llvm_symbol_exports( ${name} ${LLVM_EXPORTED_SYMBOL_FILE} ) - endif(LLVM_EXPORTED_SYMBOL_FILE) - -+ if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB) -+ set(USE_SHARED USE_SHARED) -+ endif() -+ - set(EXCLUDE_FROM_ALL OFF) - set_output_directory(${name} ${LLVM_RUNTIME_OUTPUT_INTDIR} ${LLVM_LIBRARY_OUTPUT_INTDIR}) -- llvm_config( ${name} ${LLVM_LINK_COMPONENTS} ) -+ llvm_config( ${name} ${USE_SHARED} ${LLVM_LINK_COMPONENTS} ) - if( LLVM_COMMON_DEPENDS ) - add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) - endif( LLVM_COMMON_DEPENDS ) -@@ -651,7 +677,7 @@ endmacro(add_llvm_example name) - - - macro(add_llvm_utility name) -- add_llvm_executable(${name} ${ARGN}) -+ add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Utils") - if( LLVM_INSTALL_UTILS ) - install (TARGETS ${name} -@@ -785,8 +811,13 @@ function(llvm_add_go_executable binary pkgpath) - set(cppflags "${cppflags} -I${d}") - endforeach(d) - set(ldflags "${CMAKE_EXE_LINKER_FLAGS}") -+ if (LLVM_LINK_LLVM_DYLIB) -+ set(linkmode "dylib") -+ else() -+ set(linkmode "component-libs") -+ endif() - add_custom_command(OUTPUT ${binpath} -- COMMAND ${CMAKE_BINARY_DIR}/bin/llvm-go "cc=${cc}" "cxx=${cxx}" "cppflags=${cppflags}" "ldflags=${ldflags}" -+ COMMAND ${CMAKE_BINARY_DIR}/bin/llvm-go "go=${GO_EXECUTABLE}" "cc=${cc}" "cxx=${cxx}" "cppflags=${cppflags}" "ldflags=${ldflags}" "linkmode=${linkmode}" - ${ARG_GOFLAGS} build -o ${binpath} ${pkgpath} - DEPENDS llvm-config ${CMAKE_BINARY_DIR}/bin/llvm-go${CMAKE_EXECUTABLE_SUFFIX} - ${llvmlibs} ${ARG_DEPENDS} -diff --git a/cmake/modules/LLVM-Config.cmake b/cmake/modules/LLVM-Config.cmake -index 22ac714..aa68b40 100644 ---- a/cmake/modules/LLVM-Config.cmake -+++ b/cmake/modules/LLVM-Config.cmake -@@ -31,7 +31,23 @@ endfunction(is_llvm_target_library) - - - macro(llvm_config executable) -- explicit_llvm_config(${executable} ${ARGN}) -+ cmake_parse_arguments(ARG "USE_SHARED" "" "" ${ARGN}) -+ set(link_components ${ARG_UNPARSED_ARGUMENTS}) -+ -+ if(USE_SHARED) -+ # If USE_SHARED is specified, then we link against libLLVM, -+ # but also against the component libraries below. This is -+ # done in case libLLVM does not contain all of the components -+ # the target requires. -+ # -+ # TODO strip LLVM_DYLIB_COMPONENTS out of link_components. -+ # To do this, we need special handling for "all", since that -+ # may imply linking to libraries that are not included in -+ # libLLVM. -+ target_link_libraries(${executable} LLVM) -+ endif() -+ -+ explicit_llvm_config(${executable} ${link_components}) - endmacro(llvm_config) - - -diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake -index 85d720e..fcb445a 100644 ---- a/cmake/modules/TableGen.cmake -+++ b/cmake/modules/TableGen.cmake -@@ -73,6 +73,10 @@ endfunction() - macro(add_tablegen target project) - set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS}) - set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen) -+ -+ # FIXME: It leaks to user, callee of add_tablegen. -+ set(LLVM_ENABLE_OBJLIB ON) -+ - add_llvm_utility(${target} ${ARGN}) - set(LLVM_LINK_COMPONENTS ${${target}_OLD_LLVM_LINK_COMPONENTS}) - -diff --git a/tools/llvm-go/llvm-go.go b/tools/llvm-go/llvm-go.go -index c5c3fd2..ed79ca6 100644 ---- a/tools/llvm-go/llvm-go.go -+++ b/tools/llvm-go/llvm-go.go -@@ -24,6 +24,11 @@ import ( - "strings" - ) - -+const ( -+ linkmodeComponentLibs = "component-libs" -+ linkmodeDylib = "dylib" -+) -+ - type pkg struct { - llvmpath, pkgpath string - } -@@ -66,11 +71,12 @@ var components = []string{ - func llvmConfig(args ...string) string { - configpath := os.Getenv("LLVM_CONFIG") - if configpath == "" { -- // strip llvm-go, add llvm-config -- configpath = os.Args[0][:len(os.Args[0])-7] + "llvm-config" -+ bin, _ := filepath.Split(os.Args[0]) -+ configpath = filepath.Join(bin, "llvm-config") - } - - cmd := exec.Command(configpath, args...) -+ cmd.Stderr = os.Stderr - out, err := cmd.Output() - if err != nil { - panic(err.Error()) -@@ -78,11 +84,21 @@ func llvmConfig(args ...string) string { - - outstr := string(out) - outstr = strings.TrimSuffix(outstr, "\n") -- return strings.Replace(outstr, "\n", " ", -1) -+ outstr = strings.Replace(outstr, "\n", " ", -1) -+ return outstr - } - --func llvmFlags() compilerFlags { -- ldflags := llvmConfig(append([]string{"--ldflags", "--libs", "--system-libs"}, components...)...) -+func llvmFlags(linkmode string) compilerFlags { -+ ldflags := llvmConfig("--ldflags") -+ switch linkmode { -+ case linkmodeComponentLibs: -+ ldflags += " " + llvmConfig(append([]string{"--libs"}, components...)...) -+ case linkmodeDylib: -+ ldflags += " -lLLVM" -+ default: -+ panic("invalid linkmode: " + linkmode) -+ } -+ ldflags += " " + llvmConfig("--system-libs") - if runtime.GOOS != "darwin" { - // OS X doesn't like -rpath with cgo. See: - // https://code.google.com/p/go/issues/detail?id=7293 -@@ -117,8 +133,8 @@ func printComponents() { - fmt.Println(strings.Join(components, " ")) - } - --func printConfig() { -- flags := llvmFlags() -+func printConfig(linkmode string) { -+ flags := llvmFlags(linkmode) - - fmt.Printf(`// +build !byollvm - -@@ -137,7 +153,7 @@ type (run_build_sh int) - `, flags.cpp, flags.cxx, flags.ld) - } - --func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags string) { -+func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, linkmode string) { - args = addTag(args, "byollvm") - - srcdir := llvmConfig("--src-root") -@@ -166,7 +182,7 @@ func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, l - newgopathlist = append(newgopathlist, filepath.SplitList(os.Getenv("GOPATH"))...) - newgopath := strings.Join(newgopathlist, string(filepath.ListSeparator)) - -- flags := llvmFlags() -+ flags := llvmFlags(linkmode) - - newenv := []string{ - "CC=" + cc, -@@ -178,7 +194,7 @@ func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, l - "PATH=" + newpath, - } - if llgo != "" { -- newenv = append(newenv, "GCCGO=" + llgo) -+ newenv = append(newenv, "GCCGO="+llgo) - } - - for _, v := range os.Environ() { -@@ -234,45 +250,44 @@ func main() { - ldflags := os.Getenv("CGO_LDFLAGS") - gocmd := "go" - llgo := "" -+ linkmode := linkmodeComponentLibs -+ -+ flags := []struct { -+ name string -+ dest *string -+ }{ -+ {"cc", &cc}, -+ {"cxx", &cxx}, -+ {"go", &gocmd}, -+ {"llgo", &llgo}, -+ {"cppflags", &cppflags}, -+ {"ldflags", &ldflags}, -+ {"linkmode", &linkmode}, -+ } - - args := os.Args[1:] -- DONE: for { -- switch { -- case len(args) == 0: -+LOOP: -+ for { -+ if len(args) == 0 { - usage() -- case strings.HasPrefix(args[0], "cc="): -- cc = args[0][3:] -- args = args[1:] -- case strings.HasPrefix(args[0], "cxx="): -- cxx = args[0][4:] -- args = args[1:] -- case strings.HasPrefix(args[0], "go="): -- gocmd = args[0][3:] -- args = args[1:] -- case strings.HasPrefix(args[0], "llgo="): -- llgo = args[0][5:] -- args = args[1:] -- case strings.HasPrefix(args[0], "cppflags="): -- cppflags = args[0][9:] -- args = args[1:] -- case strings.HasPrefix(args[0], "cxxflags="): -- cxxflags = args[0][9:] -- args = args[1:] -- case strings.HasPrefix(args[0], "ldflags="): -- ldflags = args[0][8:] -- args = args[1:] -- default: -- break DONE - } -+ for _, flag := range flags { -+ if strings.HasPrefix(args[0], flag.name+"=") { -+ *flag.dest = args[0][len(flag.name)+1:] -+ args = args[1:] -+ continue LOOP -+ } -+ } -+ break - } - - switch args[0] { - case "build", "get", "install", "run", "test": -- runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags) -+ runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, linkmode) - case "print-components": - printComponents() - case "print-config": -- printConfig() -+ printConfig(linkmode) - default: - usage() - } -diff --git a/tools/llvm-shlib/CMakeLists.txt b/tools/llvm-shlib/CMakeLists.txt -index 54d71d3..d9bd15f 100644 ---- a/tools/llvm-shlib/CMakeLists.txt -+++ b/tools/llvm-shlib/CMakeLists.txt -@@ -2,42 +2,6 @@ - # library is enabled by setting LLVM_BUILD_LLVM_DYLIB=yes on the CMake - # commandline. By default the shared library only exports the LLVM C API. - -- --# You can configure which libraries from LLVM you want to include in the shared --# library by setting LLVM_DYLIB_COMPONENTS to a semi-colon delimited list of --# LLVM components. All compoenent names handled by llvm-config are valid. -- --if(NOT DEFINED LLVM_DYLIB_COMPONENTS) -- set(LLVM_DYLIB_COMPONENTS -- ${LLVM_TARGETS_TO_BUILD} -- Analysis -- BitReader -- BitWriter -- CodeGen -- Core -- DebugInfoDWARF -- DebugInfoPDB -- ExecutionEngine -- IPA -- IPO -- IRReader -- InstCombine -- Instrumentation -- Interpreter -- Linker -- MCDisassembler -- MCJIT -- ObjCARCOpts -- Object -- ScalarOpts -- Support -- Target -- TransformUtils -- Vectorize -- native -- ) --endif() -- - add_definitions( -DLLVM_VERSION_INFO=\"${PACKAGE_VERSION}\" ) - - set(SOURCES -@@ -46,6 +10,29 @@ set(SOURCES - - llvm_map_components_to_libnames(LIB_NAMES ${LLVM_DYLIB_COMPONENTS}) - -+if(LLVM_LINK_LLVM_DYLIB) -+ if(NOT LLVM_DYLIB_EXPORT_ALL) -+ message(FATAL_ERROR "LLVM_DYLIB_EXPORT_ALL must be ON when LLVM_LINK_LLVM_DYLIB is ON") -+ endif() -+ -+ # libLLVM.so should not have any dependencies on any other LLVM -+ # shared libraries. When using the "all" pseudo-component, -+ # LLVM_AVAILABLE_LIBS is added to the dependencies, which may -+ # contain shared libraries (e.g. libLTO). -+ # -+ # Also exclude libLLVMTableGen for the following reasons: -+ # - it is only used by internal *-tblgen utilities; -+ # - it pollutes the global options space. -+ foreach(lib ${LIB_NAMES}) -+ get_target_property(t ${lib} TYPE) -+ if("${lib}" STREQUAL "LLVMTableGen") -+ elseif("x${t}" STREQUAL "xSTATIC_LIBRARY") -+ list(APPEND FILTERED_LIB_NAMES ${lib}) -+ endif() -+ endforeach() -+ set(LIB_NAMES ${FILTERED_LIB_NAMES}) -+endif() -+ - if(NOT DEFINED LLVM_DYLIB_EXPORTED_SYMBOL_FILE) - - if( WIN32 AND NOT CYGWIN ) -@@ -95,7 +82,7 @@ else() - add_custom_target(libLLVMExports DEPENDS ${LLVM_EXPORTED_SYMBOL_FILE}) - endif() - --add_llvm_library(LLVM SHARED ${SOURCES}) -+add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB ${SOURCES}) - - list(REMOVE_DUPLICATES LIB_NAMES) - if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf" diff --git a/programming/build/llvm/files/llvm-IntrusiveRefCntPtr.patch b/programming/build/llvm/files/llvm-IntrusiveRefCntPtr.patch deleted file mode 100644 index a4269479c3..0000000000 --- a/programming/build/llvm/files/llvm-IntrusiveRefCntPtr.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- llvm/trunk/include/llvm/ADT/IntrusiveRefCntPtr.h 2014/09/23 05:23:29 218294 -+++ llvm/trunk/include/llvm/ADT/IntrusiveRefCntPtr.h 2014/09/23 06:06:43 218295 -@@ -197,6 +197,9 @@ - private: - void retain() { if (Obj) IntrusiveRefCntPtrInfo::retain(Obj); } - void release() { if (Obj) IntrusiveRefCntPtrInfo::release(Obj); } -+ -+ template -+ friend class IntrusiveRefCntPtr; - }; - - template - diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml index e0fe3610ef..b55789fd70 100644 --- a/programming/build/llvm/pspec.xml +++ b/programming/build/llvm/pspec.xml @@ -12,11 +12,11 @@ NCSA The Low Level Virtual Machine The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them. - http://llvm.org/releases/3.5.0/llvm-3.5.0.src.tar.xz - http://llvm.org/releases/3.5.0/cfe-3.5.0.src.tar.xz - http://llvm.org/releases/3.5.0/clang-tools-extra-3.5.0.src.tar.xz - http://llvm.org/releases/3.5.0/compiler-rt-3.5.0.src.tar.xz - + http://llvm.org/releases/3.8.0/llvm-3.8.0.src.tar.xz + http://llvm.org/releases/3.8.0/cfe-3.8.0.src.tar.xz + http://llvm.org/releases/3.8.0/clang-tools-extra-3.8.0.src.tar.xz + http://llvm.org/releases/3.8.0/lldb-3.8.0.src.tar.xz + http://llvm.org/releases/3.8.0/compiler-rt-3.8.0.src.tar.xz zlib-devel libxml2-devel @@ -24,18 +24,14 @@ ocaml libffi-devel groff + swig libedit-devel binutils - - llvm-3.5.0-fix-cmake-llvm-exports.patch - llvm-3.5.0-force-link-pass.o.patch - llvm-IntrusiveRefCntPtr.patch - - + llvm app:console library @@ -44,6 +40,8 @@ libxml2 libgcc ncurses + zlib + libffi /usr/bin @@ -51,15 +49,16 @@ /usr/include/llvm* /usr/lib/llvm /usr/lib - /etc/ld.so.conf.d + /etc/ld.so.conf.d /etc/llvm /usr/share/doc /usr/share/vim /usr/share/llvm/cmake - - /usr/share/kde4 /usr/share/man + + 51-llvm.conf + @@ -73,24 +72,47 @@ ncurses - /usr/lib/llvm/libLLVM-3* + /usr/lib/libLLVM.* + /usr/lib/LLVMgold.* + /usr/lib/libLTO.* + /usr/lib/bfd-plugins/LLVMgold.so /usr/share/licenses/llvm-libs/LICENSE - + - llvm-ocaml - library - programming.language.ocaml - OCaml binding for LLVM + lldb + Next generation, high-performance debugger llvm - ocaml + zlib + libffi + libedit + libgcc + ncurses + python + libxml2 - /usr/lib/ocaml + /usr/bin/argdumper + /usr/bin/lldb* + /usr/lib/liblldb + /usr/lib/python2.7/site-packages/readline.so + /usr/lib/python2.7/site-packages/lldb/* + + + lldb-devel + Development headers lldb + + lldb + + + /usr/include/lldb/* + + + llvm-clang-analyzer @@ -103,6 +125,9 @@ /usr/lib/clang-analyzer /usr/bin/scan-* + /usr/share/scan* + /usr/libexec/ccc-* + /usr/libexec/c++-* @@ -121,6 +146,7 @@ /usr/lib/clang /usr/lib/clang/libclang.so /usr/share/man/man1/clang.1 + /usr/share/clang @@ -136,7 +162,7 @@ - + llvm-32bit @@ -155,6 +181,7 @@ zlib-32bit libffi-32bit + glibc-32bit llvm @@ -163,6 +190,7 @@ ncurses-32bit zlib-32bit libffi-32bit + glibc-32bit /usr/lib32 @@ -171,8 +199,8 @@ - 2014-09-27 - 3.5.0 + 2016-04-06 + 3.8.0 First release Serdar Soytetir kaptan@pisilinux.org