/[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.81 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.81 2005/01/29 03:09:45 solar 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#### etexec-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-pic to {C,CXX,LD}FLAGS
64# when a package is filtering -fpic, -fPIC, -fpie, -fPIE
65# 63#
66#### fstack-flags #### 64################ DEPRECATED functions ################
67# hooked function for hardened gcc that appends 65# The following are still present to avoid breaking existing
68# -fno-stack-protector to {C,CXX,LD}FLAGS 66# code more than necessary; however they are deprecated. Please
69# when a package is filtering -fstack-protector, -fstack-protector-all 67# use gcc-specs-* from toolchain-funcs.eclass instead, if you
70# notice: modern automatic specs files will also suppress -fstack-protector-all 68# need to know which hardened techs are active in the compiler.
71# when only -fno-stack-protector is given 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
72# 91#
73 92
74# C[XX]FLAGS that we allow in strip-flags 93# C[XX]FLAGS that we allow in strip-flags
75setup-allowed-flags() { 94setup-allowed-flags() {
76 if [ -z "${ALLOWED_FLAGS}" ] ; then 95 if [[ -z ${ALLOWED_FLAGS} ]] ; then
77 export ALLOWED_FLAGS="-pipe" 96 export ALLOWED_FLAGS="-pipe"
78 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"
79 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"
80 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"
81 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"
82 case "${ARCH}" in
83 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;;
84 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
85 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
86 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
87 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
88 sparc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32 -m64" ;;
89 ppc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mabi" ;;
90 esac
91 fi 102 fi
92 # allow a bunch of flags that negate features / control ABI 103 # allow a bunch of flags that negate features / control ABI
93 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 104 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
94 case "${ARCH}" in 105 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
95 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 \
96 esac 107 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
97 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"
98 114
99 # 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
100 # NOTE: currently -Os have issues with gcc3 and K6* arch's 116 # NOTE: currently -Os have issues with gcc3 and K6* arch's
101 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 117 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
102 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\[*]}
103} 161}
104 162
105filter-flags() { 163filter-flags() {
106 local x f fset 164 _filter-hardened "$@"
107 declare -a new_CFLAGS new_CXXFLAGS 165 _filter-var CFLAGS "$@"
108 166 _filter-var CXXFLAGS "$@"
109 for x in "$@" ; do
110 case "${x}" in
111 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;;
112 -fstack-protector|-fstack-protector-all) fstack-flags;;
113 esac
114 done
115
116 for fset in CFLAGS CXXFLAGS; do
117 # Looping over the flags instead of using a global
118 # substitution ensures that we're working with flag atoms.
119 # Otherwise globs like -O* have the potential to wipe out the
120 # list of flags.
121 for f in ${!fset}; do
122 for x in "$@"; do
123 # Note this should work with globs like -O*
124 [[ ${f} == ${x} ]] && continue 2
125 done
126 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
127 done
128 eval export ${fset}=\${new_${fset}\[*]}
129 done
130
131 return 0 167 return 0
132} 168}
133 169
134filter-lfs-flags() { 170filter-lfs-flags() {
171 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
135 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
136} 173}
137 174
138append-lfs-flags() { 175append-lfs-flags() {
176 [[ -n $@ ]] && die "append-lfs-flags takes no arguments"
139 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
140} 178}
141 179
142append-flags() { 180append-flags() {
181 [[ -z $* ]] && return 0
143 export CFLAGS="${CFLAGS} $*" 182 export CFLAGS="${CFLAGS} $*"
144 export CXXFLAGS="${CXXFLAGS} $*" 183 export CXXFLAGS="${CXXFLAGS} $*"
145 [ -n "`is-flag -fno-stack-protector`" -o \
146 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
147 return 0 184 return 0
148} 185}
149 186
150replace-flags() { 187replace-flags() {
188 [[ $# != 2 ]] \
189 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \
190 && die "replace-flags takes 2 arguments, not $#"
191
151 local f fset 192 local f fset
152 declare -a new_CFLAGS new_CXXFLAGS 193 declare -a new_CFLAGS new_CXXFLAGS
153 194
154 for fset in CFLAGS CXXFLAGS; do 195 for fset in CFLAGS CXXFLAGS; do
155 # Looping over the flags instead of using a global 196 # Looping over the flags instead of using a global
156 # substitution ensures that we're working with flag atoms. 197 # substitution ensures that we're working with flag atoms.
178 shift 219 shift
179 done 220 done
180 return 0 221 return 0
181} 222}
182 223
183is-flag() { 224is-flagq() {
184 local x 225 local x
185 226
186 for x in ${CFLAGS} ${CXXFLAGS} ; do 227 for x in ${CFLAGS} ${CXXFLAGS} ; do
187 # Note this should work with globs like -mcpu=ultrasparc* 228 # Note this should work with globs like -mcpu=ultrasparc*
188 if [[ ${x} == ${1} ]]; then 229 if [[ ${x} == ${1} ]]; then
189 echo true
190 return 0 230 return 0
191 fi 231 fi
192 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
193 return 1 261 return 1
194} 262}
195 263
196filter-mfpmath() { 264filter-mfpmath() {
197 local orig_mfpmath new_math prune_math 265 local orig_mfpmath new_math prune_math
226 294
227 local NEW_CFLAGS="" 295 local NEW_CFLAGS=""
228 local NEW_CXXFLAGS="" 296 local NEW_CXXFLAGS=""
229 297
230 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 298 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
231 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then 299 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
232 use debug && einfo "Enabling the use of some unstable flags"
233 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 300 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
234 fi 301 fi
235 302
236 set -f # disable pathname expansion 303 set -f # disable pathname expansion
237 304
268 export CFLAGS="${NEW_CFLAGS}" 335 export CFLAGS="${NEW_CFLAGS}"
269 export CXXFLAGS="${NEW_CXXFLAGS}" 336 export CXXFLAGS="${NEW_CXXFLAGS}"
270 return 0 337 return 0
271} 338}
272 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()
273test_flag() { 389test_flag() {
274 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then 390 ewarn "test_flag: deprecated, please use test-flags()!" >&2
275 printf "%s\n" "$*" 391
276 return 0 392 test-flags-CC "$@"
277 fi
278 return 1
279} 393}
280 394
281test_version_info() { 395test_version_info() {
282 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then 396 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
283 return 0 397 return 0
285 return 1 399 return 1
286 fi 400 fi
287} 401}
288 402
289strip-unsupported-flags() { 403strip-unsupported-flags() {
290 local NEW_CFLAGS NEW_CXXFLAGS 404 local x NEW_CFLAGS NEW_CXXFLAGS
291 405
292 for x in ${CFLAGS} ; do 406 for x in ${CFLAGS} ; do
293 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`" 407 NEW_CFLAGS="${NEW_CFLAGS} $(test-flags ${x})"
294 done 408 done
295 for x in ${CXXFLAGS} ; do 409 for x in ${CXXFLAGS} ; do
296 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`" 410 NEW_CXXFLAGS="${NEW_CXXFLAGS} $(test-flags ${x})"
297 done 411 done
298 412
299 export CFLAGS="${NEW_CFLAGS}" 413 export CFLAGS=${NEW_CFLAGS}
300 export CXXFLAGS="${NEW_CXXFLAGS}" 414 export CXXFLAGS=${NEW_CXXFLAGS}
301} 415}
302 416
303get-flag() { 417get-flag() {
304 local f findflag="$1" 418 local f findflag="$1"
305 419
315 fi 429 fi
316 done 430 done
317 return 1 431 return 1
318} 432}
319 433
434# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
320has_hardened() { 435has_hardened() {
436 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
437
321 test_version_info Hardened && return 0 438 test_version_info Hardened && return 0
322 # the specs file wont exist unless gcc has GCC_SPECS support 439 # The specs file wont exist unless gcc has GCC_SPECS support
323 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \ 440 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
324 return 0
325 return 1
326} 441}
327 442
443# DEPRECATED - use gcc-specs-pie from toolchain-funcs
328# indicate whether PIC is set 444# indicate whether PIC is set
329has_pic() { 445has_pic() {
330 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 446 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
331 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
332 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
333 test_version_info pie && return 0
334 return 1
335}
336 447
448 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
449 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
450 gcc-specs-pie
451}
452
453# DEPRECATED - use gcc-specs-pie from toolchain-funcs
337# indicate whether PIE is set 454# indicate whether PIE is set
338has_pie() { 455has_pie() {
339 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 456 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
340 [ "${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} || \
341 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0 470 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
342 # test PIC while waiting for specs to be updated to generate __PIE__ 471 gcc-specs-ssp-all
343 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
344 return 1
345} 472}
346 473
474# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
347# indicate whether code for SSP is being generated 475# indicate whether code for SSP is being generated
348has_ssp() { 476has_ssp() {
477 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
478
349 # note; this matches both -fstack-protector and -fstack-protector-all 479 # note; this matches both -fstack-protector and -fstack-protector-all
350 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 480 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
351 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0 481 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
352 return 1 482 gcc-specs-ssp
353} 483}
354 484
355has_m64() { 485has_m64() {
356 # 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
357 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 487 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
358 # please dont replace this function with test_flag in some future 488 # please dont replace this function with test_flag in some future
359 # clean-up! 489 # clean-up!
490
360 local temp="$(emktemp)" 491 local temp="$(emktemp)"
361 echo "int main() { return(0); }" > ${temp}.c 492 echo "int main() { return(0); }" > "${temp}".c
362 MY_CC=$(tc-getCC) 493 MY_CC=$(tc-getCC)
363 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 494 ${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
364 local ret=$? 495 local ret=$?
365 rm -f ${temp}.c 496 rm -f "${temp}".c
366 [ "$ret" != "1" ] && return 0 497 [[ ${ret} != 1 ]] && return 0
367 return 1 498 return 1
368} 499}
369 500
370has_m32() { 501has_m32() {
371 # 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
373 # please dont replace this function with test_flag in some future 504 # please dont replace this function with test_flag in some future
374 # clean-up! 505 # clean-up!
375 506
376 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0 507 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
377 508
378 local temp="$(emktemp)" 509 local temp=$(emktemp)
379 echo "int main() { return(0); }" > ${temp}.c 510 echo "int main() { return(0); }" > "${temp}".c
380 MY_CC=$(tc-getCC) 511 MY_CC=$(tc-getCC)
381 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 512 ${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
382 local ret=$? 513 local ret=$?
383 rm -f ${temp}.c 514 rm -f "${temp}".c
384 [ "$ret" != "1" ] && return 0 515 [[ ${ret} != 1 ]] && return 0
385 return 1 516 return 1
386} 517}
387 518
388replace-sparc64-flags() { 519replace-sparc64-flags() {
389 local SPARC64_CPUS="ultrasparc v9" 520 local SPARC64_CPUS="ultrasparc3 ultrasparc v9"
390 521
391 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 522 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
392 for x in ${SPARC64_CPUS}; do 523 for x in ${SPARC64_CPUS}; do
393 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 524 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
394 done 525 done
395 else 526 else
396 for x in ${SPARC64_CPUS}; do 527 for x in ${SPARC64_CPUS}; do
397 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 528 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
398 done 529 done
399 fi 530 fi
400 531
401 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then 532 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
402 for x in ${SPARC64_CPUS}; do 533 for x in ${SPARC64_CPUS}; do
403 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 534 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
404 done 535 done
405 else 536 else
406 for x in ${SPARC64_CPUS}; do 537 for x in ${SPARC64_CPUS}; do
410 541
411 export CFLAGS CXXFLAGS 542 export CFLAGS CXXFLAGS
412} 543}
413 544
414append-ldflags() { 545append-ldflags() {
546 [[ -z $* ]] && return 0
415 export LDFLAGS="${LDFLAGS} $*" 547 export LDFLAGS="${LDFLAGS} $*"
416 return 0 548 return 0
417} 549}
418 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.
419filter-ldflags() { 553filter-ldflags() {
420 local x 554 _filter-var LDFLAGS "$@"
555 return 0
556}
421 557
422 # we do this fancy spacing stuff so as to not filter 558# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
423 # out part of a flag ... we want flag atoms ! :D 559# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
424 LDFLAGS=" ${LDFLAGS} " 560# to gcc where it needs the '-Wl,'.
561raw-ldflags() {
562 local x input="$@"
563 [[ -z ${input} ]] && input=${LDFLAGS}
564 set --
425 for x in "$@" ; do 565 for x in ${input} ; do
426 LDFLAGS="${LDFLAGS// ${x} / }" 566 x=${x#-Wl,}
567 set -- "$@" ${x//,/ }
427 done 568 done
428 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 569 echo "$@"
429 export LDFLAGS
430 return 0
431}
432
433etexec-flags() {
434 # if you're not using a hardened compiler you wont need this
435 # PIC/no-pic kludge in the first place.
436 has_hardened || return 0
437 use amd64 && return 0
438 use mips && return 0
439
440 if has_pie || has_pic; then
441 [ -z "`is-flag -fno-pic`" ] &&
442 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
443 [ -z "`is-flag -nopie`" ] &&
444 export CFLAGS="${CFLAGS} `test_flag -nopie`"
445 fi
446 return 0
447}
448
449fstack-flags() {
450 if has_ssp; then
451 [ -z "`is-flag -fno-stack-protector`" ] &&
452 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
453 fi
454 return 0
455} 570}
456 571
457# 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>,
458# 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
459# fixes. 574# fixes.
460# 575#
461# 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
462gcc2-flags() { 577gcc2-flags() {
463 CFLAGS=${CFLAGS//pentium-mmx/i586} 578 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
464 CFLAGS=${CFLAGS//pentium[234]/i686} 579 CFLAGS=${CFLAGS//-mtune=/-mcpu=}
465 CFLAGS=${CFLAGS//k6-[23]/k6} 580 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
466 CFLAGS=${CFLAGS//athlon-tbird/i686}
467 CFLAGS=${CFLAGS//athlon-4/i686}
468 CFLAGS=${CFLAGS//athlon-[xm]p/i686}
469 CFLAGS=${CFLAGS//athlon/i686}
470
471 CXXFLAGS=${CXXFLAGS//pentium-mmx/i586}
472 CXXFLAGS=${CXXFLAGS//pentium[234]/i686}
473 CXXFLAGS=${CXXFLAGS//k6-[23]/k6}
474 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686}
475 CXXFLAGS=${CXXFLAGS//athlon-4/i686}
476 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686}
477 CXXFLAGS=${CXXFLAGS//athlon/i686}
478
479 if [ "$ARCH" = alpha ]; then
480 CHOST=${CHOST/#alphaev6[78]/alphaev6}
481 CFLAGS=${CFLAGS//ev6[78]/ev6}
482 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6}
483 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
484 590
485 export CFLAGS CXXFLAGS 591 export CFLAGS CXXFLAGS
486} 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.81  
changed lines
  Added in v.1.106

  ViewVC Help
Powered by ViewVC 1.1.20