llvm enable static
This commit is contained in:
Rmys
@@ -16,7 +16,7 @@ libsuffix = "32" if get.buildTYPE() == "emul32" else ""
|
||||
NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()]
|
||||
|
||||
def setup():
|
||||
pisitools.ldflags.add("-fuse-ld=lld")
|
||||
#pisitools.ldflags.add("-fuse-ld=lld")
|
||||
|
||||
if get.buildTYPE() != "emul32":
|
||||
if not shelltools.can_access_directory("tools/clang"):
|
||||
@@ -38,21 +38,31 @@ def setup():
|
||||
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")
|
||||
|
||||
#clang patch
|
||||
shelltools.cd("tools")
|
||||
shelltools.system("patch -p1 < enable-SSP-and-PIE-by-default.patch")
|
||||
shelltools.cd("..")
|
||||
|
||||
shelltools.export("CC", "clang")
|
||||
shelltools.export("CXX", "clang++")
|
||||
#shelltools.export("CC", "gcc")
|
||||
#shelltools.export("CXX", "g++")
|
||||
#shelltools.export("CC", "clang")
|
||||
#shelltools.export("CXX", "clang++")
|
||||
shelltools.export("CC", "gcc")
|
||||
shelltools.export("CXX", "g++")
|
||||
else:
|
||||
shelltools.system("tar xf ../clang-%s.src.tar.xz -C tools" % get.srcVERSION())
|
||||
shelltools.move("tools/clang-%s.src" % get.srcVERSION(), "tools/clang")
|
||||
|
||||
if get.buildTYPE() == "emul32":
|
||||
shelltools.export("CC", "clang -m32")
|
||||
shelltools.export("CXX", "clang++ -m32")
|
||||
#shelltools.export("CC", "gcc -m32")
|
||||
#shelltools.export("CXX", "g++ -m32")
|
||||
#shelltools.export("CC", "clang -m32")
|
||||
#shelltools.export("CXX", "clang++ -m32")
|
||||
shelltools.export("CC", "gcc -m32")
|
||||
shelltools.export("CXX", "g++ -m32")
|
||||
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
|
||||
|
||||
#clang patch
|
||||
shelltools.cd("tools")
|
||||
shelltools.system("patch -p1 < enable-SSP-and-PIE-by-default.patch")
|
||||
shelltools.cd("..")
|
||||
|
||||
shelltools.makedirs("build")
|
||||
|
||||
@@ -80,9 +90,10 @@ def setup():
|
||||
%s \
|
||||
-DLLVM_ENABLE_FFI=ON \
|
||||
-DLLVM_BUILD_DOCS=OFF \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DLLVM_ENABLE_RTTI=ON \
|
||||
-DLLVM_ENABLE_EH=ON \
|
||||
-DLLVM_BUILD_LLVM_DYLIB=ON \
|
||||
-DLLVM_LINK_LLVM_DYLIB=ON \
|
||||
-DLLVM_INCLUDEDIR=/usr/include \
|
||||
-DLLVM_ENABLE_ASSERTIONS=OFF \
|
||||
-DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include \
|
||||
|
||||
@@ -0,0 +1,336 @@
|
||||
From 9641fc2459b07c806c1e4d2a2345213ee6c2bafd Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Sat, 11 Apr 2020 06:52:09 +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 bff1ab1009b..da54a08657d 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
@@ -917,8 +917,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 f5518eac218..2d4973cf40c 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Linux.h
|
||||
+++ b/clang/lib/Driver/ToolChains/Linux.h
|
||||
@@ -37,6 +37,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 f02f94d8c5a..358917588c7 100644
|
||||
--- a/clang/test/Driver/fsanitize.c
|
||||
+++ b/clang/test/Driver/fsanitize.c
|
||||
@@ -328,15 +328,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"
|
||||
@@ -661,12 +661,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 44bff6f703a..6575d032f5d 100644
|
||||
--- a/clang/test/Driver/hexagon-toolchain-elf.c
|
||||
+++ b/clang/test/Driver/hexagon-toolchain-elf.c
|
||||
@@ -470,7 +470,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 77ac05f3094..cb474f32898 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 51227550b52..d01d6627131 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 acc4981a2ee..50c798912d3 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
|
||||
@@ -32,11 +32,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 2ff3a585bda..f923b728c0f 100644
|
||||
--- a/clang/test/Driver/riscv32-toolchain.c
|
||||
+++ b/clang/test/Driver/riscv32-toolchain.c
|
||||
@@ -76,7 +76,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"
|
||||
@@ -91,7 +91,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 42cac51de59..42a05e02fcc 100644
|
||||
--- a/clang/test/Driver/riscv64-toolchain.c
|
||||
+++ b/clang/test/Driver/riscv64-toolchain.c
|
||||
@@ -76,7 +76,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"
|
||||
@@ -91,7 +91,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
|
||||
@@ -32,9 +32,12 @@
|
||||
<!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
|
||||
<Dependency>binutils</Dependency>
|
||||
<Dependency>gcc</Dependency>
|
||||
<Dependency>llvm-clang</Dependency>
|
||||
<Dependency>lld</Dependency>
|
||||
<!-- <Dependency>llvm-clang</Dependency> -->
|
||||
<!-- <Dependency>lld</Dependency> -->
|
||||
</BuildDependencies>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0644" target="tools/enable-SSP-and-PIE-by-default.patch">enable-SSP-and-PIE-by-default.patch</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -276,6 +279,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="12">
|
||||
<Date>2020-05-04</Date>
|
||||
<Version>10.0.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="11">
|
||||
<Date>2020-03-24</Date>
|
||||
<Version>10.0.0</Version>
|
||||
@@ -354,4 +364,4 @@
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
|
||||
Reference in New Issue
Block a user