/[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.163 Revision 1.168
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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.163 2011/12/28 06:28:55 dirtyepic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.168 2012/01/16 20:03:32 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
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 17
18################ DEPRECATED functions ################ 18# Return all the flag variables that our high level funcs operate on.
19# The following are still present to avoid breaking existing 19all-flag-vars() {
20# code more than necessary; however they are deprecated. Please 20 echo {C,CPP,CXX,F,FC,LD}FLAGS
21# use gcc-specs-* from toolchain-funcs.eclass instead, if you 21}
22# need to know which hardened techs are active in the compiler.
23# See bug #100974
24#
25# has_hardened
26# has_pie
27# has_pic
28# has_ssp_all
29# has_ssp
30
31 22
32# {C,CXX,F,FC}FLAGS that we allow in strip-flags 23# {C,CXX,F,FC}FLAGS that we allow in strip-flags
33# Note: shell globs and character lists are allowed 24# Note: shell globs and character lists are allowed
34setup-allowed-flags() { 25setup-allowed-flags() {
35 ALLOWED_FLAGS="-pipe" 26 ALLOWED_FLAGS="-pipe"
92 83
93# Remove occurrences of strings from variable given in $1 84# Remove occurrences of strings from variable given in $1
94# Strings removed are matched as globs, so for example 85# Strings removed are matched as globs, so for example
95# '-O*' would remove -O1, -O2 etc. 86# '-O*' would remove -O1, -O2 etc.
96_filter-var() { 87_filter-var() {
97 local f x VAR VAL 88 local f x var=$1 new=()
98 declare -a new
99
100 VAR=$1
101 shift 89 shift
102 eval VAL=\${${VAR}} 90
103 for f in ${VAL}; do 91 for f in ${!var} ; do
104 for x in "$@"; do 92 for x in "$@" ; do
105 # Note this should work with globs like -O* 93 # Note this should work with globs like -O*
106 [[ ${f} == ${x} ]] && continue 2 94 [[ ${f} == ${x} ]] && continue 2
107 done 95 done
108 eval new\[\${\#new\[@]}]=\${f} 96 new+=( "${f}" )
109 done 97 done
110 eval export ${VAR}=\${new\[*]} 98 eval export ${var}=\""${new[*]}"\"
111} 99}
112 100
113# @FUNCTION: filter-flags 101# @FUNCTION: filter-flags
114# @USAGE: <flags> 102# @USAGE: <flags>
115# @DESCRIPTION: 103# @DESCRIPTION:
116# Remove particular <flags> from {C,CPP,CXX,F,FC}FLAGS. Accepts shell globs. 104# Remove particular <flags> from {C,CPP,CXX,F,FC,LD}FLAGS. Accepts shell globs.
117filter-flags() { 105filter-flags() {
118 _filter-hardened "$@" 106 _filter-hardened "$@"
107 local v
108 for v in $(all-flag-vars) ; do
119 _filter-var CFLAGS "$@" 109 _filter-var ${v} "$@"
120 _filter-var CPPFLAGS "$@" 110 done
121 _filter-var CXXFLAGS "$@"
122 _filter-var FFLAGS "$@"
123 _filter-var FCFLAGS "$@"
124 return 0 111 return 0
125} 112}
126 113
127# @FUNCTION: filter-lfs-flags 114# @FUNCTION: filter-lfs-flags
128# @DESCRIPTION: 115# @DESCRIPTION:
201# @FUNCTION: replace-flags 188# @FUNCTION: replace-flags
202# @USAGE: <old> <new> 189# @USAGE: <old> <new>
203# @DESCRIPTION: 190# @DESCRIPTION:
204# Replace the <old> flag with <new>. Accepts shell globs for <old>. 191# Replace the <old> flag with <new>. Accepts shell globs for <old>.
205replace-flags() { 192replace-flags() {
206 [[ $# != 2 ]] \
207 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \ 193 [[ $# != 2 ]] && die "Usage: replace-flags <old flag> <new flag>"
208 && die "replace-flags takes 2 arguments, not $#"
209 194
210 local f fset 195 local f var new
211 declare -a new_CFLAGS new_CXXFLAGS new_FFLAGS new_FCFLAGS 196 for var in $(all-flag-vars) ; do
212
213 for fset in CFLAGS CXXFLAGS FFLAGS FCFLAGS; do
214 # Looping over the flags instead of using a global 197 # Looping over the flags instead of using a global
215 # substitution ensures that we're working with flag atoms. 198 # substitution ensures that we're working with flag atoms.
216 # Otherwise globs like -O* have the potential to wipe out the 199 # Otherwise globs like -O* have the potential to wipe out the
217 # list of flags. 200 # list of flags.
201 new=()
218 for f in ${!fset}; do 202 for f in ${!var} ; do
219 # Note this should work with globs like -O* 203 # Note this should work with globs like -O*
220 [[ ${f} == ${1} ]] && f=${2} 204 [[ ${f} == ${1} ]] && f=${2}
221 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f} 205 new+=( "${f}" )
222 done 206 done
223 eval export ${fset}=\${new_${fset}\[*]} 207 eval export ${var}=\""${new[*]}"\"
224 done 208 done
225 209
226 return 0 210 return 0
227} 211}
228 212
256# @USAGE: <flag> 240# @USAGE: <flag>
257# @DESCRIPTION: 241# @DESCRIPTION:
258# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs. 242# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs.
259is-flagq() { 243is-flagq() {
260 [[ -n $2 ]] && die "Usage: is-flag <flag>" 244 [[ -n $2 ]] && die "Usage: is-flag <flag>"
261 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1 || _is_flagq FFLAGS $1 || _is_flagq FCFLAGS $1 245
246 local var
247 for var in $(all-flag-vars) ; do
248 _is_flagq ${var} "$1" && return 0
249 done
250 return 1
262} 251}
263 252
264# @FUNCTION: is-flag 253# @FUNCTION: is-flag
265# @USAGE: <flag> 254# @USAGE: <flag>
266# @DESCRIPTION: 255# @DESCRIPTION:
322 311
323# @FUNCTION: strip-flags 312# @FUNCTION: strip-flags
324# @DESCRIPTION: 313# @DESCRIPTION:
325# Strip C[XX]FLAGS of everything except known good/safe flags. 314# Strip C[XX]FLAGS of everything except known good/safe flags.
326strip-flags() { 315strip-flags() {
327 local x y flag NEW_CFLAGS NEW_CXXFLAGS NEW_FFLAGS NEW_FCFLAGS 316 local x y var
328 317
329 setup-allowed-flags 318 setup-allowed-flags
330 319
331 local NEW_CFLAGS=""
332 local NEW_CXXFLAGS=""
333 local NEW_FFLAGS=""
334 local NEW_FCFLAGS=""
335
336 set -f # disable pathname expansion 320 set -f # disable pathname expansion
337 321
338 for x in ${CFLAGS}; do 322 for var in $(all-flag-vars) ; do
323 local new=()
324
325 for x in ${!var} ; do
326 local flag=${x%%=*}
339 for y in ${ALLOWED_FLAGS}; do 327 for y in ${ALLOWED_FLAGS} ; do
340 flag=${x%%=*}
341 if [ "${flag%%${y}}" = "" ] ; then 328 if [[ -z ${flag%%${y}} ]] ; then
342 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 329 new+=( "${x}" )
343 break 330 break
344 fi 331 fi
345 done 332 done
346 done 333 done
347 334
348 for x in ${CXXFLAGS}; do
349 for y in ${ALLOWED_FLAGS}; do
350 flag=${x%%=*}
351 if [ "${flag%%${y}}" = "" ] ; then
352 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
353 break
354 fi
355 done
356 done
357
358 for x in ${FFLAGS}; do
359 for y in ${ALLOWED_FLAGS}; do
360 flag=${x%%=*}
361 if [ "${flag%%${y}}" = "" ] ; then
362 NEW_FFLAGS="${NEW_FFLAGS} ${x}"
363 break
364 fi
365 done
366 done
367
368 for x in ${FCFLAGS}; do
369 for y in ${ALLOWED_FLAGS}; do
370 flag=${x%%=*}
371 if [ "${flag%%${y}}" = "" ] ; then
372 NEW_FCFLAGS="${NEW_FCFLAGS} ${x}"
373 break
374 fi
375 done
376 done
377
378 # In case we filtered out all optimization flags fallback to -O2 335 # In case we filtered out all optimization flags fallback to -O2
379 if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then 336 if _is_flagq ${var} "-O*" && ! _is_flagq new "-O*" ; then
380 NEW_CFLAGS="${NEW_CFLAGS} -O2" 337 new+=( -O2 )
381 fi 338 fi
382 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 339
383 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 340 eval export ${var}=\""${new[*]}"\"
384 fi 341 done
385 if [ "${FFLAGS/-O}" != "${FFLAGS}" -a "${NEW_FFLAGS/-O}" = "${NEW_FFLAGS}" ]; then
386 NEW_FFLAGS="${NEW_FFLAGS} -O2"
387 fi
388 if [ "${FCFLAGS/-O}" != "${FCFLAGS}" -a "${NEW_FCFLAGS/-O}" = "${NEW_FCFLAGS}" ]; then
389 NEW_FCFLAGS="${NEW_FCFLAGS} -O2"
390 fi
391 342
392 set +f # re-enable pathname expansion 343 set +f # re-enable pathname expansion
393 344
394 export CFLAGS="${NEW_CFLAGS}"
395 export CXXFLAGS="${NEW_CXXFLAGS}"
396 export FFLAGS="${NEW_FFLAGS}"
397 export FCFLAGS="${NEW_FCFLAGS}"
398 return 0 345 return 0
399} 346}
400 347
401test-flag-PROG() { 348test-flag-PROG() {
402 local comp=$1 349 local comp=$1
403 local flags="$2" 350 local flag=$2
404 351
405 [[ -z ${comp} || -z ${flags} ]] && return 1 352 [[ -z ${comp} || -z ${flag} ]] && return 1
406 353
407 # use -c so we can test the assembler as well 354 # use -c so we can test the assembler as well
408 local PROG=$(tc-get${comp}) 355 local PROG=$(tc-get${comp})
409 ${PROG} ${flags} -c -o /dev/null -xc /dev/null \ 356 ${PROG} "${flag}" -c -o /dev/null -xc /dev/null \
410 > /dev/null 2>&1 357 > /dev/null 2>&1
411} 358}
412 359
413# @FUNCTION: test-flag-CC 360# @FUNCTION: test-flag-CC
414# @USAGE: <flag> 361# @USAGE: <flag>
510# @FUNCTION: get-flag 457# @FUNCTION: get-flag
511# @USAGE: <flag> 458# @USAGE: <flag>
512# @DESCRIPTION: 459# @DESCRIPTION:
513# Find and echo the value for a particular flag. Accepts shell globs. 460# Find and echo the value for a particular flag. Accepts shell globs.
514get-flag() { 461get-flag() {
515 local f findflag="$1" 462 local f var findflag="$1"
516 463
517 # this code looks a little flaky but seems to work for 464 # this code looks a little flaky but seems to work for
518 # everything we want ... 465 # everything we want ...
519 # for example, if CFLAGS="-march=i686": 466 # for example, if CFLAGS="-march=i686":
520 # `get-flag -march` == "-march=i686" 467 # `get-flag -march` == "-march=i686"
521 # `get-flag march` == "i686" 468 # `get-flag march` == "i686"
522 for f in ${CFLAGS} ${CXXFLAGS} ${FFLAGS} ${FCFLAGS} ; do 469 for var in $(all-flag-vars) ; do
470 for f in ${!var} ; do
523 if [ "${f/${findflag}}" != "${f}" ] ; then 471 if [ "${f/${findflag}}" != "${f}" ] ; then
524 printf "%s\n" "${f/-${findflag}=}" 472 printf "%s\n" "${f/-${findflag}=}"
525 return 0 473 return 0
526 fi 474 fi
475 done
527 done 476 done
528 return 1 477 return 1
529} 478}
530
531# DEAD FUNCS. Remove by Dec 2011.
532test_flag() { die "$0: deprecated, please use test-flags()!" ; }
533has_hardened() { die "$0: deprecated, please use gcc-specs-{relro,now}()!" ; }
534has_pic() { die "$0: deprecated, please use gcc-specs-pie()!" ; }
535has_pie() { die "$0: deprecated, please use gcc-specs-pie()!" ; }
536has_ssp_all() { die "$0: deprecated, please use gcc-specs-ssp()!" ; }
537has_ssp() { die "$0: deprecated, please use gcc-specs-ssp()!" ; }
538 479
539# @FUNCTION: has_m64 480# @FUNCTION: has_m64
540# @DESCRIPTION: 481# @DESCRIPTION:
541# This doesn't test if the flag is accepted, it tests if the flag actually 482# This doesn't test if the flag is accepted, it tests if the flag actually
542# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works 483# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works
543# return code is 0, else the return code is 1. 484# return code is 0, else the return code is 1.
544has_m64() { 485has_m64() {
486 eqawarn "${FUNCNAME}: don't use this anymore"
487
545 # this doesnt test if the flag is accepted, it tests if the flag 488 # this doesnt test if the flag is accepted, it tests if the flag
546 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 489 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
547 # please dont replace this function with test_flag in some future 490 # please dont replace this function with test_flag in some future
548 # clean-up! 491 # clean-up!
549 492
555 rm -f "${temp}".c 498 rm -f "${temp}".c
556 [[ ${ret} != 1 ]] && return 0 499 [[ ${ret} != 1 ]] && return 0
557 return 1 500 return 1
558} 501}
559 502
560# @FUNCTION: has_m32
561# @DESCRIPTION:
562# This doesn't test if the flag is accepted, it tests if the flag actually
563# WORKS. Non-mulilib gcc will take both -m32 and -64. If the flag works return
564# code is 0, else return code is 1.
565has_m32() { 503has_m32() {
566 # this doesnt test if the flag is accepted, it tests if the flag 504 die "${FUNCNAME}: don't use this anymore"
567 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
568 # please dont replace this function with test_flag in some future
569 # clean-up!
570
571 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
572
573 local temp=$(emktemp)
574 echo "int main() { return(0); }" > "${temp}".c
575 MY_CC=$(tc-getCC)
576 ${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
577 local ret=$?
578 rm -f "${temp}".c
579 [[ ${ret} != 1 ]] && return 0
580 return 1
581} 505}
582 506
583# @FUNCTION: replace-sparc64-flags 507# @FUNCTION: replace-sparc64-flags
584# @DESCRIPTION: 508# @DESCRIPTION:
585# Sets mcpu to v8 and uses the original value as mtune if none specified. 509# Sets mcpu to v8 and uses the original value as mtune if none specified.

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.168

  ViewVC Help
Powered by ViewVC 1.1.20