Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/
Date: Tue, 01 Jun 2021 17:27:47
Message-Id: 1622568459.609743f9fff7194ca58fec4ad967bdd9ef093f75.slyfox@gentoo
1 commit: 609743f9fff7194ca58fec4ad967bdd9ef093f75
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 1 17:13:57 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 1 17:27:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609743f9
7
8 toolchain.eclass: add -march=znver3 mangling
9
10 Noticed as a gcc-9 build failure as it does not support -march=znver3.
11
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 eclass/tests/toolchain.sh | 1 +
15 eclass/toolchain.eclass | 1 +
16 2 files changed, 2 insertions(+)
17
18 diff --git a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh
19 index 118d68c63df..8e070cad4b9 100755
20 --- a/eclass/tests/toolchain.sh
21 +++ b/eclass/tests/toolchain.sh
22 @@ -86,6 +86,7 @@ test_downgrade_arch_flags 10 "-march=native" "-march=native"
23 test_downgrade_arch_flags 8 "-march=znver1" "-march=znver2"
24 test_downgrade_arch_flags 4.2 "-march=native" "-march=native"
25 test_downgrade_arch_flags 4.1 "-march=nocona" "-march=native"
26 +test_downgrade_arch_flags 9 "-march=znver2" "-march=znver3"
27
28 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"
29 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"
30
31 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
32 index f41ce22c591..3c495631a0e 100644
33 --- a/eclass/toolchain.eclass
34 +++ b/eclass/toolchain.eclass
35 @@ -1300,6 +1300,7 @@ downgrade_arch_flags() {
36
37 # "added" "arch" "replacement"
38 local archlist=(
39 + 10 znver3 znver2
40 9 znver2 znver1
41 4.9 bdver4 bdver3
42 4.9 bonnell atom