diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 50 |
2 files changed, 28 insertions, 27 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b3f39d5eb73e..0a0a165782ba 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.61 2011/12/28 05:48:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.62 2011/12/28 06:28:55 dirtyepic Exp $ + + 28 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass: + Clean up setup-allowed-flags(). 28 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass: Remove UNSTABLE_FLAGS. Keyword status should not determine what flags are diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index d0ca217f11f1..0328b63c16d8 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.162 2011/12/28 05:48:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.163 2011/12/28 06:28:55 dirtyepic Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -32,38 +32,36 @@ inherit eutils toolchain-funcs multilib # {C,CXX,F,FC}FLAGS that we allow in strip-flags # Note: shell globs and character lists are allowed setup-allowed-flags() { - if [[ -z ${ALLOWED_FLAGS} ]] ; then - export ALLOWED_FLAGS="-pipe" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O1 -O2 -Os -mcpu -march -mtune" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-strict-overflow" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-PIE -fno-pie -fno-unit-at-a-time" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-ident -fpermissive" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -W* -w" - fi + ALLOWED_FLAGS="-pipe" + ALLOWED_FLAGS+=" -O -O1 -O2 -Os -mcpu -march -mtune" + ALLOWED_FLAGS+=" -fstack-protector -fstack-protector-all" + ALLOWED_FLAGS+=" -fbounds-checking -fno-strict-overflow" + ALLOWED_FLAGS+=" -fno-PIE -fno-pie -fno-unit-at-a-time" + ALLOWED_FLAGS+=" -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+" + ALLOWED_FLAGS+=" -fno-ident -fpermissive" + ALLOWED_FLAGS+=" -W* -w" + # allow a bunch of flags that negate features / control ABI - ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all \ - -fno-strict-aliasing -fno-bounds-checking -fstrict-overflow -fno-omit-frame-pointer" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \ - -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 \ - -mno-sse4.2 -mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow \ - -mno-popcnt -mno-abm \ - -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -mplt \ + ALLOWED_FLAGS+=" -fno-stack-protector -fno-stack-protector-all \ + -fno-strict-aliasing -fno-bounds-checking -fstrict-overflow \ + -fno-omit-frame-pointer" + ALLOWED_FLAGS+=" -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse \ + -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 \ + -mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow -mno-popcnt \ + -mno-abm -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -mplt \ -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \ -mieee -mieee-with-inexact -mschedule -mfloat-gprs -mspe -mno-spe \ - -mtls-direct-seg-refs -mno-tls-direct-seg-refs \ - -mflat -mno-flat -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 -D* -U*" + -mtls-direct-seg-refs -mno-tls-direct-seg-refs -mflat -mno-flat \ + -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 -D* -U*" # 4.5 - ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-fma4 -mno-movbe -mno-xop -mno-lwp" + ALLOWED_FLAGS+=" -mno-fma4 -mno-movbe -mno-xop -mno-lwp" # 4.6 - ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-fsgsbase -mno-rdrnd -mno-f16c \ - -mno-bmi -mno-tbm" + ALLOWED_FLAGS+=" -mno-fsgsbase -mno-rdrnd -mno-f16c -mno-bmi -mno-tbm" + export ALLOWED_FLAGS return 0 } |