diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2014-06-14 07:34:59 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2014-06-14 07:34:59 +0000 |
| commit | 4d526ff2d0e70e37b335dadb9a5fc9bf90ab79f4 (patch) | |
| tree | 962ce09917ffdbe02c8cd0a962fc4dda14d31f5a /eclass | |
| parent | bump upstream security patches (diff) | |
| download | gentoo-2-4d526ff2d0e70e37b335dadb9a5fc9bf90ab79f4.tar.gz gentoo-2-4d526ff2d0e70e37b335dadb9a5fc9bf90ab79f4.tar.bz2 gentoo-2-4d526ff2d0e70e37b335dadb9a5fc9bf90ab79f4.zip | |
Add -Og, -gdwarf-*, and -fabi=* to allowed flags (bug #512534, #512754).
Use a glob for -fstack-protector and friends.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a3d031e5e02d..38a4e4032560 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1287 2014/06/14 05:14:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1288 2014/06/14 07:34:59 rhill Exp $ + + 14 Jun 2014; Ryan Hill <rhill@gentoo.org> flag-o-matic.eclass: + Add -Og, -gdwarf-*, and -fabi=* to allowed flags (bug #512534, #512754). + Use a glob for -fstack-protector and friends. 14 Jun 2014; Robin H. Johnson <robbat2@gentoo.org> flag-o-matic.eclass: If you an empty argument to append-libs, you end up with a dangling -l diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 6687789c4a13..c8663bd2158b 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.198 2014/06/14 05:14:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.199 2014/06/14 07:34:59 rhill Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -24,17 +24,17 @@ all-flag-vars() { # Note: shell globs and character lists are allowed setup-allowed-flags() { ALLOWED_FLAGS="-pipe" - ALLOWED_FLAGS+=" -O -O1 -O2 -Os -mcpu -march -mtune" - ALLOWED_FLAGS+=" -fstack-protector -fstack-protector-all" + ALLOWED_FLAGS+=" -O -O1 -O2 -Os -Og -mcpu -march -mtune" + ALLOWED_FLAGS+=" -fstack-protector*" 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+=" -g -g[0-9] -ggdb -ggdb[0-9] -gdwarf-* gstabs -gstabs+" ALLOWED_FLAGS+=" -fno-ident -fpermissive -frecord-gcc-switches" ALLOWED_FLAGS+=" -fdiagnostics*" ALLOWED_FLAGS+=" -W* -w" # allow a bunch of flags that negate features / control ABI - ALLOWED_FLAGS+=" -fno-stack-protector -fno-stack-protector-all \ + ALLOWED_FLAGS+=" -fno-stack-protector* -fabi-version=* \ -fno-strict-aliasing -fno-bounds-checking -fstrict-overflow \ -fno-omit-frame-pointer -fno-builtin*" ALLOWED_FLAGS+=" -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse \ |