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

Legend:
Removed from v.1.67  
changed lines
  Added in v.1.114

  ViewVC Help
Powered by ViewVC 1.1.20