From 37ea78ed917abf778722fa4e96b2944185404f2c Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 18 Jan 2018 22:07:36 +0100 Subject: sys-devel/clang: Rename patch directory 5.0.0 -> 5.0.1 --- sys-devel/clang/clang-4.0.1.ebuild | 4 +- sys-devel/clang/clang-5.0.1.ebuild | 4 +- ...arch-type-to-find-compiler-rt-libraries-o.patch | 136 --------------------- .../files/5.0.0/darwin_prefix-include-paths.patch | 18 --- ...ang-library-dir-in-LD_LIBRARY_PATH-For-st.patch | 83 ------------- ...arch-type-to-find-compiler-rt-libraries-o.patch | 136 +++++++++++++++++++++ .../files/5.0.1/darwin_prefix-include-paths.patch | 18 +++ ...ang-library-dir-in-LD_LIBRARY_PATH-For-st.patch | 83 +++++++++++++ 8 files changed, 241 insertions(+), 241 deletions(-) delete mode 100644 sys-devel/clang/files/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch delete mode 100644 sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch delete mode 100644 sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch create mode 100644 sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch create mode 100644 sys-devel/clang/files/5.0.1/darwin_prefix-include-paths.patch create mode 100644 sys-devel/clang/files/5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild index 4481c3174911..7acf3a8d9f52 100644 --- a/sys-devel/clang/clang-4.0.1.ebuild +++ b/sys-devel/clang/clang-4.0.1.ebuild @@ -89,7 +89,7 @@ src_unpack() { src_prepare() { # fix finding compiler-rt libs - eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch + eapply "${FILESDIR}"/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch # fix stand-alone doc build eapply "${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch @@ -101,7 +101,7 @@ src_prepare() { cd tools/extra || die # fix stand-alone test build for extra tools eapply "${FILESDIR}"/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch - eapply "${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch + eapply "${FILESDIR}"/5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch cd - >/dev/null || die # User patches diff --git a/sys-devel/clang/clang-5.0.1.ebuild b/sys-devel/clang/clang-5.0.1.ebuild index 1e090f2564fe..c3f455ad8975 100644 --- a/sys-devel/clang/clang-5.0.1.ebuild +++ b/sys-devel/clang/clang-5.0.1.ebuild @@ -67,9 +67,9 @@ CMAKE_BUILD_TYPE=RelWithDebInfo PATCHES=( # fix finding compiler-rt libs - "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch + "${FILESDIR}"/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch # add Prefix include paths for Darwin - "${FILESDIR}"/5.0.0/darwin_prefix-include-paths.patch + "${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch ) # Multilib notes: diff --git a/sys-devel/clang/files/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch b/sys-devel/clang/files/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch deleted file mode 100644 index 7d53cbdef3f3..000000000000 --- a/sys-devel/clang/files/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 19e3dc0ce4949cc7f869b4552c6a7f28cd59c3b7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Thu, 17 Nov 2016 14:19:18 +0100 -Subject: [PATCH] [Driver] Use arch type to find compiler-rt libraries (on - Linux) - -Use llvm::Triple::getArchTypeName() when looking for compiler-rt -libraries, rather than the exact arch string from the triple. This is -more correct as it matches the values used when building compiler-rt -(builtin-config-ix.cmake) which are the subset of the values allowed -in triples. - -For example, this fixes an issue when the compiler set for -i686-pc-linux-gnu triple would not find an i386 compiler-rt library, -while this is the exact arch that is detected by compiler-rt. The same -applies to any other i?86 variant allowed by LLVM. - -This also makes the special case for MSVC unnecessary, since now i386 -will be used reliably for all 32-bit x86 variants. ---- - lib/Driver/ToolChain.cpp | 5 +---- - .../usr/i686-unknown-linux/lib/.keep | 0 - .../usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o | 0 - test/Driver/linux-ld.c | 21 +++++++++++++++++++++ - test/Driver/nostdlib.c | 2 +- - test/Driver/print-libgcc-file-name-clangrt.c | 10 ++++++++-- - test/Driver/windows-cross.c | 2 +- - 7 files changed, 32 insertions(+), 8 deletions(-) - create mode 100644 test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep - create mode 100644 test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o - -diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp -index 6adc0386ee..7e4222f087 100644 ---- a/lib/Driver/ToolChain.cpp -+++ b/lib/Driver/ToolChain.cpp -@@ -283,15 +283,12 @@ static StringRef getArchNameForCompilerRTLib(const ToolChain &TC, - const llvm::Triple &Triple = TC.getTriple(); - bool IsWindows = Triple.isOSWindows(); - -- if (Triple.isWindowsMSVCEnvironment() && TC.getArch() == llvm::Triple::x86) -- return "i386"; -- - if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb) - return (arm::getARMFloatABI(TC, Args) == arm::FloatABI::Hard && !IsWindows) - ? "armhf" - : "arm"; - -- return TC.getArchName(); -+ return llvm::Triple::getArchTypeName(TC.getArch()); - } - - std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component, -diff --git a/test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep b/test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep -new file mode 100644 -index 0000000000..e69de29bb2 -diff --git a/test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o b/test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o -new file mode 100644 -index 0000000000..e69de29bb2 -diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c -index e5aa870866..92b199b9d4 100644 ---- a/test/Driver/linux-ld.c -+++ b/test/Driver/linux-ld.c -@@ -71,6 +71,27 @@ - // CHECK-LD-RT: libclang_rt.builtins-x86_64.a" - // - // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=i686-unknown-linux \ -+// RUN: --gcc-toolchain="" \ -+// RUN: --sysroot=%S/Inputs/basic_linux_tree \ -+// RUN: --rtlib=compiler-rt \ -+// RUN: | FileCheck --check-prefix=CHECK-LD-RT-I686 %s -+// CHECK-LD-RT-I686-NOT: warning: -+// CHECK-LD-RT-I686: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" -+// CHECK-LD-RT-I686: "--eh-frame-hdr" -+// CHECK-LD-RT-I686: "-m" "elf_i386" -+// CHECK-LD-RT-I686: "-dynamic-linker" -+// CHECK-LD-RT-I686: "{{.*}}/usr/lib/gcc/i686-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" -+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0" -+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0/../../../../i686-unknown-linux/lib" -+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0/../../.." -+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/lib" -+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib" -+// CHECK-LD-RT-I686: libclang_rt.builtins-i386.a" -+// CHECK-LD-RT-I686: "-lc" -+// CHECK-LD-RT-I686: libclang_rt.builtins-i386.a" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ - // RUN: --target=arm-linux-androideabi \ - // RUN: --gcc-toolchain="" \ - // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ -diff --git a/test/Driver/nostdlib.c b/test/Driver/nostdlib.c -index a9ef665c57..c9793d968c 100644 ---- a/test/Driver/nostdlib.c -+++ b/test/Driver/nostdlib.c -@@ -27,5 +27,5 @@ - // - // CHECK-LINUX-NOSTDLIB: warning: argument unused during compilation: '--rtlib=compiler-rt' - // CHECK-LINUX-NOSTDLIB: "{{(.*[^.0-9A-Z_a-z])?}}ld{{(.exe)?}}" --// CHECK-LINUX-NOSTDLIB-NOT: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-i686.a" -+// CHECK-LINUX-NOSTDLIB-NOT: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-i386.a" - // CHECK-MSVC-NOSTDLIB: warning: argument unused during compilation: '--rtlib=compiler-rt' -diff --git a/test/Driver/print-libgcc-file-name-clangrt.c b/test/Driver/print-libgcc-file-name-clangrt.c -index 9f8120c31d..28c758881d 100644 ---- a/test/Driver/print-libgcc-file-name-clangrt.c -+++ b/test/Driver/print-libgcc-file-name-clangrt.c -@@ -6,6 +6,12 @@ - // CHECK-CLANGRT-X8664: libclang_rt.builtins-x86_64.a - - // RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \ -+// RUN: --target=i386-pc-linux \ -+// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s -+// CHECK-CLANGRT-I386: libclang_rt.builtins-i386.a -+ -+// Check whether alternate arch values map to the correct library. -+// -+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \ - // RUN: --target=i686-pc-linux \ --// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I686 %s --// CHECK-CLANGRT-I686: libclang_rt.builtins-i686.a -+// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s -diff --git a/test/Driver/windows-cross.c b/test/Driver/windows-cross.c -index 5a2fe52b09..78b4981c9d 100644 ---- a/test/Driver/windows-cross.c -+++ b/test/Driver/windows-cross.c -@@ -59,7 +59,7 @@ - // RUN: | FileCheck %s --check-prefix CHECK-SANITIZE-ADDRESS-EXE-X86 - - // CHECK-SANITIZE-ADDRESS-EXE-X86: "-fsanitize=address" --// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic-i686.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk-i686.lib" "--undefined" "___asan_seh_interceptor" -+// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic-i386.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib" "--undefined" "___asan_seh_interceptor" - - // RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=lld-link2 -shared -o shared.dll -fsanitize=tsan -x c++ %s 2>&1 \ - // RUN: | FileCheck %s --check-prefix CHECK-SANITIZE-TSAN --- -2.11.0 - diff --git a/sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch b/sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch deleted file mode 100644 index 7744b942d0e5..000000000000 --- a/sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/lib/Frontend/InitHeaderSearch.cpp -+++ b/lib/Frontend/InitHeaderSearch.cpp -@@ -233,6 +233,7 @@ - case llvm::Triple::Bitrig: - break; - default: -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); - // FIXME: temporary hack: hard-coded paths. - AddPath("/usr/local/include", System, false); - break; -@@ -505,6 +506,7 @@ - // Add the default framework include paths on Darwin. - if (HSOpts.UseStandardSystemIncludes) { - if (triple.isOSDarwin()) { -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); - AddPath("/System/Library/Frameworks", System, true); - AddPath("/Library/Frameworks", System, true); - } diff --git a/sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch b/sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch deleted file mode 100644 index 22f6d5685f33..000000000000 --- a/sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch +++ /dev/null @@ -1,83 +0,0 @@ -From f3ff810e81c35133f6a7e463d860bcd4ca30be84 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 19 Feb 2017 12:13:04 +0100 -Subject: [PATCH 2/2] [test] Fix clang library dir in LD_LIBRARY_PATH For - stand-alone build - -Prepend the clang library directory (determined using SHLIBDIR, alike -in clang) to the LD_LIBRARY_PATH to ensure that just-built clang -libraries will be used instead of a previous installed version. - -When a stand-alone build is performed, LLVM_LIBS_DIR contains the path -to installed LLVM library directory. The same directory frequently -contains a previously installed version of clang. SHLIBDIR, on the other -hand, is always the build-tree directory, and therefore contains -the freshly built clang libraries. - -In a non-stand-alone build, both paths will be the same and therefore -including them both will not cause any issues. ---- - test/Unit/lit.cfg | 9 ++++++--- - test/lit.cfg | 5 ++++- - test/lit.site.cfg.in | 1 + - 3 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg -index ff70123c..3a1da187 100644 ---- a/test/Unit/lit.cfg -+++ b/test/Unit/lit.cfg -@@ -41,14 +41,17 @@ elif platform.system() == 'Windows': - shlibpath_var = 'PATH' - - # Point the dynamic loader at dynamic libraries in 'lib'. -+shlibdir = getattr(config, 'shlibdir', None) -+if not shlibdir: -+ lit_config.fatal('No shlibdir set!') - llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) - if not llvm_libs_dir: - lit_config.fatal('No LLVM libs dir set!') --shlibpath = os.path.pathsep.join((llvm_libs_dir, -+shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir, - config.environment.get(shlibpath_var,''))) - - # Win32 seeks DLLs along %PATH%. --if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): -- shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath)) -+if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir): -+ shlibpath = os.path.pathsep.join((shlibdir, shlibpath)) - - config.environment[shlibpath_var] = shlibpath -diff --git a/test/lit.cfg b/test/lit.cfg -index bb592936..0e7de849 100644 ---- a/test/lit.cfg -+++ b/test/lit.cfg -@@ -99,10 +99,13 @@ if clang_tools_binary_dir is not None: - clang_tools_dir, llvm_tools_dir, config.environment['PATH'])) - config.environment['PATH'] = path - -+ clang_libs_dir = getattr(config, 'clang_libs_dir', None) -+ if not clang_libs_dir: -+ lit_config.fatal('No Clang libs dir set!') - llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) - if not llvm_libs_dir: - lit_config.fatal('No LLVM libs dir set!') -- path = os.path.pathsep.join((llvm_libs_dir, -+ path = os.path.pathsep.join((clang_libs_dir, llvm_libs_dir, - config.environment.get('LD_LIBRARY_PATH',''))) - config.environment['LD_LIBRARY_PATH'] = path - -diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in -index dfd0164c..f310b59a 100644 ---- a/test/lit.site.cfg.in -+++ b/test/lit.site.cfg.in -@@ -7,6 +7,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@" - config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" - config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@" - config.clang_tools_dir = "@CLANG_TOOLS_DIR@" -+config.clang_libs_dir = "@SHLIBDIR@" - config.python_executable = "@PYTHON_EXECUTABLE@" - config.target_triple = "@TARGET_TRIPLE@" - --- -2.12.0 - diff --git a/sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch b/sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch new file mode 100644 index 000000000000..7d53cbdef3f3 --- /dev/null +++ b/sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch @@ -0,0 +1,136 @@ +From 19e3dc0ce4949cc7f869b4552c6a7f28cd59c3b7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 17 Nov 2016 14:19:18 +0100 +Subject: [PATCH] [Driver] Use arch type to find compiler-rt libraries (on + Linux) + +Use llvm::Triple::getArchTypeName() when looking for compiler-rt +libraries, rather than the exact arch string from the triple. This is +more correct as it matches the values used when building compiler-rt +(builtin-config-ix.cmake) which are the subset of the values allowed +in triples. + +For example, this fixes an issue when the compiler set for +i686-pc-linux-gnu triple would not find an i386 compiler-rt library, +while this is the exact arch that is detected by compiler-rt. The same +applies to any other i?86 variant allowed by LLVM. + +This also makes the special case for MSVC unnecessary, since now i386 +will be used reliably for all 32-bit x86 variants. +--- + lib/Driver/ToolChain.cpp | 5 +---- + .../usr/i686-unknown-linux/lib/.keep | 0 + .../usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o | 0 + test/Driver/linux-ld.c | 21 +++++++++++++++++++++ + test/Driver/nostdlib.c | 2 +- + test/Driver/print-libgcc-file-name-clangrt.c | 10 ++++++++-- + test/Driver/windows-cross.c | 2 +- + 7 files changed, 32 insertions(+), 8 deletions(-) + create mode 100644 test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep + create mode 100644 test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o + +diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp +index 6adc0386ee..7e4222f087 100644 +--- a/lib/Driver/ToolChain.cpp ++++ b/lib/Driver/ToolChain.cpp +@@ -283,15 +283,12 @@ static StringRef getArchNameForCompilerRTLib(const ToolChain &TC, + const llvm::Triple &Triple = TC.getTriple(); + bool IsWindows = Triple.isOSWindows(); + +- if (Triple.isWindowsMSVCEnvironment() && TC.getArch() == llvm::Triple::x86) +- return "i386"; +- + if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb) + return (arm::getARMFloatABI(TC, Args) == arm::FloatABI::Hard && !IsWindows) + ? "armhf" + : "arm"; + +- return TC.getArchName(); ++ return llvm::Triple::getArchTypeName(TC.getArch()); + } + + std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component, +diff --git a/test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep b/test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o b/test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c +index e5aa870866..92b199b9d4 100644 +--- a/test/Driver/linux-ld.c ++++ b/test/Driver/linux-ld.c +@@ -71,6 +71,27 @@ + // CHECK-LD-RT: libclang_rt.builtins-x86_64.a" + // + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=i686-unknown-linux \ ++// RUN: --gcc-toolchain="" \ ++// RUN: --sysroot=%S/Inputs/basic_linux_tree \ ++// RUN: --rtlib=compiler-rt \ ++// RUN: | FileCheck --check-prefix=CHECK-LD-RT-I686 %s ++// CHECK-LD-RT-I686-NOT: warning: ++// CHECK-LD-RT-I686: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" ++// CHECK-LD-RT-I686: "--eh-frame-hdr" ++// CHECK-LD-RT-I686: "-m" "elf_i386" ++// CHECK-LD-RT-I686: "-dynamic-linker" ++// CHECK-LD-RT-I686: "{{.*}}/usr/lib/gcc/i686-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o" ++// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0" ++// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0/../../../../i686-unknown-linux/lib" ++// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0/../../.." ++// CHECK-LD-RT-I686: "-L[[SYSROOT]]/lib" ++// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib" ++// CHECK-LD-RT-I686: libclang_rt.builtins-i386.a" ++// CHECK-LD-RT-I686: "-lc" ++// CHECK-LD-RT-I686: libclang_rt.builtins-i386.a" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ + // RUN: --target=arm-linux-androideabi \ + // RUN: --gcc-toolchain="" \ + // RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +diff --git a/test/Driver/nostdlib.c b/test/Driver/nostdlib.c +index a9ef665c57..c9793d968c 100644 +--- a/test/Driver/nostdlib.c ++++ b/test/Driver/nostdlib.c +@@ -27,5 +27,5 @@ + // + // CHECK-LINUX-NOSTDLIB: warning: argument unused during compilation: '--rtlib=compiler-rt' + // CHECK-LINUX-NOSTDLIB: "{{(.*[^.0-9A-Z_a-z])?}}ld{{(.exe)?}}" +-// CHECK-LINUX-NOSTDLIB-NOT: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-i686.a" ++// CHECK-LINUX-NOSTDLIB-NOT: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-i386.a" + // CHECK-MSVC-NOSTDLIB: warning: argument unused during compilation: '--rtlib=compiler-rt' +diff --git a/test/Driver/print-libgcc-file-name-clangrt.c b/test/Driver/print-libgcc-file-name-clangrt.c +index 9f8120c31d..28c758881d 100644 +--- a/test/Driver/print-libgcc-file-name-clangrt.c ++++ b/test/Driver/print-libgcc-file-name-clangrt.c +@@ -6,6 +6,12 @@ + // CHECK-CLANGRT-X8664: libclang_rt.builtins-x86_64.a + + // RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \ ++// RUN: --target=i386-pc-linux \ ++// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s ++// CHECK-CLANGRT-I386: libclang_rt.builtins-i386.a ++ ++// Check whether alternate arch values map to the correct library. ++// ++// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \ + // RUN: --target=i686-pc-linux \ +-// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I686 %s +-// CHECK-CLANGRT-I686: libclang_rt.builtins-i686.a ++// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s +diff --git a/test/Driver/windows-cross.c b/test/Driver/windows-cross.c +index 5a2fe52b09..78b4981c9d 100644 +--- a/test/Driver/windows-cross.c ++++ b/test/Driver/windows-cross.c +@@ -59,7 +59,7 @@ + // RUN: | FileCheck %s --check-prefix CHECK-SANITIZE-ADDRESS-EXE-X86 + + // CHECK-SANITIZE-ADDRESS-EXE-X86: "-fsanitize=address" +-// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic-i686.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk-i686.lib" "--undefined" "___asan_seh_interceptor" ++// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic-i386.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib" "--undefined" "___asan_seh_interceptor" + + // RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=lld-link2 -shared -o shared.dll -fsanitize=tsan -x c++ %s 2>&1 \ + // RUN: | FileCheck %s --check-prefix CHECK-SANITIZE-TSAN +-- +2.11.0 + diff --git a/sys-devel/clang/files/5.0.1/darwin_prefix-include-paths.patch b/sys-devel/clang/files/5.0.1/darwin_prefix-include-paths.patch new file mode 100644 index 000000000000..7744b942d0e5 --- /dev/null +++ b/sys-devel/clang/files/5.0.1/darwin_prefix-include-paths.patch @@ -0,0 +1,18 @@ +--- a/lib/Frontend/InitHeaderSearch.cpp ++++ b/lib/Frontend/InitHeaderSearch.cpp +@@ -233,6 +233,7 @@ + case llvm::Triple::Bitrig: + break; + default: ++ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); + // FIXME: temporary hack: hard-coded paths. + AddPath("/usr/local/include", System, false); + break; +@@ -505,6 +506,7 @@ + // Add the default framework include paths on Darwin. + if (HSOpts.UseStandardSystemIncludes) { + if (triple.isOSDarwin()) { ++ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); + AddPath("/System/Library/Frameworks", System, true); + AddPath("/Library/Frameworks", System, true); + } diff --git a/sys-devel/clang/files/5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch b/sys-devel/clang/files/5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch new file mode 100644 index 000000000000..22f6d5685f33 --- /dev/null +++ b/sys-devel/clang/files/5.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch @@ -0,0 +1,83 @@ +From f3ff810e81c35133f6a7e463d860bcd4ca30be84 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 19 Feb 2017 12:13:04 +0100 +Subject: [PATCH 2/2] [test] Fix clang library dir in LD_LIBRARY_PATH For + stand-alone build + +Prepend the clang library directory (determined using SHLIBDIR, alike +in clang) to the LD_LIBRARY_PATH to ensure that just-built clang +libraries will be used instead of a previous installed version. + +When a stand-alone build is performed, LLVM_LIBS_DIR contains the path +to installed LLVM library directory. The same directory frequently +contains a previously installed version of clang. SHLIBDIR, on the other +hand, is always the build-tree directory, and therefore contains +the freshly built clang libraries. + +In a non-stand-alone build, both paths will be the same and therefore +including them both will not cause any issues. +--- + test/Unit/lit.cfg | 9 ++++++--- + test/lit.cfg | 5 ++++- + test/lit.site.cfg.in | 1 + + 3 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg +index ff70123c..3a1da187 100644 +--- a/test/Unit/lit.cfg ++++ b/test/Unit/lit.cfg +@@ -41,14 +41,17 @@ elif platform.system() == 'Windows': + shlibpath_var = 'PATH' + + # Point the dynamic loader at dynamic libraries in 'lib'. ++shlibdir = getattr(config, 'shlibdir', None) ++if not shlibdir: ++ lit_config.fatal('No shlibdir set!') + llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) + if not llvm_libs_dir: + lit_config.fatal('No LLVM libs dir set!') +-shlibpath = os.path.pathsep.join((llvm_libs_dir, ++shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir, + config.environment.get(shlibpath_var,''))) + + # Win32 seeks DLLs along %PATH%. +-if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): +- shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath)) ++if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir): ++ shlibpath = os.path.pathsep.join((shlibdir, shlibpath)) + + config.environment[shlibpath_var] = shlibpath +diff --git a/test/lit.cfg b/test/lit.cfg +index bb592936..0e7de849 100644 +--- a/test/lit.cfg ++++ b/test/lit.cfg +@@ -99,10 +99,13 @@ if clang_tools_binary_dir is not None: + clang_tools_dir, llvm_tools_dir, config.environment['PATH'])) + config.environment['PATH'] = path + ++ clang_libs_dir = getattr(config, 'clang_libs_dir', None) ++ if not clang_libs_dir: ++ lit_config.fatal('No Clang libs dir set!') + llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) + if not llvm_libs_dir: + lit_config.fatal('No LLVM libs dir set!') +- path = os.path.pathsep.join((llvm_libs_dir, ++ path = os.path.pathsep.join((clang_libs_dir, llvm_libs_dir, + config.environment.get('LD_LIBRARY_PATH',''))) + config.environment['LD_LIBRARY_PATH'] = path + +diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in +index dfd0164c..f310b59a 100644 +--- a/test/lit.site.cfg.in ++++ b/test/lit.site.cfg.in +@@ -7,6 +7,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@" + config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" + config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@" + config.clang_tools_dir = "@CLANG_TOOLS_DIR@" ++config.clang_libs_dir = "@SHLIBDIR@" + config.python_executable = "@PYTHON_EXECUTABLE@" + config.target_triple = "@TARGET_TRIPLE@" + +-- +2.12.0 + -- cgit v1.2.3-65-gdbad