commit:     5581ce5fa68491c5318b1773e232d443186f078b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 03:35:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 04:35:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5581ce5f

sys-devel/llvm: drop old <gcc-7.4 workaround

Bug: https://bugs.gentoo.org/649880
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/llvm/llvm-15.0.7-r3.ebuild          | 10 ----------
 sys-devel/llvm/llvm-16.0.6.ebuild             | 10 ----------
 sys-devel/llvm/llvm-17.0.6.ebuild             | 10 ----------
 sys-devel/llvm/llvm-18.1.0_rc1.ebuild         | 10 ----------
 sys-devel/llvm/llvm-18.1.0_rc2.ebuild         | 10 ----------
 sys-devel/llvm/llvm-19.0.0.9999.ebuild        | 10 ----------
 sys-devel/llvm/llvm-19.0.0_pre20240127.ebuild | 10 ----------
 sys-devel/llvm/llvm-19.0.0_pre20240203.ebuild | 10 ----------
 8 files changed, 80 deletions(-)

diff --git a/sys-devel/llvm/llvm-15.0.7-r3.ebuild 
b/sys-devel/llvm/llvm-15.0.7-r3.ebuild
index 160bfbcfd462..438fd4add8ae 100644
--- a/sys-devel/llvm/llvm-15.0.7-r3.ebuild
+++ b/sys-devel/llvm/llvm-15.0.7-r3.ebuild
@@ -426,16 +426,6 @@ multilib_src_configure() {
                )
        fi
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-16.0.6.ebuild 
b/sys-devel/llvm/llvm-16.0.6.ebuild
index b3a0f69644fb..809dbc7f3b8c 100644
--- a/sys-devel/llvm/llvm-16.0.6.ebuild
+++ b/sys-devel/llvm/llvm-16.0.6.ebuild
@@ -431,16 +431,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-17.0.6.ebuild 
b/sys-devel/llvm/llvm-17.0.6.ebuild
index 7adb816d2e32..8a87d9e2e08f 100644
--- a/sys-devel/llvm/llvm-17.0.6.ebuild
+++ b/sys-devel/llvm/llvm-17.0.6.ebuild
@@ -446,16 +446,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-18.1.0_rc1.ebuild 
b/sys-devel/llvm/llvm-18.1.0_rc1.ebuild
index 23646ea90d8a..8ff126c7d4a1 100644
--- a/sys-devel/llvm/llvm-18.1.0_rc1.ebuild
+++ b/sys-devel/llvm/llvm-18.1.0_rc1.ebuild
@@ -446,16 +446,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-18.1.0_rc2.ebuild 
b/sys-devel/llvm/llvm-18.1.0_rc2.ebuild
index 23646ea90d8a..8ff126c7d4a1 100644
--- a/sys-devel/llvm/llvm-18.1.0_rc2.ebuild
+++ b/sys-devel/llvm/llvm-18.1.0_rc2.ebuild
@@ -446,16 +446,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-19.0.0.9999.ebuild 
b/sys-devel/llvm/llvm-19.0.0.9999.ebuild
index 23646ea90d8a..8ff126c7d4a1 100644
--- a/sys-devel/llvm/llvm-19.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0.9999.ebuild
@@ -446,16 +446,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240127.ebuild 
b/sys-devel/llvm/llvm-19.0.0_pre20240127.ebuild
index a0c0d6fa41d6..9eac831f058b 100644
--- a/sys-devel/llvm/llvm-19.0.0_pre20240127.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0_pre20240127.ebuild
@@ -447,16 +447,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240203.ebuild 
b/sys-devel/llvm/llvm-19.0.0_pre20240203.ebuild
index 23646ea90d8a..8ff126c7d4a1 100644
--- a/sys-devel/llvm/llvm-19.0.0_pre20240203.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0_pre20240203.ebuild
@@ -446,16 +446,6 @@ multilib_src_configure() {
                -DTerminfo_LIBRARIES=-lncurses
        )
 
-       # workaround BMI bug in gcc-7 (fixed in 7.4)
-       # https://bugs.gentoo.org/649880
-       # apply only to x86, https://bugs.gentoo.org/650506
-       if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-                       [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) 
-lt 4 ]]
-       then
-               local CFLAGS="${CFLAGS} -mno-bmi"
-               local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-       fi
-
        # LLVM can have very high memory consumption while linking,
        # exhausting the limit on 32-bit linker executable
        use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"

Reply via email to