commit: 12bfa1e4f9595dbbcbe0a442c6a63bc3ef890cc2
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 23:11:13 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 23:53:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12bfa1e4
toolchain.eclass: fix arch downgrade for gcc-10
The bug is in lexical comparison instead of version compare.
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
eclass/tests/toolchain.sh | 12 +++++++++++-
eclass/toolchain.eclass | 17 +++++++++--------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh
index 56609aa180e..1d05f6c126b 100755
--- a/eclass/tests/toolchain.sh
+++ b/eclass/tests/toolchain.sh
@@ -12,6 +12,12 @@ source tests-common.sh
inherit toolchain
+# Ignore actually running version of gcc and fake new version
+# to force downgrade test on all conditions below.
+gcc-version() {
+ echo "99.99"
+}
+
test_downgrade_arch_flags() {
local exp msg ret=0 ver
@@ -26,13 +32,14 @@ test_downgrade_arch_flags() {
downgrade_arch_flags ${ver}
if [[ ${CFLAGS} != ${exp} ]]; then
- msg="Failure - Expected: \"${exp}\" Got: \"${CFLAGS}\""
+ msg="Failure - Expected: \"${exp}\" Got: \"${CFLAGS}\" Ver:
${ver}"
ret=1
fi
tend ${ret} ${msg}
}
# ver expected given
+test_downgrade_arch_flags 10 "-march=haswell" "-march=haswell"
test_downgrade_arch_flags 4.9 "-march=haswell" "-march=haswell"
test_downgrade_arch_flags 4.8 "-march=core-avx2" "-march=haswell"
test_downgrade_arch_flags 4.7 "-march=core-avx2" "-march=haswell"
@@ -64,6 +71,7 @@ test_downgrade_arch_flags 3.3 "-march=c3"
"-march=c3-2"
test_downgrade_arch_flags 4.5 "-march=garbage" "-march=garbage"
+test_downgrade_arch_flags 10 "-mtune=intel" "-mtune=intel"
test_downgrade_arch_flags 4.9 "-mtune=intel" "-mtune=intel"
test_downgrade_arch_flags 4.8 "-mtune=generic" "-mtune=intel"
test_downgrade_arch_flags 3.4 "" "-mtune=generic"
@@ -74,9 +82,11 @@ test_downgrade_arch_flags 4.5 "-march=amdfam10
-mtune=generic" "-march=btver2 -m
test_downgrade_arch_flags 3.3 "-march=k6-2" "-march=geode
-mtune=barcelona"
test_downgrade_arch_flags 3.4 "-march=k8" "-march=btver2
-mtune=generic"
+test_downgrade_arch_flags 10 "-march=native" "-march=native"
test_downgrade_arch_flags 4.2 "-march=native" "-march=native"
test_downgrade_arch_flags 4.1 "-march=nocona" "-march=native"
+test_downgrade_arch_flags 10 "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx
-mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1"
test_downgrade_arch_flags 4.9 "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx
-mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1"
test_downgrade_arch_flags 4.8 "-march=foo -mno-rtm -mno-avx2 -mno-avx
-mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1"
test_downgrade_arch_flags 4.7 "-march=foo -mno-avx2 -mno-avx -mno-sse4.1"
"-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 5f9bd7750dd..bd3d024f989 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1406,7 +1406,8 @@ downgrade_arch_flags() {
local arch bver i isa myarch mytune rep ver
bver=${1:-${GCC_BRANCH_VER}}
- [[ $(gcc-version) < ${bver} ]] && return 0
+ # Don't perform downgrade if running gcc is older than ebuild's.
+ tc_version_is_at_least ${bver} $(gcc-version) || return 0
[[ $(tc-arch) != amd64 && $(tc-arch) != x86 ]] && return 0
myarch=$(get-flag march)
@@ -1414,7 +1415,7 @@ downgrade_arch_flags() {
# If -march=native isn't supported we have to tease out the actual arch
if [[ ${myarch} == native || ${mytune} == native ]] ; then
- if [[ ${bver} < 4.2 ]] ; then
+ if ! tc_version_is_at_least 4.2 ${bver}; then
arch=$($(tc-getCC) -march=native -v -E -P - </dev/null
2>&1 \
| sed -rn "/cc1.*-march/s:.*-march=([^
']*).*:\1:p")
replace-cpu-flags native ${arch}
@@ -1422,10 +1423,10 @@ downgrade_arch_flags() {
fi
# Handle special -mtune flags
- [[ ${mytune} == intel && ${bver} < 4.9 ]] && replace-cpu-flags intel
generic
- [[ ${mytune} == generic && ${bver} < 4.2 ]] && filter-flags '-mtune=*'
+ [[ ${mytune} == intel ]] && ! tc_version_is_at_least 4.9 ${bver} &&
replace-cpu-flags intel generic
+ [[ ${mytune} == generic ]] && ! tc_version_is_at_least 4.2 ${bver} &&
filter-flags '-mtune=*'
[[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*'
- [[ ${bver} < 3.4 ]] && filter-flags '-mtune=*'
+ tc_version_is_at_least 3.4 ${bver} || filter-flags '-mtune=*'
# "added" "arch" "replacement"
local archlist=(
@@ -1475,8 +1476,8 @@ downgrade_arch_flags() {
[[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue
- if [[ ${ver} > ${bver} ]] ; then
- einfo "Replacing ${myarch} (added in gcc ${ver}) with
${rep}..."
+ if ! tc_version_is_at_least ${ver} ${bver}; then
+ einfo "Downgrading '${myarch}' (added in gcc ${ver})
with '${rep}'..."
[[ ${myarch} == ${arch} ]] && replace-cpu-flags
${myarch} ${rep}
[[ ${mytune} == ${arch} ]] && replace-cpu-flags
${mytune} ${rep}
continue
@@ -1524,7 +1525,7 @@ downgrade_arch_flags() {
for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do
ver=${isalist[i]}
isa=${isalist[i + 1]}
- [[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-}
+ tc_version_is_at_least ${ver} ${bver} || filter-flags ${isa}
${isa/-m/-mno-}
done
}
