/[gentoo-x86]/eclass/flag-o-matic.eclass
Gentoo

Diff of /eclass/flag-o-matic.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.101 Revision 1.108
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.101 2006/01/01 01:14:59 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.108 2006/06/15 14:45:59 vapier Exp $
4 4#
5# Maintainer: base-system@gentoo.org
5 6
6# need access to emktemp() 7# need access to emktemp()
7inherit eutils toolchain-funcs multilib 8inherit eutils toolchain-funcs multilib
8 9
9# 10#
… …
19# 20#
20#### replace-cpu-flags <old.cpus> <new.cpu> ### 21#### replace-cpu-flags <old.cpus> <new.cpu> ###
21# Replace march/mcpu flags that specify <old.cpus> 22# Replace march/mcpu flags that specify <old.cpus>
22# with flags that specify <new.cpu> 23# with flags that specify <new.cpu>
23# 24#
24#### is-flag <flag> #### 25#### is-flag[q] <flag> ####
25# Returns "true" if flag is set in C[XX]FLAGS 26# Returns "true" if flag is set in C[XX]FLAGS
26# Matches only complete a flag 27# Matches only complete a flag
28# q version sets return code but doesn't echo
29#
30#### is-ldflag[q] <flag> ####
31# Returns "true" if flag is set in LDFLAGS
32# Matches only complete a flag
33# q version sets return code but doesn't echo
27# 34#
28#### strip-flags #### 35#### strip-flags ####
29# Strip C[XX]FLAGS of everything except known 36# Strip C[XX]FLAGS of everything except known
30# good options. 37# good options.
31# 38#
… …
49# Add extra flags to your current LDFLAGS 56# Add extra flags to your current LDFLAGS
50# 57#
51#### filter-ldflags <flags> #### 58#### filter-ldflags <flags> ####
52# Remove particular flags from LDFLAGS 59# Remove particular flags from LDFLAGS
53# Matches only complete flags 60# Matches only complete flags
54#
55#### fstack-flags ####
56# hooked function for hardened gcc that appends
57# -fno-stack-protector to {C,CXX,LD}FLAGS
58# when a package is filtering -fstack-protector, -fstack-protector-all
59# notice: modern automatic specs files will also suppress -fstack-protector-all
60# when only -fno-stack-protector is given
61# 61#
62#### bindnow-flags #### 62#### bindnow-flags ####
63# Returns the flags to enable "now" binding in the current selected linker. 63# Returns the flags to enable "now" binding in the current selected linker.
64# 64#
65################ DEPRECATED functions ################ 65################ DEPRECATED functions ################
… …
96 if [[ -z ${ALLOWED_FLAGS} ]] ; then 96 if [[ -z ${ALLOWED_FLAGS} ]] ; then
97 export ALLOWED_FLAGS="-pipe" 97 export ALLOWED_FLAGS="-pipe"
98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune" 98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all" 99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking" 100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking"
101 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time" 101 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-PIE -fno-pie -fno-unit-at-a-time"
102 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3" 102 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
103 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-ident"
103 fi 104 fi
104 # allow a bunch of flags that negate features / control ABI 105 # allow a bunch of flags that negate features / control ABI
105 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 106 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
106 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \ 107 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
107 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \ 108 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
… …
113 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \ 114 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
114 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias" 115 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias"
115 116
116 # C[XX]FLAGS that we are think is ok, but needs testing 117 # C[XX]FLAGS that we are think is ok, but needs testing
117 # NOTE: currently -Os have issues with gcc3 and K6* arch's 118 # NOTE: currently -Os have issues with gcc3 and K6* arch's
118 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 119 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
119 return 0 120 return 0
121}
122
123# inverted filters for hardened compiler. This is trying to unpick
124# the hardened compiler defaults.
125_filter-hardened() {
126 local f
127 for f in "$@" ; do
128 case "${f}" in
129 # Ideally we should only concern ourselves with PIE flags,
130 # not -fPIC or -fpic, but too many places filter -fPIC without
131 # thinking about -fPIE.
132 -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie)
133 gcc-specs-pie || continue
134 is-flagq -nopie || append-flags -nopie;;
135 -fstack-protector)
136 gcc-specs-ssp || continue
137 is-flagq -fno-stack-protector || append-flags -fno-stack-protector;;
138 -fstack-protector-all)
139 gcc-specs-ssp-to-all || continue
140 is-flagq -fno-stack-protector-all || append-flags -fno-stack-protector-all;;
141 esac
142 done
143}
144
145# Remove occurrences of strings from variable given in $1
146# Strings removed are matched as globs, so for example
147# '-O*' would remove -O1, -O2 etc.
148_filter-var() {
149 local f x VAR VAL
150 declare -a new
151
152 VAR=$1
153 shift
154 eval VAL=\${${VAR}}
155 for f in ${VAL}; do
156 for x in "$@"; do
157 # Note this should work with globs like -O*
158 [[ ${f} == ${x} ]] && continue 2
159 done
160 eval new\[\${\#new\[@]}]=\${f}
161 done
162 eval export ${VAR}=\${new\[*]}
120} 163}
121 164
122filter-flags() { 165filter-flags() {
123 local x f fset 166 _filter-hardened "$@"
124 declare -a new_CFLAGS new_CXXFLAGS 167 _filter-var CFLAGS "$@"
125 168 _filter-var CXXFLAGS "$@"
126 for x in "$@" ; do
127 case "${x}" in
128 -fPIC|-fpic|-fPIE|-fpie|-pie)
129 append-flags `test_flag -fno-pie`;;
130 -fstack-protector|-fstack-protector-all)
131 fstack-flags;;
132 esac
133 done
134
135 for fset in CFLAGS CXXFLAGS; do
136 # Looping over the flags instead of using a global
137 # substitution ensures that we're working with flag atoms.
138 # Otherwise globs like -O* have the potential to wipe out the
139 # list of flags.
140 for f in ${!fset}; do
141 for x in "$@"; do
142 # Note this should work with globs like -O*
143 [[ ${f} == ${x} ]] && continue 2
144 done
145 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
146 done
147 eval export ${fset}=\${new_${fset}\[*]}
148 done
149
150 return 0 169 return 0
151} 170}
152 171
153filter-lfs-flags() { 172filter-lfs-flags() {
154 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments" 173 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
… …
162 181
163append-flags() { 182append-flags() {
164 [[ -z $* ]] && return 0 183 [[ -z $* ]] && return 0
165 export CFLAGS="${CFLAGS} $*" 184 export CFLAGS="${CFLAGS} $*"
166 export CXXFLAGS="${CXXFLAGS} $*" 185 export CXXFLAGS="${CXXFLAGS} $*"
167 [ -n "`is-flag -fno-stack-protector`" -o \
168 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
169 return 0 186 return 0
170} 187}
171 188
172replace-flags() { 189replace-flags() {
173 [[ $# != 2 ]] \ 190 [[ $# != 2 ]] \
… …
204 shift 221 shift
205 done 222 done
206 return 0 223 return 0
207} 224}
208 225
209is-flag() { 226is-flagq() {
210 local x 227 local x
211 228
212 for x in ${CFLAGS} ${CXXFLAGS} ; do 229 for x in ${CFLAGS} ${CXXFLAGS} ; do
213 # Note this should work with globs like -mcpu=ultrasparc* 230 # Note this should work with globs like -mcpu=ultrasparc*
214 if [[ ${x} == ${1} ]]; then 231 if [[ ${x} == ${1} ]]; then
215 echo true
216 return 0 232 return 0
217 fi 233 fi
218 done 234 done
235 return 1
236}
237
238is-flag() {
239 if is-flagq ${1}; then
240 echo true
241 return 0
242 fi
243 return 1
244}
245
246is-ldflagq() {
247 local x
248
249 for x in ${LDFLAGS} ; do
250 # Note this should work with globs like -mcpu=ultrasparc*
251 if [[ ${x} == ${1} ]]; then
252 return 0
253 fi
254 done
255 return 1
256}
257
258is-ldflag() {
259 if is-ldflagq ${1}; then
260 echo true
261 return 0
262 fi
219 return 1 263 return 1
220} 264}
221 265
222filter-mfpmath() { 266filter-mfpmath() {
223 local orig_mfpmath new_math prune_math 267 local orig_mfpmath new_math prune_math
… …
343# its really only present due to the append-flags() abomination. 387# its really only present due to the append-flags() abomination.
344test-flags() { test-flags-CC "$@"; } 388test-flags() { test-flags-CC "$@"; }
345 389
346# Depriciated, use test-flags() 390# Depriciated, use test-flags()
347test_flag() { 391test_flag() {
348 addwrite "/dev/stderr"
349 ewarn "test_flag: deprecated, please use test-flags()!" >/dev/stderr 392 ewarn "test_flag: deprecated, please use test-flags()!" >&2
350 393
351 test-flags-CC "$@" 394 test-flags-CC "$@"
352} 395}
353 396
354test_version_info() { 397test_version_info() {
… …
390 return 1 433 return 1
391} 434}
392 435
393# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs 436# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
394has_hardened() { 437has_hardened() {
395 addwrite "/dev/stderr"
396 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" \ 438 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
397 >/dev/stderr
398 439
399 test_version_info Hardened && return 0 440 test_version_info Hardened && return 0
400 # The specs file wont exist unless gcc has GCC_SPECS support 441 # The specs file wont exist unless gcc has GCC_SPECS support
401 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]] 442 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
402} 443}
403 444
404# DEPRECATED - use gcc-specs-pie from toolchain-funcs 445# DEPRECATED - use gcc-specs-pie from toolchain-funcs
405# indicate whether PIC is set 446# indicate whether PIC is set
406has_pic() { 447has_pic() {
407 addwrite "/dev/stderr"
408 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >/dev/stderr 448 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
409 449
410 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \ 450 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
411 ${CFLAGS/-fpic} != ${CFLAGS} || \ 451 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
412 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__) ]] 452 gcc-specs-pie
413} 453}
414 454
415# DEPRECATED - use gcc-specs-pie from toolchain-funcs 455# DEPRECATED - use gcc-specs-pie from toolchain-funcs
416# indicate whether PIE is set 456# indicate whether PIE is set
417has_pie() { 457has_pie() {
418 addwrite "/dev/stderr"
419 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >/dev/stderr 458 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
420 459
421 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \ 460 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \
422 ${CFLAGS/-fpie} != ${CFLAGS} || \ 461 ${CFLAGS/-fpie} != ${CFLAGS} ]] || \
423 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__) || \ 462 gcc-specs-pie
424 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__) ]]
425 # test PIC while waiting for specs to be updated to generate __PIE__
426} 463}
427 464
428# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 465# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
429# indicate whether code for SSP is being generated for all functions 466# indicate whether code for SSP is being generated for all functions
430has_ssp_all() { 467has_ssp_all() {
431 addwrite "/dev/stderr"
432 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >/dev/stderr 468 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2
433 469
434 # note; this matches only -fstack-protector-all 470 # note; this matches only -fstack-protector-all
435 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \ 471 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \
436 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \ 472 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
437 gcc-specs-ssp 473 gcc-specs-ssp-all
438} 474}
439 475
440# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 476# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
441# indicate whether code for SSP is being generated 477# indicate whether code for SSP is being generated
442has_ssp() { 478has_ssp() {
443 addwrite "/dev/stderr"
444 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >/dev/stderr 479 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
445 480
446 # note; this matches both -fstack-protector and -fstack-protector-all 481 # note; this matches both -fstack-protector and -fstack-protector-all
447 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \ 482 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
448 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \ 483 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
449 gcc-specs-ssp 484 gcc-specs-ssp
… …
508 543
509 export CFLAGS CXXFLAGS 544 export CFLAGS CXXFLAGS
510} 545}
511 546
512append-ldflags() { 547append-ldflags() {
548 [[ -z $* ]] && return 0
513 export LDFLAGS="${LDFLAGS} $*" 549 export LDFLAGS="${LDFLAGS} $*"
514 return 0 550 return 0
515} 551}
516 552
553# Remove flags from LDFLAGS - it's up to the ebuild to filter
554# CFLAGS and CXXFLAGS via filter-flags if they need to.
517filter-ldflags() { 555filter-ldflags() {
518 local x 556 _filter-var LDFLAGS "$@"
557 return 0
558}
519 559
520 # we do this fancy spacing stuff so as to not filter 560# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
521 # out part of a flag ... we want flag atoms ! :D 561# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
522 LDFLAGS=" ${LDFLAGS} " 562# to gcc where it needs the '-Wl,'.
563raw-ldflags() {
564 local x input="$@"
565 [[ -z ${input} ]] && input=${LDFLAGS}
566 set --
523 for x in "$@" ; do 567 for x in ${input} ; do
524 LDFLAGS=${LDFLAGS// ${x} / } 568 x=${x#-Wl,}
569 set -- "$@" ${x//,/ }
525 done 570 done
526 [[ -z ${LDFLAGS// } ]] \ 571 echo "$@"
527 && LDFLAGS="" \
528 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
529 export LDFLAGS
530 return 0
531}
532
533fstack-flags() {
534 if gcc-specs-ssp; then
535 [ -z "`is-flag -fno-stack-protector`" ] &&
536 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
537 fi
538 return 0
539} 572}
540 573
541# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>, 574# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
542# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more 575# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
543# fixes. 576# fixes.
Legend:
Removed from v.1.101  
changed lines
  Added in v.1.108
  ViewVC Help
Powered by ViewVC 1.1.13