mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
extra/llvm to 4.0.1-4
This commit is contained in:
Kevin Mihelich
parent
691d5ba99d
commit
2501389861
|
|
@ -0,0 +1,37 @@
|
|||
From ea7d4d81905ff99c5c04388909f501b1da451b79 Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Thu, 6 Jul 2017 18:53:05 +0300
|
||||
Subject: [PATCH 1/2] GCC compatibility: Ignore the -fno-plt flag
|
||||
|
||||
---
|
||||
include/clang/Driver/Options.td | 1 +
|
||||
test/Driver/clang_f_opts.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
|
||||
index 6be159fad6..364296e861 100644
|
||||
--- a/include/clang/Driver/Options.td
|
||||
+++ b/include/clang/Driver/Options.td
|
||||
@@ -2277,6 +2277,7 @@ defm ivopts : BooleanFFlag<"ivopts">, Group<clang_ignored_gcc_optimization_f_Gro
|
||||
defm non_call_exceptions : BooleanFFlag<"non-call-exceptions">, Group<clang_ignored_f_Group>;
|
||||
defm peel_loops : BooleanFFlag<"peel-loops">, Group<clang_ignored_gcc_optimization_f_Group>;
|
||||
defm permissive : BooleanFFlag<"permissive">, Group<clang_ignored_f_Group>;
|
||||
+defm plt : BooleanFFlag<"plt">, Group<clang_ignored_f_Group>;
|
||||
defm prefetch_loop_arrays : BooleanFFlag<"prefetch-loop-arrays">, Group<clang_ignored_gcc_optimization_f_Group>;
|
||||
defm printf : BooleanFFlag<"printf">, Group<clang_ignored_f_Group>;
|
||||
defm profile : BooleanFFlag<"profile">, Group<clang_ignored_f_Group>;
|
||||
diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c
|
||||
index 210e16935d..3999590c47 100644
|
||||
--- a/test/Driver/clang_f_opts.c
|
||||
+++ b/test/Driver/clang_f_opts.c
|
||||
@@ -277,6 +277,7 @@
|
||||
// RUN: -fno-caller-saves -fcaller-saves \
|
||||
// RUN: -fno-reorder-blocks -freorder-blocks \
|
||||
// RUN: -fno-schedule-insns2 -fschedule-insns2 \
|
||||
+// RUN: -fno-plt -fplt \
|
||||
// RUN: -fno-stack-check \
|
||||
// RUN: -fno-check-new -fcheck-new \
|
||||
// RUN: -ffriend-injection \
|
||||
--
|
||||
2.13.2
|
||||
|
||||
268
extra/llvm/0002-Enable-SSP-and-PIE-by-default.patch
Normal file
268
extra/llvm/0002-Enable-SSP-and-PIE-by-default.patch
Normal file
|
|
@ -0,0 +1,268 @@
|
|||
From 7c483b3a7b2d87ae1d0dde1e5c12fa2bdb22d681 Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Thu, 6 Jul 2017 18:15:43 +0300
|
||||
Subject: [PATCH 2/2] 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)
|
||||
---
|
||||
lib/Driver/ToolChains.cpp | 14 +++++++++++++-
|
||||
lib/Driver/ToolChains.h | 1 +
|
||||
lib/Driver/Tools.cpp | 1 +
|
||||
test/Driver/cross-linux.c | 16 ++++++++--------
|
||||
test/Driver/env.c | 2 +-
|
||||
test/Driver/fsanitize.c | 18 ++++++++++--------
|
||||
test/Driver/gcc-toolchain.cpp | 2 +-
|
||||
test/Driver/hexagon-toolchain-elf.c | 2 +-
|
||||
test/Driver/linux-as.c | 4 ++--
|
||||
test/Driver/linux-ld.c | 2 ++
|
||||
test/Driver/stack-protector.c | 4 ++--
|
||||
11 files changed, 42 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
|
||||
index 9bc9ae4f6a..add512e0a5 100644
|
||||
--- a/lib/Driver/ToolChains.cpp
|
||||
+++ b/lib/Driver/ToolChains.cpp
|
||||
@@ -4710,7 +4710,19 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
|
||||
}
|
||||
}
|
||||
|
||||
-bool Linux::isPIEDefault() const { return getSanitizerArgs().requiresPIE(); }
|
||||
+bool Linux::isPIEDefault() const {
|
||||
+ const bool IsMips = isMipsArch(getTriple().getArch());
|
||||
+ const bool IsAndroid = getTriple().isAndroid();
|
||||
+
|
||||
+ if (IsMips || IsAndroid)
|
||||
+ return getSanitizerArgs().requiresPIE();
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
|
||||
+ return 2;
|
||||
+}
|
||||
|
||||
SanitizerMask Linux::getSupportedSanitizers() const {
|
||||
const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
|
||||
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
|
||||
index 3240357ba6..7afe0fb5da 100644
|
||||
--- a/lib/Driver/ToolChains.h
|
||||
+++ b/lib/Driver/ToolChains.h
|
||||
@@ -880,6 +880,7 @@ public:
|
||||
void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
||||
llvm::opt::ArgStringList &CC1Args) const override;
|
||||
bool isPIEDefault() 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/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
|
||||
index 4d4a8c2428..5b8e082797 100644
|
||||
--- a/lib/Driver/Tools.cpp
|
||||
+++ b/lib/Driver/Tools.cpp
|
||||
@@ -10068,6 +10068,7 @@ void gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
|
||||
const bool IsIAMCU = ToolChain.getTriple().isOSIAMCU();
|
||||
const bool IsPIE =
|
||||
!Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_static) &&
|
||||
+ !Args.hasArg(options::OPT_nopie) &&
|
||||
(Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault());
|
||||
const bool HasCRTBeginEndFiles =
|
||||
ToolChain.getTriple().hasEnvironment() ||
|
||||
diff --git a/test/Driver/cross-linux.c b/test/Driver/cross-linux.c
|
||||
index a5ea832e77..1949c05a60 100644
|
||||
--- a/test/Driver/cross-linux.c
|
||||
+++ b/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"
|
||||
@@ -59,8 +59,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"
|
||||
@@ -77,8 +77,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"
|
||||
@@ -95,8 +95,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/test/Driver/env.c b/test/Driver/env.c
|
||||
index 0371bc91c4..ea89f52512 100644
|
||||
--- a/test/Driver/env.c
|
||||
+++ b/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/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
|
||||
index 25aea01aae..c81da6715c 100644
|
||||
--- a/test/Driver/fsanitize.c
|
||||
+++ b/test/Driver/fsanitize.c
|
||||
@@ -182,13 +182,13 @@
|
||||
// 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-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"
|
||||
@@ -424,12 +424,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=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP-ASAN
|
||||
+// 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"
|
||||
@@ -439,6 +439,8 @@
|
||||
|
||||
// NO-SP-ASAN-NOT: stack-protector
|
||||
// NO-SP-ASAN: "-fsanitize=address,safe-stack"
|
||||
+// SP-ASAN: "-fsanitize=address,safe-stack"
|
||||
+// SP-ASAN: -stack-protector
|
||||
// NO-SP-ASAN-NOT: stack-protector
|
||||
|
||||
// RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM
|
||||
diff --git a/test/Driver/gcc-toolchain.cpp b/test/Driver/gcc-toolchain.cpp
|
||||
index ca96757a2b..ae1c25e989 100644
|
||||
--- a/test/Driver/gcc-toolchain.cpp
|
||||
+++ b/test/Driver/gcc-toolchain.cpp
|
||||
@@ -24,6 +24,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/test/Driver/hexagon-toolchain-elf.c b/test/Driver/hexagon-toolchain-elf.c
|
||||
index 827c19186b..a8f0918a8d 100644
|
||||
--- a/test/Driver/hexagon-toolchain-elf.c
|
||||
+++ b/test/Driver/hexagon-toolchain-elf.c
|
||||
@@ -425,7 +425,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/test/Driver/linux-as.c b/test/Driver/linux-as.c
|
||||
index a07abc17e5..d7b1a6041d 100644
|
||||
--- a/test/Driver/linux-as.c
|
||||
+++ b/test/Driver/linux-as.c
|
||||
@@ -106,7 +106,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
|
||||
@@ -115,7 +115,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/test/Driver/linux-ld.c b/test/Driver/linux-ld.c
|
||||
index 5d1001beb0..f9f0969f1b 100644
|
||||
--- a/test/Driver/linux-ld.c
|
||||
+++ b/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/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
|
||||
index 6769b65f63..180e26f3ea 100644
|
||||
--- a/test/Driver/stack-protector.c
|
||||
+++ b/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
|
||||
--
|
||||
2.13.2
|
||||
|
||||
|
|
@ -14,10 +14,11 @@
|
|||
|
||||
buildarch=28
|
||||
highmem=1
|
||||
noautobuild=1
|
||||
|
||||
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lld' 'lldb' 'clang' 'clang-tools-extra')
|
||||
pkgver=4.0.1
|
||||
pkgrel=1
|
||||
pkgrel=4
|
||||
_ocaml_ver=4.04.1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://llvm.org/"
|
||||
|
|
@ -33,6 +34,9 @@ source=(http://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
|
|||
http://releases.llvm.org/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
|
||||
http://releases.llvm.org/$pkgver/lld-$pkgver.src.tar.xz{,.sig}
|
||||
http://releases.llvm.org/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
|
||||
0001-GCC-compatibility-Ignore-the-fno-plt-flag.patch
|
||||
0002-Enable-SSP-and-PIE-by-default.patch
|
||||
disable-llvm-symbolizer-test.patch
|
||||
lldb-gcc7.patch
|
||||
lldb-libedit.patch
|
||||
llvm-config.h)
|
||||
|
|
@ -48,6 +52,9 @@ sha256sums=('da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51'
|
|||
'SKIP'
|
||||
'8432d2dfd86044a0fc21713e0b5c1d98e1d8aad863cf67562879f47f841ac47b'
|
||||
'SKIP'
|
||||
'd26239d03983fab1f34970b94d727379ca0be689f5826e50503c4d2f314f207a'
|
||||
'686b2e05a151c9a4b36d5090ddc986432ad746bc6060a00928ee3b52d6b3e723'
|
||||
'6fff47ab5ede79d45fe64bb4903b7dfc27212a38e6cd5d01e60ebd24b7557359'
|
||||
'10cca2f593c711b1b547f479f9f783ab88f9a64b356519d9aa1367e0ff6da73a'
|
||||
'b80bda6dc26792e499b3150e13c3017be4a65280b4b9f5c9f4c07b55a46d93b6'
|
||||
'597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
|
||||
|
|
@ -56,6 +63,7 @@ validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'
|
|||
|
||||
prepare() {
|
||||
cd "$srcdir/llvm-$pkgver.src"
|
||||
mkdir build
|
||||
|
||||
mv "$srcdir/cfe-$pkgver.src" tools/clang
|
||||
mv "$srcdir/clang-tools-extra-$pkgver.src" tools/clang/tools/extra
|
||||
|
|
@ -63,10 +71,17 @@ prepare() {
|
|||
mv "$srcdir/lld-$pkgver.src" tools/lld
|
||||
mv "$srcdir/lldb-$pkgver.src" tools/lldb
|
||||
|
||||
# Disable test that fails when compiled as PIE
|
||||
# https://bugs.llvm.org/show_bug.cgi?id=31870
|
||||
patch -Np1 <../disable-llvm-symbolizer-test.patch
|
||||
|
||||
# Enable SSP and PIE by default
|
||||
patch -Np1 -d tools/clang <../0001-GCC-compatibility-Ignore-the-fno-plt-flag.patch
|
||||
patch -Np1 -d tools/clang <../0002-Enable-SSP-and-PIE-by-default.patch
|
||||
|
||||
# Fix LLDB input with recent libedit versions
|
||||
patch -Np0 -d tools/lldb <../lldb-gcc7.patch
|
||||
patch -Np1 -d tools/lldb <../lldb-libedit.patch
|
||||
|
||||
mkdir build
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
26
extra/llvm/disable-llvm-symbolizer-test.patch
Normal file
26
extra/llvm/disable-llvm-symbolizer-test.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
Description: Silent a test failing on yakkety amd64
|
||||
/tmp/buildd/llvm-toolchain-snapshot-4.0~svn279801/test/tools/llvm-symbolizer/print_context.c:16:11: error: expected string not found in input
|
||||
// CHECK: inc
|
||||
^
|
||||
<stdin>:1:1: note: scanning from here
|
||||
_fini
|
||||
^
|
||||
<stdin>:1:3: note: possible intended match here
|
||||
_fini
|
||||
^
|
||||
Author: Sylvestre <sylvestre@debian.org>
|
||||
Last-Update: 2016-08-26
|
||||
|
||||
Index: llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c
|
||||
===================================================================
|
||||
--- llvm-toolchain-3.9-3.9~+rc1.orig/test/tools/llvm-symbolizer/print_context.c
|
||||
+++ llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c
|
||||
@@ -1,7 +1,7 @@
|
||||
// REQUIRES: x86_64-linux
|
||||
// RUN: %host_cc -O0 -g %s -o %t 2>&1
|
||||
// RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s
|
||||
-
|
||||
+// XFAIL: *
|
||||
#include <stdio.h>
|
||||
|
||||
int inc(int a) {
|
||||
Loading…
Reference in a new issue