| 1 |
commit: c920eb1e343b78b6ddf21915654103e12c4c83dc |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 27 18:32:38 2015 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 27 18:32:51 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c920eb1e |
| 7 |
|
| 8 |
sys-devel/llvm: fix compilation on armv5 |
| 9 |
|
| 10 |
Bug #562706 by maekke |
| 11 |
compiler-rt forces some -march flags when detecting arm |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.23 |
| 14 |
|
| 15 |
.../cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch | 16 ++++++++++++++++ |
| 16 |
sys-devel/llvm/llvm-3.7.0-r2.ebuild | 4 ++++ |
| 17 |
2 files changed, 20 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..943a840 |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch |
| 24 |
@@ -0,0 +1,16 @@ |
| 25 |
+diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake |
| 26 |
+--- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2015-07-30 06:28:50.000000000 +0200 |
| 27 |
++++ llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake 2015-10-27 17:10:47.365847079 +0100 |
| 28 |
+@@ -209,12 +209,6 @@ |
| 29 |
+ test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") |
| 30 |
+ test_target_arch(mips64 "" "-mips64r2" "-mabi=n64") |
| 31 |
+ endif() |
| 32 |
+- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm") |
| 33 |
+- test_target_arch(arm "" "-march=armv7-a") |
| 34 |
+- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32") |
| 35 |
+- test_target_arch(aarch32 "" "-march=armv8-a") |
| 36 |
+- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64") |
| 37 |
+- test_target_arch(aarch64 "" "-march=armv8-a") |
| 38 |
+ endif() |
| 39 |
+ set(COMPILER_RT_OS_SUFFIX "") |
| 40 |
+ endif() |
| 41 |
|
| 42 |
diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild |
| 43 |
index c63f370..8856b56 100644 |
| 44 |
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild |
| 45 |
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild |
| 46 |
@@ -181,6 +181,10 @@ src_prepare() { |
| 47 |
epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 48 |
epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 49 |
|
| 50 |
+ # Do not force -march flags on arm platforms |
| 51 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=562706 |
| 52 |
+ epatch "${FILESDIR}"/cmake/${P}-compiler_rt_arm_march_flags.patch |
| 53 |
+ |
| 54 |
# Make it possible to override CLANG_LIBDIR_SUFFIX |
| 55 |
# (that is used only to find LLVMgold.so) |
| 56 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
Archives