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

Legend:
Removed from v.1.104  
changed lines
  Added in v.1.105

  ViewVC Help
Powered by ViewVC 1.1.20