diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2011-12-28 05:48:28 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2011-12-28 05:48:28 +0000 |
| commit | 5972ac10122d1af303458af7d6291e714e452de2 (patch) | |
| tree | 00dde35cda57f8000ea2a799be9e5b8ad55820e6 /eclass | |
| parent | Stable for HPPA (bug #395735). (diff) | |
| download | gentoo-2-5972ac10122d1af303458af7d6291e714e452de2.tar.gz gentoo-2-5972ac10122d1af303458af7d6291e714e452de2.tar.bz2 gentoo-2-5972ac10122d1af303458af7d6291e714e452de2.zip | |
Remove UNSTABLE_FLAGS. Keyword status should not determine what flags are used. Move -Os to allowed flags as it's been stable since 4.0ish and drop -O0 because it breaks things a lot.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f2e4971effec..b3f39d5eb73e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.60 2011/12/27 22:40:50 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.61 2011/12/28 05:48:28 dirtyepic Exp $ + + 28 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass: + Remove UNSTABLE_FLAGS. Keyword status should not determine what flags are + used. Move -Os to allowed flags as it's been stable since 4.0ish and drop -O0 + because it breaks things a lot. 27 Dec 2011; Jesus Rivero <neurogeek@gentoo.org> subversion.eclass: Handle UUID mismatch by deleting working copy and checking out it again. diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 0c7c4700d490..d0ca217f11f1 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.161 2011/12/15 05:23:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.162 2011/12/28 05:48:28 dirtyepic Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -34,7 +34,7 @@ inherit eutils toolchain-funcs multilib setup-allowed-flags() { if [[ -z ${ALLOWED_FLAGS} ]] ; then export ALLOWED_FLAGS="-pipe" - export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune" + 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" @@ -64,9 +64,6 @@ setup-allowed-flags() { ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-fsgsbase -mno-rdrnd -mno-f16c \ -mno-bmi -mno-tbm" - # {C,CXX,F,FC}FLAGS that we are think is ok, but needs testing - # NOTE: currently -Os have issues with gcc3 and K6* arch's - export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks" return 0 } @@ -338,11 +335,6 @@ strip-flags() { local NEW_FFLAGS="" local NEW_FCFLAGS="" - # Allow unstable C[XX]FLAGS if we are using unstable profile ... - if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then - ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" - fi - set -f # disable pathname expansion for x in ${CFLAGS}; do |