summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-03-28 20:47:22 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-03-28 20:47:22 +0000
commitb67f26b6b3afe36920b954f2a19704b8765781b3 (patch)
treefb12264e222d70eae2259b0bbe51983b826d433a
parent2020-03-28 19:38:53 UTC (diff)
parenteclass/flag-o-matic.eclass: Add missing MIPS CPU errata flags (diff)
downloadgentoo-b67f26b6b3afe36920b954f2a19704b8765781b3.tar.gz
gentoo-b67f26b6b3afe36920b954f2a19704b8765781b3.tar.bz2
gentoo-b67f26b6b3afe36920b954f2a19704b8765781b3.zip
Merge updates from master
-rw-r--r--eclass/flag-o-matic.eclass4
-rw-r--r--eclass/multilib.eclass2
-rwxr-xr-xeclass/tests/multilib.sh4
3 files changed, 6 insertions, 4 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index e76eef293e89..0c67ec9f7a76 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -56,7 +56,9 @@ setup-allowed-flags() {
-mno-faster-structs -mfaster-structs -m32 -m64 -mx32 -mabi
-mlittle-endian -mbig-endian -EL -EB -fPIC -mlive-g0 -mcmodel
-mstack-bias -mno-stack-bias -msecure-plt '-m*-toc' -mfloat-abi
- -mfix-r10000 -mno-fix-r10000 -mthumb -marm
+ -mfix-r4000 -mno-fix-r4000 -mfix-r4400 -mno-fix-r4400
+ -mfix-rm7000 -mno-fix-rm7000 -mfix-r10000 -mno-fix-r10000
+ -mr10k-cache-barrier -mthumb -marm
# gcc 4.5
-mno-fma4 -mno-movbe -mno-xop -mno-lwp
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 8b4a7dacaa37..bbaab709b4fa 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: multilib.eclass
diff --git a/eclass/tests/multilib.sh b/eclass/tests/multilib.sh
index 68c0dd6e1423..a483d4bef360 100755
--- a/eclass/tests/multilib.sh
+++ b/eclass/tests/multilib.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
source tests-common.sh
@@ -46,7 +46,7 @@ test-multilib_env() {
fi
}
-# Pick a few interesting gargets from:
+# Pick a few interesting targets from:
# $ grep -h -o -R 'CHOST=.*' ../../profiles/ | sort -u
test-multilib_env \