/[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.83 Revision 1.106
1# Copyright 1999-2004 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.83 2005/02/19 07:11:31 mr_bones_ Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.106 2006/02/19 23:18:30 vapier Exp $
4#
5# Author Bart Verwilst <verwilst@gentoo.org>
6 4
7ECLASS=flag-o-matic
8INHERITED="$INHERITED $ECLASS"
9
10IUSE="debug"
11 5
12# need access to emktemp() 6# need access to emktemp()
13inherit eutils toolchain-funcs multilib 7inherit eutils toolchain-funcs multilib
14 8
15# 9#
25# 19#
26#### replace-cpu-flags <old.cpus> <new.cpu> ### 20#### replace-cpu-flags <old.cpus> <new.cpu> ###
27# Replace march/mcpu flags that specify <old.cpus> 21# Replace march/mcpu flags that specify <old.cpus>
28# with flags that specify <new.cpu> 22# with flags that specify <new.cpu>
29# 23#
30#### is-flag <flag> #### 24#### is-flag[q] <flag> ####
31# Returns "true" if flag is set in C[XX]FLAGS 25# Returns "true" if flag is set in C[XX]FLAGS
32# 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
33# 33#
34#### strip-flags #### 34#### strip-flags ####
35# Strip C[XX]FLAGS of everything except known 35# Strip C[XX]FLAGS of everything except known
36# good options. 36# good options.
37# 37#
56# 56#
57#### filter-ldflags <flags> #### 57#### filter-ldflags <flags> ####
58# Remove particular flags from LDFLAGS 58# Remove particular flags from LDFLAGS
59# Matches only complete flags 59# Matches only complete flags
60# 60#
61#### fstack-flags #### 61#### bindnow-flags ####
62# hooked function for hardened gcc that appends 62# Returns the flags to enable "now" binding in the current selected linker.
63# -fno-stack-protector to {C,CXX,LD}FLAGS 63#
64# when a package is filtering -fstack-protector, -fstack-protector-all 64################ DEPRECATED functions ################
65# notice: modern automatic specs files will also suppress -fstack-protector-all 65# The following are still present to avoid breaking existing
66# when only -fno-stack-protector is given 66# code more than necessary; however they are deprecated. Please
67# use gcc-specs-* from toolchain-funcs.eclass instead, if you
68# need to know which hardened techs are active in the compiler.
69# See bug #100974
70#
71#### has_hardened ####
72# Returns true if the compiler has 'Hardened' in its version string,
73# (note; switched-spec vanilla compilers satisfy this condition) or
74# the specs file name contains 'hardened'.
75#
76#### has_pie ####
77# Returns true if the compiler by default or with current CFLAGS
78# builds position-independent code.
79#
80#### has_pic ####
81# Returns true if the compiler by default or with current CFLAGS
82# builds position-independent code.
83#
84#### has_ssp_all ####
85# Returns true if the compiler by default or with current CFLAGS
86# generates stack smash protections for all functions
87#
88#### has_ssp ####
89# Returns true if the compiler by default or with current CFLAGS
90# generates stack smash protections for most vulnerable functions
67# 91#
68 92
69# C[XX]FLAGS that we allow in strip-flags 93# C[XX]FLAGS that we allow in strip-flags
70setup-allowed-flags() { 94setup-allowed-flags() {
71 if [ -z "${ALLOWED_FLAGS}" ] ; then 95 if [[ -z ${ALLOWED_FLAGS} ]] ; then
72 export ALLOWED_FLAGS="-pipe" 96 export ALLOWED_FLAGS="-pipe"
73 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"
74 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fno-stack-protector" 98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking"
75 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"
76 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"
77 case "${ARCH}" in
78 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;;
79 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
80 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
81 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
82 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
83 sparc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32 -m64" ;;
84 ppc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mabi" ;;
85 esac
86 fi 102 fi
87 # allow a bunch of flags that negate features / control ABI 103 # allow a bunch of flags that negate features / control ABI
88 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 104 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
89 case "${ARCH}" in 105 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
90 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;; 106 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
91 esac 107 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
92 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs -msoft-float -mflat -mno-faster-structs -mfaster-structs -mlittle-endian -mbig-endian -mlive-g0 -mcmodel -mno-stack-bias -mstack-bias" 108 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
109 -mieee -mieee-with-inexact \
110 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \
111 -mflat -mno-flat -mno-faster-structs -mfaster-structs \
112 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
113 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias"
93 114
94 # C[XX]FLAGS that we are think is ok, but needs testing 115 # C[XX]FLAGS that we are think is ok, but needs testing
95 # NOTE: currently -Os have issues with gcc3 and K6* arch's 116 # NOTE: currently -Os have issues with gcc3 and K6* arch's
96 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 117 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
97 return 0 118 return 0
119}
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\[*]}
98} 161}
99 162
100filter-flags() { 163filter-flags() {
101 local x f fset 164 _filter-hardened "$@"
102 declare -a new_CFLAGS new_CXXFLAGS 165 _filter-var CFLAGS "$@"
103 166 _filter-var CXXFLAGS "$@"
104 for x in "$@" ; do
105 case "${x}" in
106 -fPIC|-fpic|-fPIE|-fpie|-pie)
107 append-flags `test_flag -fno-pie`;;
108 -fstack-protector|-fstack-protector-all)
109 fstack-flags;;
110 esac
111 done
112
113 for fset in CFLAGS CXXFLAGS; do
114 # Looping over the flags instead of using a global
115 # substitution ensures that we're working with flag atoms.
116 # Otherwise globs like -O* have the potential to wipe out the
117 # list of flags.
118 for f in ${!fset}; do
119 for x in "$@"; do
120 # Note this should work with globs like -O*
121 [[ ${f} == ${x} ]] && continue 2
122 done
123 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
124 done
125 eval export ${fset}=\${new_${fset}\[*]}
126 done
127
128 return 0 167 return 0
129} 168}
130 169
131filter-lfs-flags() { 170filter-lfs-flags() {
171 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
132 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 172 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
133} 173}
134 174
135append-lfs-flags() { 175append-lfs-flags() {
176 [[ -n $@ ]] && die "append-lfs-flags takes no arguments"
136 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 177 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
137} 178}
138 179
139append-flags() { 180append-flags() {
140 [[ -z $* ]] && return 0 181 [[ -z $* ]] && return 0
141 export CFLAGS="${CFLAGS} $*" 182 export CFLAGS="${CFLAGS} $*"
142 export CXXFLAGS="${CXXFLAGS} $*" 183 export CXXFLAGS="${CXXFLAGS} $*"
143 [ -n "`is-flag -fno-stack-protector`" -o \
144 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
145 return 0 184 return 0
146} 185}
147 186
148replace-flags() { 187replace-flags() {
188 [[ $# != 2 ]] \
189 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \
190 && die "replace-flags takes 2 arguments, not $#"
191
149 local f fset 192 local f fset
150 declare -a new_CFLAGS new_CXXFLAGS 193 declare -a new_CFLAGS new_CXXFLAGS
151 194
152 for fset in CFLAGS CXXFLAGS; do 195 for fset in CFLAGS CXXFLAGS; do
153 # Looping over the flags instead of using a global 196 # Looping over the flags instead of using a global
176 shift 219 shift
177 done 220 done
178 return 0 221 return 0
179} 222}
180 223
181is-flag() { 224is-flagq() {
182 local x 225 local x
183 226
184 for x in ${CFLAGS} ${CXXFLAGS} ; do 227 for x in ${CFLAGS} ${CXXFLAGS} ; do
185 # Note this should work with globs like -mcpu=ultrasparc* 228 # Note this should work with globs like -mcpu=ultrasparc*
186 if [[ ${x} == ${1} ]]; then 229 if [[ ${x} == ${1} ]]; then
187 echo true
188 return 0 230 return 0
189 fi 231 fi
190 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
191 return 1 261 return 1
192} 262}
193 263
194filter-mfpmath() { 264filter-mfpmath() {
195 local orig_mfpmath new_math prune_math 265 local orig_mfpmath new_math prune_math
224 294
225 local NEW_CFLAGS="" 295 local NEW_CFLAGS=""
226 local NEW_CXXFLAGS="" 296 local NEW_CXXFLAGS=""
227 297
228 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 298 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
229 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then 299 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
230 use debug && einfo "Enabling the use of some unstable flags"
231 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 300 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
232 fi 301 fi
233 302
234 set -f # disable pathname expansion 303 set -f # disable pathname expansion
235 304
266 export CFLAGS="${NEW_CFLAGS}" 335 export CFLAGS="${NEW_CFLAGS}"
267 export CXXFLAGS="${NEW_CXXFLAGS}" 336 export CXXFLAGS="${NEW_CXXFLAGS}"
268 return 0 337 return 0
269} 338}
270 339
340test-flag-PROG() {
341 local comp=$1
342 local flags="$2"
343
344 [[ -z ${comp} || -z ${flags} ]] && \
345 return 1
346
347 local PROG=$(tc-get${comp})
348 ${PROG} ${flags} -S -o /dev/null -xc /dev/null \
349 > /dev/null 2>&1
350}
351
352# Returns true if C compiler support given flag
353test-flag-CC() { test-flag-PROG "CC" "$1"; }
354
355# Returns true if C++ compiler support given flag
356test-flag-CXX() { test-flag-PROG "CXX" "$1"; }
357
358test-flags-PROG() {
359 local comp=$1
360 local flags
361 local x
362
363 shift
364
365 [[ -z ${comp} ]] && \
366 return 1
367
368 for x in "$@" ; do
369 test-flag-${comp} "${x}" && flags="${flags} ${x}"
370 done
371
372 echo "${flags}"
373
374 # Just bail if we dont have any flags
375 [[ -n ${flags} ]]
376}
377
378# Returns (echo's) the given flags supported by the C compiler
379test-flags-CC() { test-flags-PROG "CC" "$@"; }
380
381# Returns (echo's) the given flags supported by the C++ compiler
382test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
383
384# Short-hand that should hopefully work for both C and C++ compiler, but
385# its really only present due to the append-flags() abomination.
386test-flags() { test-flags-CC "$@"; }
387
388# Depriciated, use test-flags()
271test_flag() { 389test_flag() {
272 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then 390 ewarn "test_flag: deprecated, please use test-flags()!" >&2
273 printf "%s\n" "$*" 391
274 return 0 392 test-flags-CC "$@"
275 fi
276 return 1
277} 393}
278 394
279test_version_info() { 395test_version_info() {
280 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then 396 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
281 return 0 397 return 0
283 return 1 399 return 1
284 fi 400 fi
285} 401}
286 402
287strip-unsupported-flags() { 403strip-unsupported-flags() {
288 local NEW_CFLAGS NEW_CXXFLAGS 404 local x NEW_CFLAGS NEW_CXXFLAGS
289 405
290 for x in ${CFLAGS} ; do 406 for x in ${CFLAGS} ; do
291 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`" 407 NEW_CFLAGS="${NEW_CFLAGS} $(test-flags ${x})"
292 done 408 done
293 for x in ${CXXFLAGS} ; do 409 for x in ${CXXFLAGS} ; do
294 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`" 410 NEW_CXXFLAGS="${NEW_CXXFLAGS} $(test-flags ${x})"
295 done 411 done
296 412
297 export CFLAGS="${NEW_CFLAGS}" 413 export CFLAGS=${NEW_CFLAGS}
298 export CXXFLAGS="${NEW_CXXFLAGS}" 414 export CXXFLAGS=${NEW_CXXFLAGS}
299} 415}
300 416
301get-flag() { 417get-flag() {
302 local f findflag="$1" 418 local f findflag="$1"
303 419
313 fi 429 fi
314 done 430 done
315 return 1 431 return 1
316} 432}
317 433
434# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
318has_hardened() { 435has_hardened() {
436 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
437
319 test_version_info Hardened && return 0 438 test_version_info Hardened && return 0
320 # the specs file wont exist unless gcc has GCC_SPECS support 439 # The specs file wont exist unless gcc has GCC_SPECS support
321 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \ 440 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
322 return 0
323 return 1
324} 441}
325 442
443# DEPRECATED - use gcc-specs-pie from toolchain-funcs
326# indicate whether PIC is set 444# indicate whether PIC is set
327has_pic() { 445has_pic() {
328 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 446 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
329 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
330 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
331 test_version_info pie && return 0
332 return 1
333}
334 447
448 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
449 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
450 gcc-specs-pie
451}
452
453# DEPRECATED - use gcc-specs-pie from toolchain-funcs
335# indicate whether PIE is set 454# indicate whether PIE is set
336has_pie() { 455has_pie() {
337 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 456 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
338 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0 457
458 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \
459 ${CFLAGS/-fpie} != ${CFLAGS} ]] || \
460 gcc-specs-pie
461}
462
463# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
464# indicate whether code for SSP is being generated for all functions
465has_ssp_all() {
466 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2
467
468 # note; this matches only -fstack-protector-all
469 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \
339 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0 470 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
340 # test PIC while waiting for specs to be updated to generate __PIE__ 471 gcc-specs-ssp-all
341 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
342 return 1
343} 472}
344 473
474# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
345# indicate whether code for SSP is being generated 475# indicate whether code for SSP is being generated
346has_ssp() { 476has_ssp() {
477 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
478
347 # note; this matches both -fstack-protector and -fstack-protector-all 479 # note; this matches both -fstack-protector and -fstack-protector-all
348 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 480 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
349 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0 481 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
350 return 1 482 gcc-specs-ssp
351} 483}
352 484
353has_m64() { 485has_m64() {
354 # this doesnt test if the flag is accepted, it tests if the flag 486 # this doesnt test if the flag is accepted, it tests if the flag
355 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 487 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
356 # please dont replace this function with test_flag in some future 488 # please dont replace this function with test_flag in some future
357 # clean-up! 489 # clean-up!
490
358 local temp="$(emktemp)" 491 local temp="$(emktemp)"
359 echo "int main() { return(0); }" > ${temp}.c 492 echo "int main() { return(0); }" > "${temp}".c
360 MY_CC=$(tc-getCC) 493 MY_CC=$(tc-getCC)
361 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 494 ${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
362 local ret=$? 495 local ret=$?
363 rm -f ${temp}.c 496 rm -f "${temp}".c
364 [ "$ret" != "1" ] && return 0 497 [[ ${ret} != 1 ]] && return 0
365 return 1 498 return 1
366} 499}
367 500
368has_m32() { 501has_m32() {
369 # this doesnt test if the flag is accepted, it tests if the flag 502 # this doesnt test if the flag is accepted, it tests if the flag
371 # please dont replace this function with test_flag in some future 504 # please dont replace this function with test_flag in some future
372 # clean-up! 505 # clean-up!
373 506
374 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0 507 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
375 508
376 local temp="$(emktemp)" 509 local temp=$(emktemp)
377 echo "int main() { return(0); }" > ${temp}.c 510 echo "int main() { return(0); }" > "${temp}".c
378 MY_CC=$(tc-getCC) 511 MY_CC=$(tc-getCC)
379 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 512 ${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
380 local ret=$? 513 local ret=$?
381 rm -f ${temp}.c 514 rm -f "${temp}".c
382 [ "$ret" != "1" ] && return 0 515 [[ ${ret} != 1 ]] && return 0
383 return 1 516 return 1
384} 517}
385 518
386replace-sparc64-flags() { 519replace-sparc64-flags() {
387 local SPARC64_CPUS="ultrasparc v9" 520 local SPARC64_CPUS="ultrasparc3 ultrasparc v9"
388 521
389 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 522 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
390 for x in ${SPARC64_CPUS}; do 523 for x in ${SPARC64_CPUS}; do
391 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 524 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
392 done 525 done
408 541
409 export CFLAGS CXXFLAGS 542 export CFLAGS CXXFLAGS
410} 543}
411 544
412append-ldflags() { 545append-ldflags() {
546 [[ -z $* ]] && return 0
413 export LDFLAGS="${LDFLAGS} $*" 547 export LDFLAGS="${LDFLAGS} $*"
414 return 0 548 return 0
415} 549}
416 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.
417filter-ldflags() { 553filter-ldflags() {
418 local x 554 _filter-var LDFLAGS "$@"
555 return 0
556}
419 557
420 # we do this fancy spacing stuff so as to not filter 558# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
421 # out part of a flag ... we want flag atoms ! :D 559# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
422 LDFLAGS=" ${LDFLAGS} " 560# to gcc where it needs the '-Wl,'.
561raw-ldflags() {
562 local x input="$@"
563 [[ -z ${input} ]] && input=${LDFLAGS}
564 set --
423 for x in "$@" ; do 565 for x in ${input} ; do
424 LDFLAGS="${LDFLAGS// ${x} / }" 566 x=${x#-Wl,}
567 set -- "$@" ${x//,/ }
425 done 568 done
426 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 569 echo "$@"
427 export LDFLAGS
428 return 0
429}
430
431fstack-flags() {
432 if has_ssp; then
433 [ -z "`is-flag -fno-stack-protector`" ] &&
434 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
435 fi
436 return 0
437} 570}
438 571
439# 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>,
440# 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
441# fixes. 574# fixes.
442# 575#
443# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3 576# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
444gcc2-flags() { 577gcc2-flags() {
445 CFLAGS=${CFLAGS//pentium-mmx/i586} 578 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
446 CFLAGS=${CFLAGS//pentium[234]/i686} 579 CFLAGS=${CFLAGS//-mtune=/-mcpu=}
447 CFLAGS=${CFLAGS//k6-[23]/k6} 580 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
448 CFLAGS=${CFLAGS//athlon-tbird/i686}
449 CFLAGS=${CFLAGS//athlon-4/i686}
450 CFLAGS=${CFLAGS//athlon-[xm]p/i686}
451 CFLAGS=${CFLAGS//athlon/i686}
452
453 CXXFLAGS=${CXXFLAGS//pentium-mmx/i586}
454 CXXFLAGS=${CXXFLAGS//pentium[234]/i686}
455 CXXFLAGS=${CXXFLAGS//k6-[23]/k6}
456 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686}
457 CXXFLAGS=${CXXFLAGS//athlon-4/i686}
458 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686}
459 CXXFLAGS=${CXXFLAGS//athlon/i686}
460
461 if [ "$ARCH" = alpha ]; then
462 CHOST=${CHOST/#alphaev6[78]/alphaev6}
463 CFLAGS=${CFLAGS//ev6[78]/ev6}
464 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6}
465 fi 581 fi
582
583 replace-cpu-flags k6-{2,3} k6
584 replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
585
586 replace-cpu-flags pentium-mmx i586
587 replace-cpu-flags pentium{2,3,4} i686
588
589 replace-cpu-flags ev6{7,8} ev6
466 590
467 export CFLAGS CXXFLAGS 591 export CFLAGS CXXFLAGS
468} 592}
593
594# Gets the flags needed for "NOW" binding
595bindnow-flags() {
596 case $($(tc-getLD) -v 2>&1 </dev/null) in
597 *GNU* | *'with BFD'*) # GNU ld
598 echo "-Wl,-z,now" ;;
599 *Apple*) # Darwin ld
600 echo "-bind_at_load" ;;
601 *)
602 # Some linkers just recognize -V instead of -v
603 case $($(tc-getLD) -V 2>&1 </dev/null) in
604 *Solaris*) # Solaris accept almost the same GNU options
605 echo "-Wl,-z,now" ;;
606 esac
607 ;;
608 esac
609}

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.106

  ViewVC Help
Powered by ViewVC 1.1.20