| 1 |
commit: ea7b6929b52c6571eadd5d6fd6fb3f8e266a3e1e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 23 09:20:54 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 23 09:35:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7b6929 |
| 7 |
|
| 8 |
sys-devel/llvm: Apply -fno-bmi only on x86 arches |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/650506 |
| 11 |
|
| 12 |
sys-devel/llvm/llvm-6.0.0.ebuild | 5 ++++- |
| 13 |
sys-devel/llvm/llvm-6.0.9999.ebuild | 5 ++++- |
| 14 |
sys-devel/llvm/llvm-9999.ebuild | 5 ++++- |
| 15 |
3 files changed, 12 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/llvm/llvm-6.0.0.ebuild b/sys-devel/llvm/llvm-6.0.0.ebuild |
| 18 |
index 506dba50c90..9e9f2c10509 100644 |
| 19 |
--- a/sys-devel/llvm/llvm-6.0.0.ebuild |
| 20 |
+++ b/sys-devel/llvm/llvm-6.0.0.ebuild |
| 21 |
@@ -172,7 +172,10 @@ multilib_src_configure() { |
| 22 |
|
| 23 |
# workaround BMI bug in gcc-7 (fixed in 7.4) |
| 24 |
# https://bugs.gentoo.org/649880 |
| 25 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]; then |
| 26 |
+ # apply only to x86, https://bugs.gentoo.org/650506 |
| 27 |
+ if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && |
| 28 |
+ [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] |
| 29 |
+ then |
| 30 |
local CFLAGS="${CFLAGS} -mno-bmi" |
| 31 |
local CXXFLAGS="${CXXFLAGS} -mno-bmi" |
| 32 |
fi |
| 33 |
|
| 34 |
diff --git a/sys-devel/llvm/llvm-6.0.9999.ebuild b/sys-devel/llvm/llvm-6.0.9999.ebuild |
| 35 |
index 157cf1fbd33..6276ab4925a 100644 |
| 36 |
--- a/sys-devel/llvm/llvm-6.0.9999.ebuild |
| 37 |
+++ b/sys-devel/llvm/llvm-6.0.9999.ebuild |
| 38 |
@@ -172,7 +172,10 @@ multilib_src_configure() { |
| 39 |
|
| 40 |
# workaround BMI bug in gcc-7 (fixed in 7.4) |
| 41 |
# https://bugs.gentoo.org/649880 |
| 42 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]; then |
| 43 |
+ # apply only to x86, https://bugs.gentoo.org/650506 |
| 44 |
+ if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && |
| 45 |
+ [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] |
| 46 |
+ then |
| 47 |
local CFLAGS="${CFLAGS} -mno-bmi" |
| 48 |
local CXXFLAGS="${CXXFLAGS} -mno-bmi" |
| 49 |
fi |
| 50 |
|
| 51 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 52 |
index 7699f3364d0..414c82e01aa 100644 |
| 53 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 54 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 55 |
@@ -174,7 +174,10 @@ multilib_src_configure() { |
| 56 |
|
| 57 |
# workaround BMI bug in gcc-7 (fixed in 7.4) |
| 58 |
# https://bugs.gentoo.org/649880 |
| 59 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]; then |
| 60 |
+ # apply only to x86, https://bugs.gentoo.org/650506 |
| 61 |
+ if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && |
| 62 |
+ [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] |
| 63 |
+ then |
| 64 |
local CFLAGS="${CFLAGS} -mno-bmi" |
| 65 |
local CXXFLAGS="${CXXFLAGS} -mno-bmi" |
| 66 |
fi |
Archives