/[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.93 Revision 1.118
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2007 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.93 2005/09/27 01:06:47 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.118 2007/03/24 07:07:18 vapier Exp $
4 4#
5# Maintainer: toolchain@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#
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# 61#
55#### fstack-flags #### 62#### bindnow-flags ####
56# hooked function for hardened gcc that appends 63# Returns the flags to enable "now" binding in the current selected linker.
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#
62# 64#
63################ DEPRECATED functions ################ 65################ DEPRECATED functions ################
64# The following are still present to avoid breaking existing 66# The following are still present to avoid breaking existing
65# code more than necessary; however they are deprecated. Please 67# code more than necessary; however they are deprecated. Please
66# use gcc-specs-* from toolchain-funcs.eclass instead, if you 68# use gcc-specs-* from toolchain-funcs.eclass instead, if you
88# Returns true if the compiler by default or with current CFLAGS 90# Returns true if the compiler by default or with current CFLAGS
89# generates stack smash protections for most vulnerable functions 91# generates stack smash protections for most vulnerable functions
90# 92#
91 93
92# C[XX]FLAGS that we allow in strip-flags 94# C[XX]FLAGS that we allow in strip-flags
95# Note: shell globs and character lists are allowed
93setup-allowed-flags() { 96setup-allowed-flags() {
94 if [[ -z ${ALLOWED_FLAGS} ]] ; then 97 if [[ -z ${ALLOWED_FLAGS} ]] ; then
95 export ALLOWED_FLAGS="-pipe" 98 export ALLOWED_FLAGS="-pipe"
96 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune" 99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
97 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all" 100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking" 101 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking"
99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time" 102 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-PIE -fno-pie -fno-unit-at-a-time"
100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3" 103 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+"
104 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-ident"
101 fi 105 fi
102 # allow a bunch of flags that negate features / control ABI 106 # allow a bunch of flags that negate features / control ABI
103 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 107 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
104 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \ 108 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
105 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \ 109 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
106 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \ 110 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
107 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \ 111 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
108 -mieee -mieee-with-inexact \ 112 -mieee -mieee-with-inexact -mschedule \
109 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \ 113 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \
110 -mflat -mno-flat -mno-faster-structs -mfaster-structs \ 114 -mflat -mno-flat -mno-faster-structs -mfaster-structs \
111 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \ 115 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
112 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias" 116 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias \
117 -msecure-plt -D*"
113 118
114 # C[XX]FLAGS that we are think is ok, but needs testing 119 # C[XX]FLAGS that we are think is ok, but needs testing
115 # NOTE: currently -Os have issues with gcc3 and K6* arch's 120 # NOTE: currently -Os have issues with gcc3 and K6* arch's
116 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 121 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
117 return 0 122 return 0
123}
124
125# inverted filters for hardened compiler. This is trying to unpick
126# the hardened compiler defaults.
127_filter-hardened() {
128 local f
129 for f in "$@" ; do
130 case "${f}" in
131 # Ideally we should only concern ourselves with PIE flags,
132 # not -fPIC or -fpic, but too many places filter -fPIC without
133 # thinking about -fPIE.
134 -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie)
135 gcc-specs-pie || continue
136 is-flagq -nopie || append-flags -nopie;;
137 -fstack-protector)
138 gcc-specs-ssp || continue
139 is-flagq -fno-stack-protector || append-flags -fno-stack-protector;;
140 -fstack-protector-all)
141 gcc-specs-ssp-to-all || continue
142 is-flagq -fno-stack-protector-all || append-flags -fno-stack-protector-all;;
143 esac
144 done
145}
146
147# Remove occurrences of strings from variable given in $1
148# Strings removed are matched as globs, so for example
149# '-O*' would remove -O1, -O2 etc.
150_filter-var() {
151 local f x VAR VAL
152 declare -a new
153
154 VAR=$1
155 shift
156 eval VAL=\${${VAR}}
157 for f in ${VAL}; do
158 for x in "$@"; do
159 # Note this should work with globs like -O*
160 [[ ${f} == ${x} ]] && continue 2
161 done
162 eval new\[\${\#new\[@]}]=\${f}
163 done
164 eval export ${VAR}=\${new\[*]}
118} 165}
119 166
120filter-flags() { 167filter-flags() {
121 local x f fset 168 _filter-hardened "$@"
122 declare -a new_CFLAGS new_CXXFLAGS 169 _filter-var CFLAGS "$@"
123 170 _filter-var CPPFLAGS "$@"
124 for x in "$@" ; do 171 _filter-var CXXFLAGS "$@"
125 case "${x}" in
126 -fPIC|-fpic|-fPIE|-fpie|-pie)
127 append-flags `test_flag -fno-pie`;;
128 -fstack-protector|-fstack-protector-all)
129 fstack-flags;;
130 esac
131 done
132
133 for fset in CFLAGS CXXFLAGS; do
134 # Looping over the flags instead of using a global
135 # substitution ensures that we're working with flag atoms.
136 # Otherwise globs like -O* have the potential to wipe out the
137 # list of flags.
138 for f in ${!fset}; do
139 for x in "$@"; do
140 # Note this should work with globs like -O*
141 [[ ${f} == ${x} ]] && continue 2
142 done
143 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
144 done
145 eval export ${fset}=\${new_${fset}\[*]}
146 done
147
148 return 0 172 return 0
149} 173}
150 174
151filter-lfs-flags() { 175filter-lfs-flags() {
152 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments" 176 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
153 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 177 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
154} 178}
155 179
180append-cppflags() {
181 [[ -z $* ]] && return 0
182 export CPPFLAGS="${CPPFLAGS} $*"
183 return 0
184}
185
156append-lfs-flags() { 186append-lfs-flags() {
157 [[ -n $@ ]] && die "append-lfs-flags takes no arguments" 187 [[ -n $@ ]] && die "append-lfs-flags takes no arguments"
158 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 188 append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
159} 189}
160 190
161append-flags() { 191append-flags() {
162 [[ -z $* ]] && return 0 192 [[ -z $* ]] && return 0
163 export CFLAGS="${CFLAGS} $*" 193 export CFLAGS="${CFLAGS} $*"
164 export CXXFLAGS="${CXXFLAGS} $*" 194 export CXXFLAGS="${CXXFLAGS} $*"
165 [ -n "`is-flag -fno-stack-protector`" -o \
166 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
167 return 0 195 return 0
168} 196}
169 197
170replace-flags() { 198replace-flags() {
171 [[ $# != 2 ]] \ 199 [[ $# != 2 ]] \
193 221
194replace-cpu-flags() { 222replace-cpu-flags() {
195 local newcpu="$#" ; newcpu="${!newcpu}" 223 local newcpu="$#" ; newcpu="${!newcpu}"
196 while [ $# -gt 1 ] ; do 224 while [ $# -gt 1 ] ; do
197 # quote to make sure that no globbing is done (particularly on 225 # quote to make sure that no globbing is done (particularly on
198 # ${oldcpu} prior to calling replace-flags 226 # ${oldcpu}) prior to calling replace-flags
199 replace-flags "-march=${1}" "-march=${newcpu}" 227 replace-flags "-march=${1}" "-march=${newcpu}"
200 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}" 228 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
201 replace-flags "-mtune=${1}" "-mtune=${newcpu}" 229 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
202 shift 230 shift
203 done 231 done
204 return 0 232 return 0
205} 233}
206 234
235_is_flagq() {
236 local x
237 for x in ${!1} ; do
238 [[ ${x} == $2 ]] && return 0
239 done
240 return 1
241}
242
243is-flagq() {
244 [[ -n $2 ]] && die "Usage: is-flag <flag>"
245 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1
246}
247
207is-flag() { 248is-flag() {
208 local x 249 is-flagq "$@" && echo true
250}
209 251
210 for x in ${CFLAGS} ${CXXFLAGS} ; do 252is-ldflagq() {
211 # Note this should work with globs like -mcpu=ultrasparc* 253 [[ -n $2 ]] && die "Usage: is-ldflag <flag>"
212 if [[ ${x} == ${1} ]]; then 254 _is_flagq LDFLAGS $1
213 echo true 255}
214 return 0 256
215 fi 257is-ldflag() {
216 done 258 is-ldflagq "$@" && echo true
217 return 1
218} 259}
219 260
220filter-mfpmath() { 261filter-mfpmath() {
221 local orig_mfpmath new_math prune_math 262 local orig_mfpmath new_math prune_math
222 263
223 # save the original -mfpmath flag 264 # save the original -mfpmath flag
224 orig_mfpmath="`get-flag -mfpmath`" 265 orig_mfpmath=$(get-flag -mfpmath)
225 # get the value of the current -mfpmath flag 266 # get the value of the current -mfpmath flag
226 new_math=" `get-flag mfpmath | tr , ' '` " 267 new_math=$(get-flag mfpmath)
268 new_math=" ${new_math//,/ } "
227 # figure out which math values are to be removed 269 # figure out which math values are to be removed
228 prune_math="" 270 prune_math=""
229 for prune_math in "$@" ; do 271 for prune_math in "$@" ; do
230 new_math="${new_math/ ${prune_math} / }" 272 new_math=${new_math/ ${prune_math} / }
231 done 273 done
232 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 274 new_math=$(echo ${new_math})
275 new_math=${new_math// /,}
233 276
234 if [ -z "${new_math}" ] ; then 277 if [[ -z ${new_math} ]] ; then
235 # if we're removing all user specified math values are 278 # if we're removing all user specified math values are
236 # slated for removal, then we just filter the flag 279 # slated for removal, then we just filter the flag
237 filter-flags ${orig_mfpmath} 280 filter-flags ${orig_mfpmath}
238 else 281 else
239 # if we only want to filter some of the user specified 282 # if we only want to filter some of the user specified
291 export CFLAGS="${NEW_CFLAGS}" 334 export CFLAGS="${NEW_CFLAGS}"
292 export CXXFLAGS="${NEW_CXXFLAGS}" 335 export CXXFLAGS="${NEW_CXXFLAGS}"
293 return 0 336 return 0
294} 337}
295 338
339test-flag-PROG() {
340 local comp=$1
341 local flags="$2"
342
343 [[ -z ${comp} || -z ${flags} ]] && \
344 return 1
345
346 local PROG=$(tc-get${comp})
347 ${PROG} ${flags} -S -o /dev/null -xc /dev/null \
348 > /dev/null 2>&1
349}
350
351# Returns true if C compiler support given flag
352test-flag-CC() { test-flag-PROG "CC" "$1"; }
353
354# Returns true if C++ compiler support given flag
355test-flag-CXX() { test-flag-PROG "CXX" "$1"; }
356
357test-flags-PROG() {
358 local comp=$1
359 local flags
360 local x
361
362 shift
363
364 [[ -z ${comp} ]] && return 1
365
366 x=""
367 for x in "$@" ; do
368 test-flag-${comp} "${x}" && flags="${flags}${flags:+ }${x}"
369 done
370
371 echo "${flags}"
372
373 # Just bail if we dont have any flags
374 [[ -n ${flags} ]]
375}
376
377# Returns (echo's) the given flags supported by the C compiler
378test-flags-CC() { test-flags-PROG "CC" "$@"; }
379
380# Returns (echo's) the given flags supported by the C++ compiler
381test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
382
383# Short-hand that should hopefully work for both C and C++ compiler, but
384# its really only present due to the append-flags() abomination.
385test-flags() { test-flags-CC "$@"; }
386
387# Depriciated, use test-flags()
296test_flag() { 388test_flag() {
297 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then 389 ewarn "test_flag: deprecated, please use test-flags()!" >&2
298 printf "%s\n" "$*" 390
299 return 0 391 test-flags-CC "$@"
300 fi
301 return 1
302} 392}
303 393
304test_version_info() { 394test_version_info() {
305 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then 395 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
306 return 0 396 return 0
308 return 1 398 return 1
309 fi 399 fi
310} 400}
311 401
312strip-unsupported-flags() { 402strip-unsupported-flags() {
313 local NEW_CFLAGS NEW_CXXFLAGS 403 export CFLAGS=$(test-flags-CC ${CFLAGS})
314 404 export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS})
315 for x in ${CFLAGS} ; do
316 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`"
317 done
318 for x in ${CXXFLAGS} ; do
319 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`"
320 done
321
322 export CFLAGS="${NEW_CFLAGS}"
323 export CXXFLAGS="${NEW_CXXFLAGS}"
324} 405}
325 406
326get-flag() { 407get-flag() {
327 local f findflag="$1" 408 local f findflag="$1"
328 409
340 return 1 421 return 1
341} 422}
342 423
343# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs 424# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
344has_hardened() { 425has_hardened() {
426 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
427
345 test_version_info Hardened && return 0 428 test_version_info Hardened && return 0
346 # the specs file wont exist unless gcc has GCC_SPECS support 429 # The specs file wont exist unless gcc has GCC_SPECS support
347 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \ 430 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
348 return 0
349 return 1
350} 431}
351 432
352# DEPRECATED - use gcc-specs-pie from toolchain-funcs 433# DEPRECATED - use gcc-specs-pie from toolchain-funcs
353# indicate whether PIC is set 434# indicate whether PIC is set
354has_pic() { 435has_pic() {
355 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 436 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
356 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 437
357 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0 438 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
358 return 1 439 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
440 gcc-specs-pie
359} 441}
360 442
361# DEPRECATED - use gcc-specs-pie from toolchain-funcs 443# DEPRECATED - use gcc-specs-pie from toolchain-funcs
362# indicate whether PIE is set 444# indicate whether PIE is set
363has_pie() { 445has_pie() {
364 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 446 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
365 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0 447
366 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0 448 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \
367 # test PIC while waiting for specs to be updated to generate __PIE__ 449 ${CFLAGS/-fpie} != ${CFLAGS} ]] || \
368 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0 450 gcc-specs-pie
369 return 1
370} 451}
371 452
372# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 453# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
373# indicate whether code for SSP is being generated for all functions 454# indicate whether code for SSP is being generated for all functions
374has_ssp_all() { 455has_ssp_all() {
456 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2
457
375 # note; this matches only -fstack-protector-all 458 # note; this matches only -fstack-protector-all
376 [ "${CFLAGS/-fstack-protector-all}" != "${CFLAGS}" ] && return 0 459 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \
377 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__)" ] && return 0 460 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
378 gcc-specs-ssp && return 0 461 gcc-specs-ssp-all
379 return 1
380} 462}
381 463
382# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 464# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
383# indicate whether code for SSP is being generated 465# indicate whether code for SSP is being generated
384has_ssp() { 466has_ssp() {
467 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
468
385 # note; this matches both -fstack-protector and -fstack-protector-all 469 # note; this matches both -fstack-protector and -fstack-protector-all
386 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 470 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
387 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0 471 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
388 gcc-specs-ssp && return 0 472 gcc-specs-ssp
389 return 1
390} 473}
391 474
392has_m64() { 475has_m64() {
393 # this doesnt test if the flag is accepted, it tests if the flag 476 # this doesnt test if the flag is accepted, it tests if the flag
394 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 477 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
395 # please dont replace this function with test_flag in some future 478 # please dont replace this function with test_flag in some future
396 # clean-up! 479 # clean-up!
480
397 local temp="$(emktemp)" 481 local temp="$(emktemp)"
398 echo "int main() { return(0); }" > ${temp}.c 482 echo "int main() { return(0); }" > "${temp}".c
399 MY_CC=$(tc-getCC) 483 MY_CC=$(tc-getCC)
400 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 484 ${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
401 local ret=$? 485 local ret=$?
402 rm -f ${temp}.c 486 rm -f "${temp}".c
403 [ "$ret" != "1" ] && return 0 487 [[ ${ret} != 1 ]] && return 0
404 return 1 488 return 1
405} 489}
406 490
407has_m32() { 491has_m32() {
408 # this doesnt test if the flag is accepted, it tests if the flag 492 # this doesnt test if the flag is accepted, it tests if the flag
410 # please dont replace this function with test_flag in some future 494 # please dont replace this function with test_flag in some future
411 # clean-up! 495 # clean-up!
412 496
413 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0 497 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
414 498
415 local temp="$(emktemp)" 499 local temp=$(emktemp)
416 echo "int main() { return(0); }" > ${temp}.c 500 echo "int main() { return(0); }" > "${temp}".c
417 MY_CC=$(tc-getCC) 501 MY_CC=$(tc-getCC)
418 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 502 ${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
419 local ret=$? 503 local ret=$?
420 rm -f ${temp}.c 504 rm -f "${temp}".c
421 [ "$ret" != "1" ] && return 0 505 [[ ${ret} != 1 ]] && return 0
422 return 1 506 return 1
423} 507}
424 508
425replace-sparc64-flags() { 509replace-sparc64-flags() {
426 local SPARC64_CPUS="ultrasparc v9" 510 local SPARC64_CPUS="ultrasparc3 ultrasparc v9"
427 511
428 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 512 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
429 for x in ${SPARC64_CPUS}; do 513 for x in ${SPARC64_CPUS}; do
430 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 514 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
431 done 515 done
432 else 516 else
433 for x in ${SPARC64_CPUS}; do 517 for x in ${SPARC64_CPUS}; do
434 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 518 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
435 done 519 done
436 fi 520 fi
437 521
438 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then 522 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
439 for x in ${SPARC64_CPUS}; do 523 for x in ${SPARC64_CPUS}; do
440 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 524 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
441 done 525 done
442 else 526 else
443 for x in ${SPARC64_CPUS}; do 527 for x in ${SPARC64_CPUS}; do
444 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 528 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
445 done 529 done
446 fi 530 fi
447 531
448 export CFLAGS CXXFLAGS 532 export CFLAGS CXXFLAGS
449} 533}
450 534
451append-ldflags() { 535append-ldflags() {
536 [[ -z $* ]] && return 0
452 export LDFLAGS="${LDFLAGS} $*" 537 export LDFLAGS="${LDFLAGS} $*"
453 return 0 538 return 0
454} 539}
455 540
541# Remove flags from LDFLAGS - it's up to the ebuild to filter
542# CFLAGS and CXXFLAGS via filter-flags if they need to.
456filter-ldflags() { 543filter-ldflags() {
457 local x 544 _filter-var LDFLAGS "$@"
545 return 0
546}
458 547
459 # we do this fancy spacing stuff so as to not filter 548# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
460 # out part of a flag ... we want flag atoms ! :D 549# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
461 LDFLAGS=" ${LDFLAGS} " 550# to gcc where it needs the '-Wl,'.
551raw-ldflags() {
552 local x input="$@"
553 [[ -z ${input} ]] && input=${LDFLAGS}
554 set --
462 for x in "$@" ; do 555 for x in ${input} ; do
463 LDFLAGS=${LDFLAGS// ${x} / } 556 x=${x#-Wl,}
557 set -- "$@" ${x//,/ }
464 done 558 done
465 [[ -z ${LDFLAGS// } ]] \ 559 echo "$@"
466 && LDFLAGS="" \
467 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
468 export LDFLAGS
469 return 0
470} 560}
471 561
472fstack-flags() { 562# Gets the flags needed for "NOW" binding
473 if gcc-specs-ssp; then 563bindnow-flags() {
474 [ -z "`is-flag -fno-stack-protector`" ] && 564 case $($(tc-getLD) -v 2>&1 </dev/null) in
475 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 565 *GNU* | *'with BFD'*) # GNU ld
476 fi 566 echo "-Wl,-z,now" ;;
477 return 0 567 *Apple*) # Darwin ld
568 echo "-bind_at_load" ;;
569 *)
570 # Some linkers just recognize -V instead of -v
571 case $($(tc-getLD) -V 2>&1 </dev/null) in
572 *Solaris*) # Solaris accept almost the same GNU options
573 echo "-Wl,-z,now" ;;
574 esac
575 ;;
576 esac
478} 577}
479 578
480# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
481# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
482# fixes.
483#
484# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
485gcc2-flags() {
486 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
487 CFLAGS=${CFLAGS//-mtune=/-mcpu=}
488 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
489 fi
490 579
491 replace-cpu-flags k6-{2,3} k6 580# Some tests for when we screw with things and want to make
492 replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686 581# sure we didn't break anything
493 582#TESTS() {
494 replace-cpu-flags pentium-mmx i586 583# CFLAGS="-a -b -c=1"
495 replace-cpu-flags pentium{2,3,4} i686 584# CXXFLAGS="-x -y -z=2"
496 585# LDFLAGS="-l -m -n=3"
497 replace-cpu-flags ev6{7,8} ev6 586#
498 587# die() { exit 1; }
499 export CFLAGS CXXFLAGS 588# (is-flag 1 2 3) && die
500} 589# (is-ldflag 1 2 3) && die
590#
591# is-flagq -l && die
592# is-ldflagq -a && die
593# is-flagq -a || die
594# is-flagq -x || die
595# is-ldflagq -n=* || die
596# is-ldflagq -n && die
597#
598# strip-unsupported-flags
599# [[ ${CFLAGS} == "-c=1" ]] || die
600# [[ ${CXXFLAGS} == "-y -z=2" ]] || die
601#
602# echo "All tests pass"
603#}
604#TESTS

Legend:
Removed from v.1.93  
changed lines
  Added in v.1.118

  ViewVC Help
Powered by ViewVC 1.1.20