/[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.165 Revision 1.173
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 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.165 2012/01/14 08:05:32 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.173 2012/05/31 00:29:06 vapier Exp $
4 4
5# @ECLASS: flag-o-matic.eclass 5# @ECLASS: flag-o-matic.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# toolchain@gentoo.org 7# toolchain@gentoo.org
8# @BLURB: common functions to manipulate and query toolchain flags 8# @BLURB: common functions to manipulate and query toolchain flags
12 12
13if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then 13if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then
14___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank" 14___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank"
15 15
16inherit eutils toolchain-funcs multilib 16inherit eutils toolchain-funcs multilib
17
18# Return all the flag variables that our high level funcs operate on.
19all-flag-vars() {
20 echo {C,CPP,CXX,CCAS,F,FC,LD}FLAGS
21}
17 22
18# {C,CXX,F,FC}FLAGS that we allow in strip-flags 23# {C,CXX,F,FC}FLAGS that we allow in strip-flags
19# Note: shell globs and character lists are allowed 24# Note: shell globs and character lists are allowed
20setup-allowed-flags() { 25setup-allowed-flags() {
21 ALLOWED_FLAGS="-pipe" 26 ALLOWED_FLAGS="-pipe"
78 83
79# Remove occurrences of strings from variable given in $1 84# Remove occurrences of strings from variable given in $1
80# Strings removed are matched as globs, so for example 85# Strings removed are matched as globs, so for example
81# '-O*' would remove -O1, -O2 etc. 86# '-O*' would remove -O1, -O2 etc.
82_filter-var() { 87_filter-var() {
83 local f x VAR VAL 88 local f x var=$1 new=()
84 declare -a new
85
86 VAR=$1
87 shift 89 shift
88 eval VAL=\${${VAR}} 90
89 for f in ${VAL}; do 91 for f in ${!var} ; do
90 for x in "$@"; do 92 for x in "$@" ; do
91 # Note this should work with globs like -O* 93 # Note this should work with globs like -O*
92 [[ ${f} == ${x} ]] && continue 2 94 [[ ${f} == ${x} ]] && continue 2
93 done 95 done
94 eval new\[\${\#new\[@]}]=\${f} 96 new+=( "${f}" )
95 done 97 done
96 eval export ${VAR}=\${new\[*]} 98 eval export ${var}=\""${new[*]}"\"
97} 99}
98 100
99# @FUNCTION: filter-flags 101# @FUNCTION: filter-flags
100# @USAGE: <flags> 102# @USAGE: <flags>
101# @DESCRIPTION: 103# @DESCRIPTION:
102# Remove particular <flags> from {C,CPP,CXX,F,FC,LD}FLAGS. Accepts shell globs. 104# Remove particular <flags> from {C,CPP,CXX,CCAS,F,FC,LD}FLAGS. Accepts shell globs.
103filter-flags() { 105filter-flags() {
104 _filter-hardened "$@" 106 _filter-hardened "$@"
105 local v 107 local v
106 for v in C CPP CXX F FC LD ; do 108 for v in $(all-flag-vars) ; do
107 _filter-var ${v}FLAGS "$@" 109 _filter-var ${v} "$@"
108 done 110 done
109 return 0 111 return 0
110} 112}
111 113
112# @FUNCTION: filter-lfs-flags 114# @FUNCTION: filter-lfs-flags
119 # _LARGEFILE64_SOURCE: enable support for 64bit variants (off64_t/fseeko64/etc...) 121 # _LARGEFILE64_SOURCE: enable support for 64bit variants (off64_t/fseeko64/etc...)
120 # _FILE_OFFSET_BITS: default to 64bit variants (off_t is defined as off64_t) 122 # _FILE_OFFSET_BITS: default to 64bit variants (off_t is defined as off64_t)
121 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 123 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
122} 124}
123 125
126# @FUNCTION: filter-ldflags
127# @USAGE: <flags>
128# @DESCRIPTION:
129# Remove particular <flags> from LDFLAGS. Accepts shell globs.
130filter-ldflags() {
131 _filter-var LDFLAGS "$@"
132 return 0
133}
134
124# @FUNCTION: append-cppflags 135# @FUNCTION: append-cppflags
125# @USAGE: <flags> 136# @USAGE: <flags>
126# @DESCRIPTION: 137# @DESCRIPTION:
127# Add extra <flags> to the current CPPFLAGS. 138# Add extra <flags> to the current CPPFLAGS.
128append-cppflags() { 139append-cppflags() {
169 [[ $# -ne 0 ]] && die "append-lfs-flags takes no arguments" 180 [[ $# -ne 0 ]] && die "append-lfs-flags takes no arguments"
170 # see comments in filter-lfs-flags func for meaning of these 181 # see comments in filter-lfs-flags func for meaning of these
171 append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 182 append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
172} 183}
173 184
185# @FUNCTION: append-ldflags
186# @USAGE: <flags>
187# @DESCRIPTION:
188# Add extra <flags> to the current LDFLAGS.
189append-ldflags() {
190 [[ $# -eq 0 ]] && return 0
191 local flag
192 for flag in "$@"; do
193 [[ ${flag} == -l* ]] && \
194 ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
195 done
196
197 export LDFLAGS="${LDFLAGS} $*"
198 return 0
199}
200
174# @FUNCTION: append-flags 201# @FUNCTION: append-flags
175# @USAGE: <flags> 202# @USAGE: <flags>
176# @DESCRIPTION: 203# @DESCRIPTION:
177# Add extra <flags> to your current {C,CXX,F,FC}FLAGS. 204# Add extra <flags> to your current {C,CXX,F,FC}FLAGS.
178append-flags() { 205append-flags() {
179 [[ $# -eq 0 ]] && return 0 206 [[ $# -eq 0 ]] && return 0
207 case " $* " in
208 *' '-[DIU]*) eqawarn 'please use append-cppflags for preprocessor flags' ;;
209 *' '-L*|\
210 *' '-Wl,*) eqawarn 'please use append-ldflags for linker flags' ;;
211 esac
180 append-cflags "$@" 212 append-cflags "$@"
181 append-cxxflags "$@" 213 append-cxxflags "$@"
182 append-fflags "$@" 214 append-fflags "$@"
183 return 0 215 return 0
184} 216}
186# @FUNCTION: replace-flags 218# @FUNCTION: replace-flags
187# @USAGE: <old> <new> 219# @USAGE: <old> <new>
188# @DESCRIPTION: 220# @DESCRIPTION:
189# Replace the <old> flag with <new>. Accepts shell globs for <old>. 221# Replace the <old> flag with <new>. Accepts shell globs for <old>.
190replace-flags() { 222replace-flags() {
191 [[ $# != 2 ]] \
192 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \ 223 [[ $# != 2 ]] && die "Usage: replace-flags <old flag> <new flag>"
193 && die "replace-flags takes 2 arguments, not $#"
194 224
195 local f fset 225 local f var new
196 declare -a new_CFLAGS new_CXXFLAGS new_FFLAGS new_FCFLAGS 226 for var in $(all-flag-vars) ; do
197
198 for fset in CFLAGS CXXFLAGS FFLAGS FCFLAGS; do
199 # Looping over the flags instead of using a global 227 # Looping over the flags instead of using a global
200 # substitution ensures that we're working with flag atoms. 228 # substitution ensures that we're working with flag atoms.
201 # Otherwise globs like -O* have the potential to wipe out the 229 # Otherwise globs like -O* have the potential to wipe out the
202 # list of flags. 230 # list of flags.
231 new=()
203 for f in ${!fset}; do 232 for f in ${!var} ; do
204 # Note this should work with globs like -O* 233 # Note this should work with globs like -O*
205 [[ ${f} == ${1} ]] && f=${2} 234 [[ ${f} == ${1} ]] && f=${2}
206 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f} 235 new+=( "${f}" )
207 done 236 done
208 eval export ${fset}=\${new_${fset}\[*]} 237 eval export ${var}=\""${new[*]}"\"
209 done 238 done
210 239
211 return 0 240 return 0
212} 241}
213 242
241# @USAGE: <flag> 270# @USAGE: <flag>
242# @DESCRIPTION: 271# @DESCRIPTION:
243# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs. 272# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs.
244is-flagq() { 273is-flagq() {
245 [[ -n $2 ]] && die "Usage: is-flag <flag>" 274 [[ -n $2 ]] && die "Usage: is-flag <flag>"
246 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1 || _is_flagq FFLAGS $1 || _is_flagq FCFLAGS $1 275
276 local var
277 for var in $(all-flag-vars) ; do
278 _is_flagq ${var} "$1" && return 0
279 done
280 return 1
247} 281}
248 282
249# @FUNCTION: is-flag 283# @FUNCTION: is-flag
250# @USAGE: <flag> 284# @USAGE: <flag>
251# @DESCRIPTION: 285# @DESCRIPTION:
307 341
308# @FUNCTION: strip-flags 342# @FUNCTION: strip-flags
309# @DESCRIPTION: 343# @DESCRIPTION:
310# Strip C[XX]FLAGS of everything except known good/safe flags. 344# Strip C[XX]FLAGS of everything except known good/safe flags.
311strip-flags() { 345strip-flags() {
312 local x y flag NEW_CFLAGS NEW_CXXFLAGS NEW_FFLAGS NEW_FCFLAGS 346 local x y var
313 347
314 setup-allowed-flags 348 setup-allowed-flags
315 349
316 local NEW_CFLAGS=""
317 local NEW_CXXFLAGS=""
318 local NEW_FFLAGS=""
319 local NEW_FCFLAGS=""
320
321 set -f # disable pathname expansion 350 set -f # disable pathname expansion
322 351
323 for x in ${CFLAGS}; do 352 for var in $(all-flag-vars) ; do
353 local new=()
354
355 for x in ${!var} ; do
356 local flag=${x%%=*}
324 for y in ${ALLOWED_FLAGS}; do 357 for y in ${ALLOWED_FLAGS} ; do
325 flag=${x%%=*}
326 if [ "${flag%%${y}}" = "" ] ; then 358 if [[ -z ${flag%%${y}} ]] ; then
327 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 359 new+=( "${x}" )
328 break 360 break
329 fi 361 fi
330 done 362 done
331 done 363 done
332 364
333 for x in ${CXXFLAGS}; do
334 for y in ${ALLOWED_FLAGS}; do
335 flag=${x%%=*}
336 if [ "${flag%%${y}}" = "" ] ; then
337 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
338 break
339 fi
340 done
341 done
342
343 for x in ${FFLAGS}; do
344 for y in ${ALLOWED_FLAGS}; do
345 flag=${x%%=*}
346 if [ "${flag%%${y}}" = "" ] ; then
347 NEW_FFLAGS="${NEW_FFLAGS} ${x}"
348 break
349 fi
350 done
351 done
352
353 for x in ${FCFLAGS}; do
354 for y in ${ALLOWED_FLAGS}; do
355 flag=${x%%=*}
356 if [ "${flag%%${y}}" = "" ] ; then
357 NEW_FCFLAGS="${NEW_FCFLAGS} ${x}"
358 break
359 fi
360 done
361 done
362
363 # In case we filtered out all optimization flags fallback to -O2 365 # In case we filtered out all optimization flags fallback to -O2
364 if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then 366 if _is_flagq ${var} "-O*" && ! _is_flagq new "-O*" ; then
365 NEW_CFLAGS="${NEW_CFLAGS} -O2" 367 new+=( -O2 )
366 fi 368 fi
367 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 369
368 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 370 eval export ${var}=\""${new[*]}"\"
369 fi 371 done
370 if [ "${FFLAGS/-O}" != "${FFLAGS}" -a "${NEW_FFLAGS/-O}" = "${NEW_FFLAGS}" ]; then
371 NEW_FFLAGS="${NEW_FFLAGS} -O2"
372 fi
373 if [ "${FCFLAGS/-O}" != "${FCFLAGS}" -a "${NEW_FCFLAGS/-O}" = "${NEW_FCFLAGS}" ]; then
374 NEW_FCFLAGS="${NEW_FCFLAGS} -O2"
375 fi
376 372
377 set +f # re-enable pathname expansion 373 set +f # re-enable pathname expansion
378 374
379 export CFLAGS="${NEW_CFLAGS}"
380 export CXXFLAGS="${NEW_CXXFLAGS}"
381 export FFLAGS="${NEW_FFLAGS}"
382 export FCFLAGS="${NEW_FCFLAGS}"
383 return 0 375 return 0
384} 376}
385 377
386test-flag-PROG() { 378test-flag-PROG() {
387 local comp=$1 379 local comp=$1
388 local flags="$2" 380 local flag=$2
389 381
390 [[ -z ${comp} || -z ${flags} ]] && return 1 382 [[ -z ${comp} || -z ${flag} ]] && return 1
391 383
392 # use -c so we can test the assembler as well 384 # use -c so we can test the assembler as well
393 local PROG=$(tc-get${comp}) 385 local PROG=$(tc-get${comp})
394 ${PROG} ${flags} -c -o /dev/null -xc /dev/null \ 386 ${PROG} "${flag}" -c -o /dev/null -xc /dev/null \
395 > /dev/null 2>&1 387 > /dev/null 2>&1
396} 388}
397 389
398# @FUNCTION: test-flag-CC 390# @FUNCTION: test-flag-CC
399# @USAGE: <flag> 391# @USAGE: <flag>
495# @FUNCTION: get-flag 487# @FUNCTION: get-flag
496# @USAGE: <flag> 488# @USAGE: <flag>
497# @DESCRIPTION: 489# @DESCRIPTION:
498# Find and echo the value for a particular flag. Accepts shell globs. 490# Find and echo the value for a particular flag. Accepts shell globs.
499get-flag() { 491get-flag() {
500 local f findflag="$1" 492 local f var findflag="$1"
501 493
502 # this code looks a little flaky but seems to work for 494 # this code looks a little flaky but seems to work for
503 # everything we want ... 495 # everything we want ...
504 # for example, if CFLAGS="-march=i686": 496 # for example, if CFLAGS="-march=i686":
505 # `get-flag -march` == "-march=i686" 497 # `get-flag -march` == "-march=i686"
506 # `get-flag march` == "i686" 498 # `get-flag march` == "i686"
507 for f in ${CFLAGS} ${CXXFLAGS} ${FFLAGS} ${FCFLAGS} ; do 499 for var in $(all-flag-vars) ; do
500 for f in ${!var} ; do
508 if [ "${f/${findflag}}" != "${f}" ] ; then 501 if [ "${f/${findflag}}" != "${f}" ] ; then
509 printf "%s\n" "${f/-${findflag}=}" 502 printf "%s\n" "${f/-${findflag}=}"
510 return 0 503 return 0
511 fi 504 fi
505 done
512 done 506 done
513 return 1 507 return 1
514} 508}
515 509
516# @FUNCTION: has_m64 510# @FUNCTION: has_m64
517# @DESCRIPTION: 511# @DESCRIPTION:
518# This doesn't test if the flag is accepted, it tests if the flag actually 512# This doesn't test if the flag is accepted, it tests if the flag actually
519# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works 513# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works
520# return code is 0, else the return code is 1. 514# return code is 0, else the return code is 1.
521has_m64() { 515has_m64() {
516 eqawarn "${FUNCNAME}: don't use this anymore"
517
522 # this doesnt test if the flag is accepted, it tests if the flag 518 # this doesnt test if the flag is accepted, it tests if the flag
523 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 519 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
524 # please dont replace this function with test_flag in some future 520 # please dont replace this function with test_flag in some future
525 # clean-up! 521 # clean-up!
526 522
532 rm -f "${temp}".c 528 rm -f "${temp}".c
533 [[ ${ret} != 1 ]] && return 0 529 [[ ${ret} != 1 ]] && return 0
534 return 1 530 return 1
535} 531}
536 532
537# @FUNCTION: has_m32
538# @DESCRIPTION:
539# This doesn't test if the flag is accepted, it tests if the flag actually
540# WORKS. Non-mulilib gcc will take both -m32 and -64. If the flag works return
541# code is 0, else return code is 1.
542has_m32() { 533has_m32() {
543 # this doesnt test if the flag is accepted, it tests if the flag 534 die "${FUNCNAME}: don't use this anymore"
544 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
545 # please dont replace this function with test_flag in some future
546 # clean-up!
547
548 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
549
550 local temp=$(emktemp)
551 echo "int main() { return(0); }" > "${temp}".c
552 MY_CC=$(tc-getCC)
553 ${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
554 local ret=$?
555 rm -f "${temp}".c
556 [[ ${ret} != 1 ]] && return 0
557 return 1
558} 535}
559 536
560# @FUNCTION: replace-sparc64-flags 537# @FUNCTION: replace-sparc64-flags
561# @DESCRIPTION: 538# @DESCRIPTION:
562# Sets mcpu to v8 and uses the original value as mtune if none specified. 539# Sets mcpu to v8 and uses the original value as mtune if none specified.
596 for flag in "$@"; do 573 for flag in "$@"; do
597 [[ ${flag} == -l* ]] && flag=${flag#-l} 574 [[ ${flag} == -l* ]] && flag=${flag#-l}
598 export LIBS="${LIBS} -l${flag}" 575 export LIBS="${LIBS} -l${flag}"
599 done 576 done
600 577
601 return 0
602}
603
604# @FUNCTION: append-ldflags
605# @USAGE: <flags>
606# @DESCRIPTION:
607# Add extra <flags> to the current LDFLAGS.
608append-ldflags() {
609 [[ $# -eq 0 ]] && return 0
610 local flag
611 for flag in "$@"; do
612 [[ ${flag} == -l* ]] && \
613 ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
614 done
615
616 export LDFLAGS="${LDFLAGS} $*"
617 return 0
618}
619
620# @FUNCTION: filter-ldflags
621# @USAGE: <flags>
622# @DESCRIPTION:
623# Remove particular <flags> from LDFLAGS. Accepts shell globs.
624filter-ldflags() {
625 _filter-var LDFLAGS "$@"
626 return 0 578 return 0
627} 579}
628 580
629# @FUNCTION: raw-ldflags 581# @FUNCTION: raw-ldflags
630# @USAGE: [flags] 582# @USAGE: [flags]

Legend:
Removed from v.1.165  
changed lines
  Added in v.1.173

  ViewVC Help
Powered by ViewVC 1.1.20