/[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.96 Revision 1.115
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.96 2005/12/08 12:16:12 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.115 2006/12/29 21:30:38 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 \
108 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \ 109 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
109 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \ 110 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
110 -mieee -mieee-with-inexact \ 111 -mieee -mieee-with-inexact -mschedule \
111 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \ 112 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \
112 -mflat -mno-flat -mno-faster-structs -mfaster-structs \ 113 -mflat -mno-flat -mno-faster-structs -mfaster-structs \
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 \
116 -msecure-plt -D*"
115 117
116 # C[XX]FLAGS that we are think is ok, but needs testing 118 # C[XX]FLAGS that we are think is ok, but needs testing
117 # NOTE: currently -Os have issues with gcc3 and K6* arch's 119 # NOTE: currently -Os have issues with gcc3 and K6* arch's
118 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 120 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
119 return 0 121 return 0
122}
123
124# inverted filters for hardened compiler. This is trying to unpick
125# the hardened compiler defaults.
126_filter-hardened() {
127 local f
128 for f in "$@" ; do
129 case "${f}" in
130 # Ideally we should only concern ourselves with PIE flags,
131 # not -fPIC or -fpic, but too many places filter -fPIC without
132 # thinking about -fPIE.
133 -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie)
134 gcc-specs-pie || continue
135 is-flagq -nopie || append-flags -nopie;;
136 -fstack-protector)
137 gcc-specs-ssp || continue
138 is-flagq -fno-stack-protector || append-flags -fno-stack-protector;;
139 -fstack-protector-all)
140 gcc-specs-ssp-to-all || continue
141 is-flagq -fno-stack-protector-all || append-flags -fno-stack-protector-all;;
142 esac
143 done
144}
145
146# Remove occurrences of strings from variable given in $1
147# Strings removed are matched as globs, so for example
148# '-O*' would remove -O1, -O2 etc.
149_filter-var() {
150 local f x VAR VAL
151 declare -a new
152
153 VAR=$1
154 shift
155 eval VAL=\${${VAR}}
156 for f in ${VAL}; do
157 for x in "$@"; do
158 # Note this should work with globs like -O*
159 [[ ${f} == ${x} ]] && continue 2
160 done
161 eval new\[\${\#new\[@]}]=\${f}
162 done
163 eval export ${VAR}=\${new\[*]}
120} 164}
121 165
122filter-flags() { 166filter-flags() {
123 local x f fset 167 _filter-hardened "$@"
124 declare -a new_CFLAGS new_CXXFLAGS 168 _filter-var CFLAGS "$@"
125 169 _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 170 return 0
151} 171}
152 172
153filter-lfs-flags() { 173filter-lfs-flags() {
154 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments" 174 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
162 182
163append-flags() { 183append-flags() {
164 [[ -z $* ]] && return 0 184 [[ -z $* ]] && return 0
165 export CFLAGS="${CFLAGS} $*" 185 export CFLAGS="${CFLAGS} $*"
166 export CXXFLAGS="${CXXFLAGS} $*" 186 export CXXFLAGS="${CXXFLAGS} $*"
167 [ -n "`is-flag -fno-stack-protector`" -o \
168 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
169 return 0 187 return 0
170} 188}
171 189
172replace-flags() { 190replace-flags() {
173 [[ $# != 2 ]] \ 191 [[ $# != 2 ]] \
195 213
196replace-cpu-flags() { 214replace-cpu-flags() {
197 local newcpu="$#" ; newcpu="${!newcpu}" 215 local newcpu="$#" ; newcpu="${!newcpu}"
198 while [ $# -gt 1 ] ; do 216 while [ $# -gt 1 ] ; do
199 # quote to make sure that no globbing is done (particularly on 217 # quote to make sure that no globbing is done (particularly on
200 # ${oldcpu} prior to calling replace-flags 218 # ${oldcpu}) prior to calling replace-flags
201 replace-flags "-march=${1}" "-march=${newcpu}" 219 replace-flags "-march=${1}" "-march=${newcpu}"
202 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}" 220 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
203 replace-flags "-mtune=${1}" "-mtune=${newcpu}" 221 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
204 shift 222 shift
205 done 223 done
206 return 0 224 return 0
207} 225}
208 226
227_is_flagq() {
228 local x
229 for x in ${!1} ; do
230 [[ ${x} == $2 ]] && return 0
231 done
232 return 1
233}
234
235is-flagq() {
236 [[ -n $2 ]] && die "Usage: is-flag <flag>"
237 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1
238}
239
209is-flag() { 240is-flag() {
210 local x 241 is-flagq "$@" && echo true
242}
211 243
212 for x in ${CFLAGS} ${CXXFLAGS} ; do 244is-ldflagq() {
213 # Note this should work with globs like -mcpu=ultrasparc* 245 [[ -n $2 ]] && die "Usage: is-ldflag <flag>"
214 if [[ ${x} == ${1} ]]; then 246 _is_flagq LDFLAGS $1
215 echo true 247}
216 return 0 248
217 fi 249is-ldflag() {
218 done 250 is-ldflagq "$@" && echo true
219 return 1
220} 251}
221 252
222filter-mfpmath() { 253filter-mfpmath() {
223 local orig_mfpmath new_math prune_math 254 local orig_mfpmath new_math prune_math
224 255
225 # save the original -mfpmath flag 256 # save the original -mfpmath flag
226 orig_mfpmath="`get-flag -mfpmath`" 257 orig_mfpmath=$(get-flag -mfpmath)
227 # get the value of the current -mfpmath flag 258 # get the value of the current -mfpmath flag
228 new_math=" `get-flag mfpmath | tr , ' '` " 259 new_math=$(get-flag mfpmath)
260 new_math=" ${new_math//,/ } "
229 # figure out which math values are to be removed 261 # figure out which math values are to be removed
230 prune_math="" 262 prune_math=""
231 for prune_math in "$@" ; do 263 for prune_math in "$@" ; do
232 new_math="${new_math/ ${prune_math} / }" 264 new_math=${new_math/ ${prune_math} / }
233 done 265 done
234 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 266 new_math=$(echo ${new_math})
267 new_math=${new_math// /,}
235 268
236 if [ -z "${new_math}" ] ; then 269 if [[ -z ${new_math} ]] ; then
237 # if we're removing all user specified math values are 270 # if we're removing all user specified math values are
238 # slated for removal, then we just filter the flag 271 # slated for removal, then we just filter the flag
239 filter-flags ${orig_mfpmath} 272 filter-flags ${orig_mfpmath}
240 else 273 else
241 # if we only want to filter some of the user specified 274 # if we only want to filter some of the user specified
311test-flag-CC() { test-flag-PROG "CC" "$1"; } 344test-flag-CC() { test-flag-PROG "CC" "$1"; }
312 345
313# Returns true if C++ compiler support given flag 346# Returns true if C++ compiler support given flag
314test-flag-CXX() { test-flag-PROG "CXX" "$1"; } 347test-flag-CXX() { test-flag-PROG "CXX" "$1"; }
315 348
316test-flags() { 349test-flags-PROG() {
350 local comp=$1
351 local flags
317 local x 352 local x
318 353
354 shift
355
356 [[ -z ${comp} ]] && return 1
357
358 x=""
319 for x in "$@" ; do 359 for x in "$@" ; do
320 test-flag-CC "${x}" || return 1 360 test-flag-${comp} "${x}" && flags="${flags}${flags:+ }${x}"
321 done 361 done
322 362
323 echo "$@" 363 echo "${flags}"
324 364
325 return 0 365 # Just bail if we dont have any flags
366 [[ -n ${flags} ]]
326} 367}
368
369# Returns (echo's) the given flags supported by the C compiler
370test-flags-CC() { test-flags-PROG "CC" "$@"; }
371
372# Returns (echo's) the given flags supported by the C++ compiler
373test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
374
375# Short-hand that should hopefully work for both C and C++ compiler, but
376# its really only present due to the append-flags() abomination.
377test-flags() { test-flags-CC "$@"; }
327 378
328# Depriciated, use test-flags() 379# Depriciated, use test-flags()
329test_flag() { 380test_flag() {
330 ewarn "test_flag: deprecated, please use test-flags()!" >/dev/stderr 381 ewarn "test_flag: deprecated, please use test-flags()!" >&2
331 382
332 test-flags "$@" 383 test-flags-CC "$@"
333} 384}
334 385
335test_version_info() { 386test_version_info() {
336 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then 387 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
337 return 0 388 return 0
339 return 1 390 return 1
340 fi 391 fi
341} 392}
342 393
343strip-unsupported-flags() { 394strip-unsupported-flags() {
344 local x NEW_CFLAGS NEW_CXXFLAGS 395 export CFLAGS=$(test-flags-CC ${CFLAGS})
345 396 export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS})
346 for x in ${CFLAGS} ; do
347 NEW_CFLAGS="${NEW_CFLAGS} $(test-flags ${x})"
348 done
349 for x in ${CXXFLAGS} ; do
350 NEW_CXXFLAGS="${NEW_CXXFLAGS} $(test-flags ${x})"
351 done
352
353 export CFLAGS=${NEW_CFLAGS}
354 export CXXFLAGS=${NEW_CXXFLAGS}
355} 397}
356 398
357get-flag() { 399get-flag() {
358 local f findflag="$1" 400 local f findflag="$1"
359 401
371 return 1 413 return 1
372} 414}
373 415
374# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs 416# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
375has_hardened() { 417has_hardened() {
376 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" \ 418 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
377 >/dev/stderr 419
378
379 test_version_info Hardened && return 0 420 test_version_info Hardened && return 0
380 # The specs file wont exist unless gcc has GCC_SPECS support 421 # The specs file wont exist unless gcc has GCC_SPECS support
381 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]] 422 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
382} 423}
383 424
384# DEPRECATED - use gcc-specs-pie from toolchain-funcs 425# DEPRECATED - use gcc-specs-pie from toolchain-funcs
385# indicate whether PIC is set 426# indicate whether PIC is set
386has_pic() { 427has_pic() {
387 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >/dev/stderr 428 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
388 429
389 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \ 430 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
390 ${CFLAGS/-fpic} != ${CFLAGS} || \ 431 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
391 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__) ]] 432 gcc-specs-pie
392} 433}
393 434
394# DEPRECATED - use gcc-specs-pie from toolchain-funcs 435# DEPRECATED - use gcc-specs-pie from toolchain-funcs
395# indicate whether PIE is set 436# indicate whether PIE is set
396has_pie() { 437has_pie() {
397 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >/dev/stderr 438 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
398 439
399 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \ 440 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \
400 ${CFLAGS/-fpie} != ${CFLAGS} || \ 441 ${CFLAGS/-fpie} != ${CFLAGS} ]] || \
401 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__) || \ 442 gcc-specs-pie
402 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__) ]]
403 # test PIC while waiting for specs to be updated to generate __PIE__
404} 443}
405 444
406# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 445# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
407# indicate whether code for SSP is being generated for all functions 446# indicate whether code for SSP is being generated for all functions
408has_ssp_all() { 447has_ssp_all() {
409 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >/dev/stderr 448 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2
410 449
411 # note; this matches only -fstack-protector-all 450 # note; this matches only -fstack-protector-all
412 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \ 451 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \
413 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \ 452 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
414 gcc-specs-ssp 453 gcc-specs-ssp-all
415} 454}
416 455
417# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 456# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
418# indicate whether code for SSP is being generated 457# indicate whether code for SSP is being generated
419has_ssp() { 458has_ssp() {
420 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >/dev/stderr 459 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
421 460
422 # note; this matches both -fstack-protector and -fstack-protector-all 461 # note; this matches both -fstack-protector and -fstack-protector-all
423 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \ 462 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
424 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \ 463 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
425 gcc-specs-ssp 464 gcc-specs-ssp
426} 465}
428has_m64() { 467has_m64() {
429 # this doesnt test if the flag is accepted, it tests if the flag 468 # this doesnt test if the flag is accepted, it tests if the flag
430 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 469 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
431 # please dont replace this function with test_flag in some future 470 # please dont replace this function with test_flag in some future
432 # clean-up! 471 # clean-up!
433 472
434 local temp="$(emktemp)" 473 local temp="$(emktemp)"
435 echo "int main() { return(0); }" > "${temp}".c 474 echo "int main() { return(0); }" > "${temp}".c
436 MY_CC=$(tc-getCC) 475 MY_CC=$(tc-getCC)
437 ${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1 476 ${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
438 local ret=$? 477 local ret=$?
458 [[ ${ret} != 1 ]] && return 0 497 [[ ${ret} != 1 ]] && return 0
459 return 1 498 return 1
460} 499}
461 500
462replace-sparc64-flags() { 501replace-sparc64-flags() {
463 local SPARC64_CPUS="ultrasparc v9" 502 local SPARC64_CPUS="ultrasparc3 ultrasparc v9"
464 503
465 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 504 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
466 for x in ${SPARC64_CPUS}; do 505 for x in ${SPARC64_CPUS}; do
467 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 506 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
468 done 507 done
469 else 508 else
470 for x in ${SPARC64_CPUS}; do 509 for x in ${SPARC64_CPUS}; do
471 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 510 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
472 done 511 done
473 fi 512 fi
474 513
475 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then 514 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
476 for x in ${SPARC64_CPUS}; do 515 for x in ${SPARC64_CPUS}; do
477 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 516 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
478 done 517 done
479 else 518 else
480 for x in ${SPARC64_CPUS}; do 519 for x in ${SPARC64_CPUS}; do
481 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 520 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
482 done 521 done
483 fi 522 fi
484 523
485 export CFLAGS CXXFLAGS 524 export CFLAGS CXXFLAGS
486} 525}
487 526
488append-ldflags() { 527append-ldflags() {
528 [[ -z $* ]] && return 0
489 export LDFLAGS="${LDFLAGS} $*" 529 export LDFLAGS="${LDFLAGS} $*"
490 return 0 530 return 0
491} 531}
492 532
533# Remove flags from LDFLAGS - it's up to the ebuild to filter
534# CFLAGS and CXXFLAGS via filter-flags if they need to.
493filter-ldflags() { 535filter-ldflags() {
494 local x 536 _filter-var LDFLAGS "$@"
537 return 0
538}
495 539
496 # we do this fancy spacing stuff so as to not filter 540# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
497 # out part of a flag ... we want flag atoms ! :D 541# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
498 LDFLAGS=" ${LDFLAGS} " 542# to gcc where it needs the '-Wl,'.
543raw-ldflags() {
544 local x input="$@"
545 [[ -z ${input} ]] && input=${LDFLAGS}
546 set --
499 for x in "$@" ; do 547 for x in ${input} ; do
500 LDFLAGS=${LDFLAGS// ${x} / } 548 x=${x#-Wl,}
549 set -- "$@" ${x//,/ }
501 done 550 done
502 [[ -z ${LDFLAGS// } ]] \ 551 echo "$@"
503 && LDFLAGS="" \
504 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
505 export LDFLAGS
506 return 0
507}
508
509fstack-flags() {
510 if gcc-specs-ssp; then
511 [ -z "`is-flag -fno-stack-protector`" ] &&
512 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
513 fi
514 return 0
515}
516
517# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
518# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
519# fixes.
520#
521# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
522gcc2-flags() {
523 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
524 CFLAGS=${CFLAGS//-mtune=/-mcpu=}
525 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
526 fi
527
528 replace-cpu-flags k6-{2,3} k6
529 replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
530
531 replace-cpu-flags pentium-mmx i586
532 replace-cpu-flags pentium{2,3,4} i686
533
534 replace-cpu-flags ev6{7,8} ev6
535
536 export CFLAGS CXXFLAGS
537} 552}
538 553
539# Gets the flags needed for "NOW" binding 554# Gets the flags needed for "NOW" binding
540bindnow-flags() { 555bindnow-flags() {
541 case $($(tc-getLD) -v 2>&1 </dev/null) in 556 case $($(tc-getLD) -v 2>&1 </dev/null) in
550 echo "-Wl,-z,now" ;; 565 echo "-Wl,-z,now" ;;
551 esac 566 esac
552 ;; 567 ;;
553 esac 568 esac
554} 569}
570
571
572# Some tests for when we screw with things and want to make
573# sure we didn't break anything
574#TESTS() {
575# CFLAGS="-a -b -c=1"
576# CXXFLAGS="-x -y -z=2"
577# LDFLAGS="-l -m -n=3"
578#
579# die() { exit 1; }
580# (is-flag 1 2 3) && die
581# (is-ldflag 1 2 3) && die
582#
583# is-flagq -l && die
584# is-ldflagq -a && die
585# is-flagq -a || die
586# is-flagq -x || die
587# is-ldflagq -n=* || die
588# is-ldflagq -n && die
589#
590# strip-unsupported-flags
591# [[ ${CFLAGS} == "-c=1" ]] || die
592# [[ ${CXXFLAGS} == "-y -z=2" ]] || die
593#
594# echo "All tests pass"
595#}
596#TESTS

Legend:
Removed from v.1.96  
changed lines
  Added in v.1.115

  ViewVC Help
Powered by ViewVC 1.1.20