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

  ViewVC Help
Powered by ViewVC 1.1.20