initial import
This commit is contained in:
126
clang/PKGBUILD
Normal file
126
clang/PKGBUILD
Normal file
@@ -0,0 +1,126 @@
|
||||
# Maintainer: Jesus E. <heckyel@riseup.net>
|
||||
|
||||
pkgname=clang
|
||||
pkgver=11.0.0
|
||||
pkgrel=3
|
||||
pkgdesc="C language family frontend for LLVM"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://clang.llvm.org/"
|
||||
license=('custom:Apache-2.0+LLVM-Exceptions')
|
||||
depends=('llvm-libs' 'gcc' 'compiler-rt')
|
||||
makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'tauthon')
|
||||
optdepends=('python: for scan-view and git-clang-format'
|
||||
'llvm: referenced by some clang headers')
|
||||
provides=("clang-analyzer=$pkgver" "clang-tools-extra=$pkgver")
|
||||
conflicts=('clang-analyzer' 'clang-tools-extra')
|
||||
replaces=('clang-analyzer' 'clang-tools-extra')
|
||||
_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
|
||||
source=($_source_base/$pkgname-$pkgver.src.tar.xz
|
||||
$_source_base/clang-tools-extra-$pkgver.src.tar.xz
|
||||
$_source_base/llvm-$pkgver.src.tar.xz
|
||||
enable-SSP-and-PIE-by-default.patch)
|
||||
sha512sums=('5874d99d05aa6ac0a7f5131a8522440ca1fc332a63cbfbf92f844ecb03e7f698a1839106fe6d1c8efaa839d03a4547cda5ab40f445d9923b99907d8cf1988276'
|
||||
'48d3ae04556f2c3102462053e40e228ddfffb7d19f20552faa18acea763d8d568cf65232cbb4ae03505dcb8b626eb3516b5c5004f5ca1c556129510872e28fc1'
|
||||
'b3e92091ac48772edc0c30801218ce646ef374e1968baab91df9005f58e11c3ce149b2c4c655c7001f8554fd337caa02c08783bc736153bf58f35fe008e624a4'
|
||||
'6329b0b4544abbd3e6cafa703e6538d84fe758afc0b733a883c5fca262d1d7bc9ba71be5928705953da1fcef5c0a8b97cf28c198cc51bf89f1a911e0bf7cd1fa')
|
||||
|
||||
# Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid
|
||||
# installing static libraries; inspired by Gentoo
|
||||
_get_distribution_components() {
|
||||
local target
|
||||
ninja -t targets | grep -Po 'install-\K.*(?=-stripped:)' | while read -r target; do
|
||||
case $target in
|
||||
clang-libraries|distribution)
|
||||
continue
|
||||
;;
|
||||
clang-tidy-headers)
|
||||
continue
|
||||
;;
|
||||
clang|clangd|clang-*)
|
||||
;;
|
||||
clang*|findAllSymbols)
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
echo $target
|
||||
done
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver.src"
|
||||
mkdir build
|
||||
mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
|
||||
patch -Np2 -i ../enable-SSP-and-PIE-by-default.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver.src/build"
|
||||
|
||||
local cmake_args=(
|
||||
-G Ninja
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
-DCMAKE_INSTALL_PREFIX=/usr
|
||||
-DPYTHON_EXECUTABLE=/usr/bin/python
|
||||
-DLLVM_LINK_LLVM_DYLIB=ON
|
||||
-DCLANG_LINK_CLANG_DYLIB=ON
|
||||
-DLLVM_ENABLE_RTTI=ON
|
||||
-DLLVM_BUILD_TESTS=ON
|
||||
-DLLVM_INCLUDE_DOCS=ON
|
||||
-DLLVM_BUILD_DOCS=ON
|
||||
-DLLVM_ENABLE_SPHINX=ON
|
||||
-DSPHINX_WARNINGS_AS_ERRORS=OFF
|
||||
-DLLVM_EXTERNAL_LIT=/usr/bin/lit
|
||||
-DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
|
||||
)
|
||||
|
||||
cmake .. "${cmake_args[@]}"
|
||||
local distribution_components=$(_get_distribution_components | paste -sd\;)
|
||||
test -n "$distribution_components"
|
||||
cmake_args+=(-DLLVM_DISTRIBUTION_COMPONENTS="$distribution_components")
|
||||
|
||||
cmake .. "${cmake_args[@]}"
|
||||
ninja
|
||||
}
|
||||
|
||||
_tauthon_optimize() {
|
||||
tauthon -m compileall "$@"
|
||||
tauthon -O -m compileall "$@"
|
||||
}
|
||||
|
||||
_python_optimize() {
|
||||
python -m compileall "$@"
|
||||
python -O -m compileall "$@"
|
||||
python -OO -m compileall "$@"
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver.src/build"
|
||||
|
||||
DESTDIR="$pkgdir" ninja install-distribution
|
||||
install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
|
||||
# Remove documentation sources
|
||||
rm -r "$pkgdir"/usr/share/doc/clang{,-tools}/html/{_sources,.buildinfo}
|
||||
|
||||
# Install Tauthon bindings
|
||||
install -d "$pkgdir/usr/lib/tauthon2.8/site-packages"
|
||||
cp -a ../bindings/python/clang "$pkgdir/usr/lib/tauthon2.8/site-packages/"
|
||||
_tauthon_optimize "$pkgdir/usr/lib/tauthon2.8"
|
||||
|
||||
# Install Python bindings
|
||||
install -d "$pkgdir/usr/lib/python3.8/site-packages"
|
||||
cp -a ../bindings/python/clang "$pkgdir/usr/lib/python3.8/site-packages/"
|
||||
_python_optimize "$pkgdir/usr/lib/python3.8"
|
||||
|
||||
# Fix shebang in Tauthon script
|
||||
sed -i '\|/usr/bin/env| s|python$|tauthon|' \
|
||||
"$pkgdir"/usr/share/$pkgname/run-find-all-symbols.py
|
||||
|
||||
# Compile Tauthon scripts
|
||||
_tauthon_optimize "$pkgdir/usr/share/clang"
|
||||
|
||||
# Compile Python scripts
|
||||
_python_optimize "$pkgdir/usr/share" -x 'clang-include-fixer|run-find-all-symbols'
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
336
clang/enable-SSP-and-PIE-by-default.patch
Normal file
336
clang/enable-SSP-and-PIE-by-default.patch
Normal file
@@ -0,0 +1,336 @@
|
||||
From bb7bdc61f8a80db9aa16370d9c9fd0ae7be825cc Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Mon, 12 Oct 2020 16:40:41 +0300
|
||||
Subject: [PATCH] Enable SSP and PIE by default
|
||||
|
||||
This is a minimal set of changes needed to make clang use SSP and PIE by
|
||||
default on Arch Linux. Tests that were easy to adjust have been changed
|
||||
accordingly; only test/Driver/linux-ld.c has been marked as "expected
|
||||
failure" due to the number of changes it would require (mostly replacing
|
||||
crtbegin.o with crtbeginS.o).
|
||||
|
||||
Doing so is needed in order to align clang with the new default GCC
|
||||
behavior in Arch which generates PIE executables by default and also
|
||||
defaults to -fstack-protector-strong. It is not meant to be a long term
|
||||
solution, but a simple temporary fix.
|
||||
|
||||
Hopefully these changes will be obsoleted by the introduction upstream
|
||||
of a compile-time option (https://bugs.llvm.org/show_bug.cgi?id=13410)
|
||||
---
|
||||
clang/lib/Driver/ToolChains/Linux.cpp | 14 ++++++++++++--
|
||||
clang/lib/Driver/ToolChains/Linux.h | 1 +
|
||||
clang/test/Driver/cross-linux.c | 16 ++++++++--------
|
||||
clang/test/Driver/env.c | 2 +-
|
||||
clang/test/Driver/fsanitize.c | 14 +++++++-------
|
||||
clang/test/Driver/gcc-toolchain.cpp | 2 +-
|
||||
clang/test/Driver/hexagon-toolchain-elf.c | 2 +-
|
||||
clang/test/Driver/linux-as.c | 4 ++--
|
||||
clang/test/Driver/linux-ld.c | 2 ++
|
||||
clang/test/Driver/ppc-abi.c | 16 +++++++++-------
|
||||
clang/test/Driver/riscv32-toolchain.c | 4 ++--
|
||||
clang/test/Driver/riscv64-toolchain.c | 4 ++--
|
||||
clang/test/Driver/stack-protector.c | 4 ++--
|
||||
13 files changed, 50 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
index 180350476c3..119f32ceec6 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
@@ -819,8 +819,18 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
|
||||
}
|
||||
|
||||
bool Linux::isPIEDefault() const {
|
||||
- return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
|
||||
- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
|
||||
+ const bool IsMips = getTriple().isMIPS();
|
||||
+ const bool IsAndroid = getTriple().isAndroid();
|
||||
+
|
||||
+ if (IsMips || IsAndroid)
|
||||
+ return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
|
||||
+ getTriple().isMusl() || getSanitizerArgs().requiresPIE();
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
|
||||
+ return 2;
|
||||
}
|
||||
|
||||
bool Linux::isNoExecStackDefault() const {
|
||||
diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
|
||||
index 6b16b0e6499..d0024110aef 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Linux.h
|
||||
+++ b/clang/lib/Driver/ToolChains/Linux.h
|
||||
@@ -39,6 +39,7 @@ public:
|
||||
bool isPIEDefault() const override;
|
||||
bool isNoExecStackDefault() const override;
|
||||
bool IsMathErrnoDefault() const override;
|
||||
+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
|
||||
SanitizerMask getSupportedSanitizers() const override;
|
||||
void addProfileRTLibs(const llvm::opt::ArgList &Args,
|
||||
llvm::opt::ArgStringList &CmdArgs) const override;
|
||||
diff --git a/clang/test/Driver/cross-linux.c b/clang/test/Driver/cross-linux.c
|
||||
index 6c2dab26069..c28c5653e34 100644
|
||||
--- a/clang/test/Driver/cross-linux.c
|
||||
+++ b/clang/test/Driver/cross-linux.c
|
||||
@@ -42,8 +42,8 @@
|
||||
// CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\\\}}ld"
|
||||
// CHECK-MULTI32-I386: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
|
||||
// CHECK-MULTI32-I386: "-m" "elf_i386"
|
||||
-// CHECK-MULTI32-I386: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]{{/|\\\\}}crtbegin.o"
|
||||
-// CHECK-MULTI32-I386: "-L[[gcc_install]]"
|
||||
+// CHECK-MULTI32-I386: "crti.o" "crtbeginS.o"
|
||||
+// CHECK-MULTI32-I386: "-L[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]"
|
||||
// CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib32"
|
||||
// CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib"
|
||||
// CHECK-MULTI32-I386: "-L[[sysroot]]/lib"
|
||||
@@ -60,8 +60,8 @@
|
||||
// CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/bin{{/|\\\\}}ld"
|
||||
// CHECK-MULTI32-X86-64: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
|
||||
// CHECK-MULTI32-X86-64: "-m" "elf_x86_64"
|
||||
-// CHECK-MULTI32-X86-64: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]/64{{/|\\\\}}crtbegin.o"
|
||||
-// CHECK-MULTI32-X86-64: "-L[[gcc_install]]/64"
|
||||
+// CHECK-MULTI32-X86-64: "crti.o" "crtbeginS.o"
|
||||
+// CHECK-MULTI32-X86-64: "-L[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]/64"
|
||||
// CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib64"
|
||||
// CHECK-MULTI32-X86-64: "-L[[gcc_install]]"
|
||||
// CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib"
|
||||
@@ -79,8 +79,8 @@
|
||||
// CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\\\}}ld"
|
||||
// CHECK-MULTI64-I386: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
|
||||
// CHECK-MULTI64-I386: "-m" "elf_i386"
|
||||
-// CHECK-MULTI64-I386: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]/32{{/|\\\\}}crtbegin.o"
|
||||
-// CHECK-MULTI64-I386: "-L[[gcc_install]]/32"
|
||||
+// CHECK-MULTI64-I386: "crti.o" "crtbeginS.o"
|
||||
+// CHECK-MULTI64-I386: "-L[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]/32"
|
||||
// CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib32"
|
||||
// CHECK-MULTI64-I386: "-L[[gcc_install]]"
|
||||
// CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
|
||||
@@ -98,8 +98,8 @@
|
||||
// CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../../../x86_64-unknown-linux/bin{{/|\\\\}}ld"
|
||||
// CHECK-MULTI64-X86-64: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
|
||||
// CHECK-MULTI64-X86-64: "-m" "elf_x86_64"
|
||||
-// CHECK-MULTI64-X86-64: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]{{/|\\\\}}crtbegin.o"
|
||||
-// CHECK-MULTI64-X86-64: "-L[[gcc_install]]"
|
||||
+// CHECK-MULTI64-X86-64: "crti.o" "crtbeginS.o"
|
||||
+// CHECK-MULTI64-X86-64: "-L[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]"
|
||||
// CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib64"
|
||||
// CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
|
||||
// CHECK-MULTI64-X86-64: "-L[[sysroot]]/lib"
|
||||
diff --git a/clang/test/Driver/env.c b/clang/test/Driver/env.c
|
||||
index 0371bc91c4a..ea89f525121 100644
|
||||
--- a/clang/test/Driver/env.c
|
||||
+++ b/clang/test/Driver/env.c
|
||||
@@ -20,7 +20,7 @@
|
||||
//
|
||||
// CHECK-LD-32-NOT: warning:
|
||||
// CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
|
||||
-// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
|
||||
+// CHECK-LD-32: "crtbeginS.o"
|
||||
// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
|
||||
// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
|
||||
// CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
|
||||
diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
|
||||
index 7340bfb35e4..681bb90b50e 100644
|
||||
--- a/clang/test/Driver/fsanitize.c
|
||||
+++ b/clang/test/Driver/fsanitize.c
|
||||
@@ -329,15 +329,15 @@
|
||||
// RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr -fsanitize=undefined,address %s -### 2>&1
|
||||
// OK
|
||||
|
||||
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
|
||||
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
|
||||
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
// RUN: %clang -target x86_64-unknown-freebsd -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
// RUN: %clang -target aarch64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
// RUN: %clang -target arm-linux-androideabi -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIC-NO-PIE
|
||||
// RUN: %clang -target arm-linux-androideabi24 -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
// RUN: %clang -target aarch64-linux-android -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
|
||||
-// RUN: %clang -target i386-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
|
||||
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
+// RUN: %clang -target i386-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
|
||||
|
||||
// CHECK-NO-PIE-NOT: "-pie"
|
||||
// CHECK-NO-PIE: "-mrelocation-model" "static"
|
||||
@@ -662,12 +662,12 @@
|
||||
// RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
|
||||
// NOSP-NOT: "-fsanitize=safe-stack"
|
||||
|
||||
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
||||
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
||||
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
|
||||
// RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
||||
// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
||||
-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
||||
-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
||||
+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
||||
+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
|
||||
// RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
|
||||
// NO-SP-NOT: stack-protector
|
||||
// NO-SP: "-fsanitize=safe-stack"
|
||||
diff --git a/clang/test/Driver/gcc-toolchain.cpp b/clang/test/Driver/gcc-toolchain.cpp
|
||||
index 6c872f4255c..f5006d1dd9a 100644
|
||||
--- a/clang/test/Driver/gcc-toolchain.cpp
|
||||
+++ b/clang/test/Driver/gcc-toolchain.cpp
|
||||
@@ -26,6 +26,6 @@
|
||||
// the same precise formatting of the path as the '-internal-system' flags
|
||||
// above, so we just blanket wildcard match the 'crtbegin.o'.
|
||||
// CHECK: "{{[^"]*}}ld{{(.exe)?}}"
|
||||
-// CHECK: "{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
|
||||
+// CHECK: "crtbeginS.o"
|
||||
// CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5"
|
||||
// CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.."
|
||||
diff --git a/clang/test/Driver/hexagon-toolchain-elf.c b/clang/test/Driver/hexagon-toolchain-elf.c
|
||||
index cc11f9fcba9..1fe8b5db587 100644
|
||||
--- a/clang/test/Driver/hexagon-toolchain-elf.c
|
||||
+++ b/clang/test/Driver/hexagon-toolchain-elf.c
|
||||
@@ -487,7 +487,7 @@
|
||||
// RUN: %s 2>&1 \
|
||||
// RUN: | FileCheck -check-prefix=CHECK042 %s
|
||||
// CHECK042: "-cc1"
|
||||
-// CHECK042: "-mrelocation-model" "static"
|
||||
+// CHECK042: "-mrelocation-model" "pic"
|
||||
// CHECK042: "-mllvm" "-hexagon-small-data-threshold=8"
|
||||
// CHECK042-NEXT: llvm-mc
|
||||
// CHECK042: "-gpsize=8"
|
||||
diff --git a/clang/test/Driver/linux-as.c b/clang/test/Driver/linux-as.c
|
||||
index 0959bd7ba0a..4056a672b6f 100644
|
||||
--- a/clang/test/Driver/linux-as.c
|
||||
+++ b/clang/test/Driver/linux-as.c
|
||||
@@ -164,7 +164,7 @@
|
||||
// CHECK-PPC-NO-MCPU-NOT: as{{.*}} "-mcpu=invalid-cpu"
|
||||
//
|
||||
// RUN: %clang -target sparc64-linux -mcpu=invalid-cpu -### \
|
||||
-// RUN: -no-integrated-as -c %s 2>&1 \
|
||||
+// RUN: -no-integrated-as -fno-pic -c %s 2>&1 \
|
||||
// RUN: | FileCheck -check-prefix=CHECK-SPARCV9 %s
|
||||
// CHECK-SPARCV9: as
|
||||
// CHECK-SPARCV9: -64
|
||||
@@ -173,7 +173,7 @@
|
||||
// CHECK-SPARCV9: -o
|
||||
//
|
||||
// RUN: %clang -target sparc64-linux -mcpu=invalid-cpu -### \
|
||||
-// RUN: -no-integrated-as -fpic -c %s 2>&1 \
|
||||
+// RUN: -no-integrated-as -c %s 2>&1 \
|
||||
// RUN: | FileCheck -check-prefix=CHECK-SPARCV9PIC %s
|
||||
// CHECK-SPARCV9PIC: as
|
||||
// CHECK-SPARCV9PIC: -64
|
||||
diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
|
||||
index ec539522c25..caf96020a15 100644
|
||||
--- a/clang/test/Driver/linux-ld.c
|
||||
+++ b/clang/test/Driver/linux-ld.c
|
||||
@@ -1,3 +1,5 @@
|
||||
+// XFAIL: linux
|
||||
+
|
||||
// General tests that ld invocations on Linux targets sane. Note that we use
|
||||
// sysroot to make these tests independent of the host system.
|
||||
//
|
||||
diff --git a/clang/test/Driver/ppc-abi.c b/clang/test/Driver/ppc-abi.c
|
||||
index aef8d8576ad..ec595f4cd96 100644
|
||||
--- a/clang/test/Driver/ppc-abi.c
|
||||
+++ b/clang/test/Driver/ppc-abi.c
|
||||
@@ -1,9 +1,9 @@
|
||||
// Check passing PowerPC ABI options to the backend.
|
||||
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
-// RUN: | FileCheck -check-prefix=CHECK-ELFv1 %s
|
||||
+// RUN: | FileCheck -check-prefix=CHECK-ELFv1-PIE %s
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
-// RUN: -mabi=elfv1 | FileCheck -check-prefix=CHECK-ELFv1 %s
|
||||
+// RUN: -mabi=elfv1 | FileCheck -check-prefix=CHECK-ELFv1-PIE %s
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
// RUN: -mabi=elfv1-qpx | FileCheck -check-prefix=CHECK-ELFv1-QPX %s
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
@@ -11,9 +11,9 @@
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
// RUN: -mcpu=a2 -mqpx | FileCheck -check-prefix=CHECK-ELFv1-QPX %s
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
-// RUN: -mcpu=a2q -mno-qpx | FileCheck -check-prefix=CHECK-ELFv1 %s
|
||||
+// RUN: -mcpu=a2q -mno-qpx | FileCheck -check-prefix=CHECK-ELFv1-PIE %s
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
-// RUN: -mabi=elfv2 | FileCheck -check-prefix=CHECK-ELFv2-BE %s
|
||||
+// RUN: -mabi=elfv2 | FileCheck -check-prefix=CHECK-ELFv2-BE-PIE %s
|
||||
|
||||
// RUN: %clang -target powerpc64le-unknown-linux-gnu %s -### -o %t.o 2>&1 \
|
||||
// RUN: | FileCheck -check-prefix=CHECK-ELFv2 %s
|
||||
@@ -33,11 +33,13 @@
|
||||
|
||||
// CHECK-ELFv1: "-mrelocation-model" "static"
|
||||
// CHECK-ELFv1: "-target-abi" "elfv1"
|
||||
-// CHECK-ELFv1-LE: "-mrelocation-model" "static"
|
||||
+// CHECK-ELFv1-PIE: "-mrelocation-model" "pic" "-pic-level" "2"
|
||||
+// CHECK-ELFv1-PIE: "-target-abi" "elfv1"
|
||||
+// CHECK-ELFv1-LE: "-mrelocation-model" "pic" "-pic-level" "2"
|
||||
// CHECK-ELFv1-LE: "-target-abi" "elfv1"
|
||||
-// CHECK-ELFv1-QPX: "-mrelocation-model" "static"
|
||||
+// CHECK-ELFv1-QPX: "-mrelocation-model" "pic" "-pic-level" "2"
|
||||
// CHECK-ELFv1-QPX: "-target-abi" "elfv1-qpx"
|
||||
-// CHECK-ELFv2: "-mrelocation-model" "static"
|
||||
+// CHECK-ELFv2: "-mrelocation-model" "pic" "-pic-level" "2"
|
||||
// CHECK-ELFv2: "-target-abi" "elfv2"
|
||||
// CHECK-ELFv2-BE: "-mrelocation-model" "static"
|
||||
// CHECK-ELFv2-BE: "-target-abi" "elfv2"
|
||||
diff --git a/clang/test/Driver/riscv32-toolchain.c b/clang/test/Driver/riscv32-toolchain.c
|
||||
index b83c9aafcbf..15b6f6496b2 100644
|
||||
--- a/clang/test/Driver/riscv32-toolchain.c
|
||||
+++ b/clang/test/Driver/riscv32-toolchain.c
|
||||
@@ -81,7 +81,7 @@
|
||||
// C-RV32-LINUX-MULTI-ILP32: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
|
||||
// C-RV32-LINUX-MULTI-ILP32: "-m" "elf32lriscv"
|
||||
// C-RV32-LINUX-MULTI-ILP32: "-dynamic-linker" "/lib/ld-linux-riscv32-ilp32.so.1"
|
||||
-// C-RV32-LINUX-MULTI-ILP32: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32{{/|\\\\}}crtbegin.o"
|
||||
+// C-RV32-LINUX-MULTI-ILP32: "crtbeginS.o"
|
||||
// C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32"
|
||||
// C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib32/ilp32"
|
||||
// C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib32/ilp32"
|
||||
@@ -96,7 +96,7 @@
|
||||
// C-RV32-LINUX-MULTI-ILP32D: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
|
||||
// C-RV32-LINUX-MULTI-ILP32D: "-m" "elf32lriscv"
|
||||
// C-RV32-LINUX-MULTI-ILP32D: "-dynamic-linker" "/lib/ld-linux-riscv32-ilp32d.so.1"
|
||||
-// C-RV32-LINUX-MULTI-ILP32D: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32d{{/|\\\\}}crtbegin.o"
|
||||
+// C-RV32-LINUX-MULTI-ILP32D: "crtbeginS.o"
|
||||
// C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32d"
|
||||
// C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib32/ilp32d"
|
||||
// C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib32/ilp32d"
|
||||
diff --git a/clang/test/Driver/riscv64-toolchain.c b/clang/test/Driver/riscv64-toolchain.c
|
||||
index 5df069eb9fd..2617551ec35 100644
|
||||
--- a/clang/test/Driver/riscv64-toolchain.c
|
||||
+++ b/clang/test/Driver/riscv64-toolchain.c
|
||||
@@ -81,7 +81,7 @@
|
||||
// C-RV64-LINUX-MULTI-LP64: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
|
||||
// C-RV64-LINUX-MULTI-LP64: "-m" "elf64lriscv"
|
||||
// C-RV64-LINUX-MULTI-LP64: "-dynamic-linker" "/lib/ld-linux-riscv64-lp64.so.1"
|
||||
-// C-RV64-LINUX-MULTI-LP64: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64{{/|\\\\}}crtbegin.o"
|
||||
+// C-RV64-LINUX-MULTI-LP64: "crtbeginS.o"
|
||||
// C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64"
|
||||
// C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64"
|
||||
// C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64"
|
||||
@@ -96,7 +96,7 @@
|
||||
// C-RV64-LINUX-MULTI-LP64D: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
|
||||
// C-RV64-LINUX-MULTI-LP64D: "-m" "elf64lriscv"
|
||||
// C-RV64-LINUX-MULTI-LP64D: "-dynamic-linker" "/lib/ld-linux-riscv64-lp64d.so.1"
|
||||
-// C-RV64-LINUX-MULTI-LP64D: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64d{{/|\\\\}}crtbegin.o"
|
||||
+// C-RV64-LINUX-MULTI-LP64D: "crtbeginS.o"
|
||||
// C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64d"
|
||||
// C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64d"
|
||||
// C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64d"
|
||||
diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
|
||||
index a3e40b50eed..dfffe0d6cf8 100644
|
||||
--- a/clang/test/Driver/stack-protector.c
|
||||
+++ b/clang/test/Driver/stack-protector.c
|
||||
@@ -3,11 +3,11 @@
|
||||
// NOSSP-NOT: "-stack-protector-buffer-size"
|
||||
|
||||
// RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP
|
||||
-// SSP: "-stack-protector" "1"
|
||||
+// SSP: "-stack-protector" "2"
|
||||
// SSP-NOT: "-stack-protector-buffer-size"
|
||||
|
||||
// RUN: %clang -target i386-unknown-linux -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
|
||||
-// SSP-BUF: "-stack-protector" "1"
|
||||
+// SSP-BUF: "-stack-protector" "2"
|
||||
// SSP-BUF: "-stack-protector-buffer-size" "16"
|
||||
|
||||
// RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD
|
||||
Reference in New Issue
Block a user