summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hardened/toolchain/branches/pieworld/eclass/flag-o-matic.eclass4
-rw-r--r--hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass12
2 files changed, 7 insertions, 9 deletions
diff --git a/hardened/toolchain/branches/pieworld/eclass/flag-o-matic.eclass b/hardened/toolchain/branches/pieworld/eclass/flag-o-matic.eclass
index b1455cf..41fad08 100644
--- a/hardened/toolchain/branches/pieworld/eclass/flag-o-matic.eclass
+++ b/hardened/toolchain/branches/pieworld/eclass/flag-o-matic.eclass
@@ -583,7 +583,7 @@ replace-sparc64-flags() {
CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
done
else
- for x in ${SPARC64_CPUS}; do
+ for x in ${SPARC64_CPUS}; do
CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
done
fi
@@ -593,7 +593,7 @@ replace-sparc64-flags() {
CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
done
else
- for x in ${SPARC64_CPUS}; do
+ for x in ${SPARC64_CPUS}; do
CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
done
fi
diff --git a/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass b/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass
index 1cf0178..bbc57b5 100644
--- a/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass
+++ b/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass
@@ -172,7 +172,6 @@ tc-arch() {
tc-ninja_magic_to_arch portage $@
}
-
# Returns the version as by `$CC -dumpversion`
gcc-fullversion() {
$(tc-getCC "$@") -dumpversion
@@ -219,9 +218,9 @@ gcc-specs-directive_raw() {
local specfiles=$(LC_ALL=C ${cc} -v 2>&1 | awk '$1=="Reading" {print $NF}')
${cc} -dumpspecs 2> /dev/null | cat - ${specfiles} | awk -v directive=$1 \
'BEGIN { pspec=""; spec=""; outside=1 }
-$1=="*"directive":" { pspec=spec; spec=""; outside=0; next }
-outside || NF==0 || ( substr($1,1,1)=="*" && substr($1,length($1),1)==":" ) { outside=1; next }
-spec=="" && substr($0,1,1)=="+" { spec=pspec " " substr($0,2); next }
+$1=="*"directive":" { pspec=spec; spec=""; outside=0; next }
+ outside || NF==0 || ( substr($1,1,1)=="*" && substr($1,length($1),1)==":" ) { outside=1; next }
+ spec=="" && substr($0,1,1)=="+" { spec=pspec " " substr($0,2); next }
{ spec=spec $0 }
END { print spec }'
return 0
@@ -245,13 +244,13 @@ gcc-specs-directive() {
return 0
}
-# Returns true if the toolchain sets relro
+# Returns true if gcc sets relro
gcc-specs-relro() {
local directive
directive=$(gcc-specs-directive link_command)
return $([[ ${directive/\{!norelro:} != ${directive} ]])
}
-# Returns true if the toolchain sets now
+# Returns true if gcc sets now
gcc-specs-now() {
local directive
directive=$(gcc-specs-directive link_command)
@@ -325,4 +324,3 @@ _tc_gen_usr_ldscript() {
done
}
gen_usr_ldscript() { _tc_gen_usr_ldscript "$@" ; }
-