/[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.124 Revision 1.179
1# Copyright 1999-2008 Gentoo Foundation 1# Copyright 1999-2012 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.124 2008/07/03 05:30:54 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.179 2012/10/30 20:51:44 vapier Exp $
4 4
5# @ECLASS: flag-o-matic.eclass 5# @ECLASS: flag-o-matic.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# toolchain@gentoo.org 7# toolchain@gentoo.org
8# @BLURB: common functions to manipulate and query toolchain flags 8# @BLURB: common functions to manipulate and query toolchain flags
9# @DESCRIPTION: 9# @DESCRIPTION:
10# This eclass contains a suite of functions to help developers sanely 10# This eclass contains a suite of functions to help developers sanely
11# and safely manage toolchain flags in their builds. 11# and safely manage toolchain flags in their builds.
12 12
13if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then
14___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank"
15
13inherit eutils toolchain-funcs multilib 16inherit eutils toolchain-funcs multilib
14 17
15################ DEPRECATED functions ################ 18# Return all the flag variables that our high level funcs operate on.
16# The following are still present to avoid breaking existing 19all-flag-vars() {
17# code more than necessary; however they are deprecated. Please 20 echo {C,CPP,CXX,CCAS,F,FC,LD}FLAGS
18# use gcc-specs-* from toolchain-funcs.eclass instead, if you 21}
19# need to know which hardened techs are active in the compiler.
20# See bug #100974
21#
22# has_hardened
23# has_pie
24# has_pic
25# has_ssp_all
26# has_ssp
27 22
28
29# {C,CXX,F,FC}FLAGS that we allow in strip-flags 23# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
30# Note: shell globs and character lists are allowed 24# Note: shell globs and character lists are allowed
31setup-allowed-flags() { 25setup-allowed-flags() {
32 if [[ -z ${ALLOWED_FLAGS} ]] ; then
33 export ALLOWED_FLAGS="-pipe" 26 ALLOWED_FLAGS="-pipe"
34 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune" 27 ALLOWED_FLAGS+=" -O -O1 -O2 -Os -mcpu -march -mtune"
35 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all" 28 ALLOWED_FLAGS+=" -fstack-protector -fstack-protector-all"
36 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking" 29 ALLOWED_FLAGS+=" -fbounds-checking -fno-strict-overflow"
37 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-PIE -fno-pie -fno-unit-at-a-time" 30 ALLOWED_FLAGS+=" -fno-PIE -fno-pie -fno-unit-at-a-time"
38 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+" 31 ALLOWED_FLAGS+=" -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+"
39 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-ident" 32 ALLOWED_FLAGS+=" -fno-ident -fpermissive"
40 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -W* -w" 33 ALLOWED_FLAGS+=" -W* -w"
41 fi 34
42 # allow a bunch of flags that negate features / control ABI 35 # allow a bunch of flags that negate features / control ABI
43 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all \ 36 ALLOWED_FLAGS+=" -fno-stack-protector -fno-stack-protector-all \
44 -fno-strict-aliasing -fno-bounds-checking" 37 -fno-strict-aliasing -fno-bounds-checking -fstrict-overflow \
38 -fno-omit-frame-pointer"
45 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \ 39 ALLOWED_FLAGS+=" -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse \
46 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \ 40 -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 \
41 -mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow -mno-popcnt \
47 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \ 42 -mno-abm -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -mplt \
48 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \ 43 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
49 -mieee -mieee-with-inexact -mschedule \ 44 -mieee -mieee-with-inexact -mschedule -mfloat-gprs -mspe -mno-spe \
50 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \ 45 -mtls-direct-seg-refs -mno-tls-direct-seg-refs -mflat -mno-flat \
51 -mflat -mno-flat -mno-faster-structs -mfaster-structs \ 46 -mno-faster-structs -mfaster-structs -m32 -m64 -mx32 -mabi \
52 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \ 47 -mlittle-endian -mbig-endian -EL -EB -fPIC -mlive-g0 -mcmodel \
53 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias \ 48 -mstack-bias -mno-stack-bias -msecure-plt -m*-toc -mfloat-abi=* \
54 -msecure-plt -D*" 49 -D* -U*"
55 50
56 # {C,CXX,F,FC}FLAGS that we are think is ok, but needs testing 51 # 4.5
57 # NOTE: currently -Os have issues with gcc3 and K6* arch's 52 ALLOWED_FLAGS+=" -mno-fma4 -mno-movbe -mno-xop -mno-lwp"
58 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks" 53 # 4.6
54 ALLOWED_FLAGS+=" -mno-fsgsbase -mno-rdrnd -mno-f16c -mno-bmi -mno-tbm"
55 # 4.7
56 ALLOWED_FLAGS+=" -mno-avx2 -mno-bmi2 -mno-fma -mno-lzcnt"
57
58 # CPPFLAGS and LDFLAGS
59 ALLOWED_FLAGS+=" -I* -L* -R* -Wl,*"
60
61 export ALLOWED_FLAGS
59 return 0 62 return 0
60} 63}
61 64
62# inverted filters for hardened compiler. This is trying to unpick 65# inverted filters for hardened compiler. This is trying to unpick
63# the hardened compiler defaults. 66# the hardened compiler defaults.
… …
71 -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie) 74 -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie)
72 gcc-specs-pie || continue 75 gcc-specs-pie || continue
73 is-flagq -nopie || append-flags -nopie;; 76 is-flagq -nopie || append-flags -nopie;;
74 -fstack-protector) 77 -fstack-protector)
75 gcc-specs-ssp || continue 78 gcc-specs-ssp || continue
76 is-flagq -fno-stack-protector || append-flags -fno-stack-protector;; 79 is-flagq -fno-stack-protector || append-flags $(test-flags -fno-stack-protector);;
77 -fstack-protector-all) 80 -fstack-protector-all)
78 gcc-specs-ssp-to-all || continue 81 gcc-specs-ssp-to-all || continue
79 is-flagq -fno-stack-protector-all || append-flags -fno-stack-protector-all;; 82 is-flagq -fno-stack-protector-all || append-flags $(test-flags -fno-stack-protector-all);;
83 -fno-strict-overflow)
84 gcc-specs-nostrict || continue
85 is-flagq -fstrict-overflow || append-flags $(test-flags -fstrict-overflow);;
80 esac 86 esac
81 done 87 done
82} 88}
83 89
84# Remove occurrences of strings from variable given in $1 90# Remove occurrences of strings from variable given in $1
85# Strings removed are matched as globs, so for example 91# Strings removed are matched as globs, so for example
86# '-O*' would remove -O1, -O2 etc. 92# '-O*' would remove -O1, -O2 etc.
87_filter-var() { 93_filter-var() {
88 local f x VAR VAL 94 local f x var=$1 new=()
89 declare -a new
90
91 VAR=$1
92 shift 95 shift
93 eval VAL=\${${VAR}} 96
94 for f in ${VAL}; do 97 for f in ${!var} ; do
95 for x in "$@"; do 98 for x in "$@" ; do
96 # Note this should work with globs like -O* 99 # Note this should work with globs like -O*
97 [[ ${f} == ${x} ]] && continue 2 100 [[ ${f} == ${x} ]] && continue 2
98 done 101 done
99 eval new\[\${\#new\[@]}]=\${f} 102 new+=( "${f}" )
100 done 103 done
101 eval export ${VAR}=\${new\[*]} 104 eval export ${var}=\""${new[*]}"\"
102} 105}
103 106
104# @FUNCTION: filter-flags 107# @FUNCTION: filter-flags
105# @USAGE: <flags> 108# @USAGE: <flags>
106# @DESCRIPTION: 109# @DESCRIPTION:
107# Remove particular <flags> from {C,CPP,CXX,F,FC}FLAGS. Accepts shell globs. 110# Remove particular <flags> from {C,CPP,CXX,CCAS,F,FC,LD}FLAGS. Accepts shell globs.
108filter-flags() { 111filter-flags() {
109 _filter-hardened "$@" 112 _filter-hardened "$@"
113 local v
114 for v in $(all-flag-vars) ; do
110 _filter-var CFLAGS "$@" 115 _filter-var ${v} "$@"
111 _filter-var CPPFLAGS "$@" 116 done
112 _filter-var CXXFLAGS "$@"
113 _filter-var FFLAGS "$@"
114 _filter-var FCFLAGS "$@"
115 return 0 117 return 0
116} 118}
117 119
118# @FUNCTION: filter-lfs-flags 120# @FUNCTION: filter-lfs-flags
119# @DESCRIPTION: 121# @DESCRIPTION:
120# Remove flags that enable Large File Support. 122# Remove flags that enable Large File Support.
121filter-lfs-flags() { 123filter-lfs-flags() {
122 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments" 124 [[ $# -ne 0 ]] && die "filter-lfs-flags takes no arguments"
125 # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
126 # _LARGEFILE_SOURCE: enable support for new LFS funcs (ftello/etc...)
127 # _LARGEFILE64_SOURCE: enable support for 64bit variants (off64_t/fseeko64/etc...)
128 # _FILE_OFFSET_BITS: default to 64bit variants (off_t is defined as off64_t)
123 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 129 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
130}
131
132# @FUNCTION: filter-ldflags
133# @USAGE: <flags>
134# @DESCRIPTION:
135# Remove particular <flags> from LDFLAGS. Accepts shell globs.
136filter-ldflags() {
137 _filter-var LDFLAGS "$@"
138 return 0
124} 139}
125 140
126# @FUNCTION: append-cppflags 141# @FUNCTION: append-cppflags
127# @USAGE: <flags> 142# @USAGE: <flags>
128# @DESCRIPTION: 143# @DESCRIPTION:
129# Add extra <flags> to the current CPPFLAGS. 144# Add extra <flags> to the current CPPFLAGS.
130append-cppflags() { 145append-cppflags() {
131 [[ -z $* ]] && return 0 146 [[ $# -eq 0 ]] && return 0
132 export CPPFLAGS="${CPPFLAGS} $*" 147 export CPPFLAGS="${CPPFLAGS} $*"
148 return 0
149}
150
151# @FUNCTION: append-cflags
152# @USAGE: <flags>
153# @DESCRIPTION:
154# Add extra <flags> to the current CFLAGS.
155append-cflags() {
156 [[ $# -eq 0 ]] && return 0
157 export CFLAGS=$(test-flags-CC ${CFLAGS} "$@")
158 return 0
159}
160
161# @FUNCTION: append-cxxflags
162# @USAGE: <flags>
163# @DESCRIPTION:
164# Add extra <flags> to the current CXXFLAGS.
165append-cxxflags() {
166 [[ $# -eq 0 ]] && return 0
167 export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS} "$@")
133 return 0 168 return 0
134} 169}
135 170
136# @FUNCTION: append-fflags 171# @FUNCTION: append-fflags
137# @USAGE: <flags> 172# @USAGE: <flags>
138# @DESCRIPTION: 173# @DESCRIPTION:
139# Add extra <flags> to the current {F,FC}FLAGS. 174# Add extra <flags> to the current {F,FC}FLAGS.
140append-fflags() { 175append-fflags() {
141 [[ -z $* ]] && return 0 176 [[ $# -eq 0 ]] && return 0
142 export FFLAGS="${FFLAGS} $*" 177 export FFLAGS=$(test-flags-F77 ${FFLAGS} "$@")
143 export FCFLAGS="${FCFLAGS} $*" 178 export FCFLAGS=$(test-flags-FC ${FCFLAGS} "$@")
144 return 0 179 return 0
145} 180}
146 181
147# @FUNCTION: append-lfs-flags 182# @FUNCTION: append-lfs-flags
148# @DESCRIPTION: 183# @DESCRIPTION:
149# Add flags that enable Large File Support. 184# Add flags that enable Large File Support.
150append-lfs-flags() { 185append-lfs-flags() {
151 [[ -n $@ ]] && die "append-lfs-flags takes no arguments" 186 [[ $# -ne 0 ]] && die "append-lfs-flags takes no arguments"
187 # see comments in filter-lfs-flags func for meaning of these
152 append-cppflags -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
189}
190
191# @FUNCTION: append-ldflags
192# @USAGE: <flags>
193# @DESCRIPTION:
194# Add extra <flags> to the current LDFLAGS.
195append-ldflags() {
196 [[ $# -eq 0 ]] && return 0
197 local flag
198 for flag in "$@"; do
199 [[ ${flag} == -l* ]] && \
200 eqawarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
201 done
202
203 export LDFLAGS="${LDFLAGS} $*"
204 return 0
153} 205}
154 206
155# @FUNCTION: append-flags 207# @FUNCTION: append-flags
156# @USAGE: <flags> 208# @USAGE: <flags>
157# @DESCRIPTION: 209# @DESCRIPTION:
158# Add extra <flags> to your current {C,CXX,F,FC}FLAGS. 210# Add extra <flags> to your current {C,CXX,F,FC}FLAGS.
159append-flags() { 211append-flags() {
160 [[ -z $* ]] && return 0 212 [[ $# -eq 0 ]] && return 0
161 export CFLAGS="${CFLAGS} $*" 213 case " $* " in
162 export CXXFLAGS="${CXXFLAGS} $*" 214 *' '-[DIU]*) eqawarn 'please use append-cppflags for preprocessor flags' ;;
163 export FFLAGS="${FFLAGS} $*" 215 *' '-L*|\
164 export FCFLAGS="${FCFLAGS} $*" 216 *' '-Wl,*) eqawarn 'please use append-ldflags for linker flags' ;;
217 esac
218 append-cflags "$@"
219 append-cxxflags "$@"
220 append-fflags "$@"
165 return 0 221 return 0
166} 222}
167 223
168# @FUNCTION: replace-flags 224# @FUNCTION: replace-flags
169# @USAGE: <old> <new> 225# @USAGE: <old> <new>
170# @DESCRIPTION: 226# @DESCRIPTION:
171# Replace the <old> flag with <new>. Accepts shell globs for <old>. 227# Replace the <old> flag with <new>. Accepts shell globs for <old>.
172replace-flags() { 228replace-flags() {
173 [[ $# != 2 ]] \
174 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \ 229 [[ $# != 2 ]] && die "Usage: replace-flags <old flag> <new flag>"
175 && die "replace-flags takes 2 arguments, not $#"
176 230
177 local f fset 231 local f var new
178 declare -a new_CFLAGS new_CXXFLAGS 232 for var in $(all-flag-vars) ; do
179
180 for fset in CFLAGS CXXFLAGS FFLAGS FCFLAGS; do
181 # Looping over the flags instead of using a global 233 # Looping over the flags instead of using a global
182 # substitution ensures that we're working with flag atoms. 234 # substitution ensures that we're working with flag atoms.
183 # Otherwise globs like -O* have the potential to wipe out the 235 # Otherwise globs like -O* have the potential to wipe out the
184 # list of flags. 236 # list of flags.
237 new=()
185 for f in ${!fset}; do 238 for f in ${!var} ; do
186 # Note this should work with globs like -O* 239 # Note this should work with globs like -O*
187 [[ ${f} == ${1} ]] && f=${2} 240 [[ ${f} == ${1} ]] && f=${2}
188 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f} 241 new+=( "${f}" )
189 done 242 done
190 eval export ${fset}=\${new_${fset}\[*]} 243 eval export ${var}=\""${new[*]}"\"
191 done 244 done
192 245
193 return 0 246 return 0
194} 247}
195 248
… …
210 done 263 done
211 return 0 264 return 0
212} 265}
213 266
214_is_flagq() { 267_is_flagq() {
215 local x 268 local x var
269 eval var=\""\${$1[*]}"\"
216 for x in ${!1} ; do 270 for x in ${var} ; do
217 [[ ${x} == $2 ]] && return 0 271 [[ ${x} == $2 ]] && return 0
218 done 272 done
219 return 1 273 return 1
220} 274}
221 275
… …
223# @USAGE: <flag> 277# @USAGE: <flag>
224# @DESCRIPTION: 278# @DESCRIPTION:
225# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs. 279# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs.
226is-flagq() { 280is-flagq() {
227 [[ -n $2 ]] && die "Usage: is-flag <flag>" 281 [[ -n $2 ]] && die "Usage: is-flag <flag>"
228 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1 || _is_flagq FFLAGS $1 || _is_flagq FCFLAGS $1 282
283 local var
284 for var in $(all-flag-vars) ; do
285 _is_flagq ${var} "$1" && return 0
286 done
287 return 1
229} 288}
230 289
231# @FUNCTION: is-flag 290# @FUNCTION: is-flag
232# @USAGE: <flag> 291# @USAGE: <flag>
233# @DESCRIPTION: 292# @DESCRIPTION:
… …
287 return 0 346 return 0
288} 347}
289 348
290# @FUNCTION: strip-flags 349# @FUNCTION: strip-flags
291# @DESCRIPTION: 350# @DESCRIPTION:
292# Strip C[XX]FLAGS of everything except known good/safe flags. 351# Strip *FLAGS of everything except known good/safe flags. This runs over all
352# flags returned by all_flag_vars().
293strip-flags() { 353strip-flags() {
294 local x y flag NEW_CFLAGS NEW_CXXFLAGS NEW_FFLAGS NEW_FCFLAGS 354 local x y var
295 355
296 setup-allowed-flags 356 setup-allowed-flags
297 357
298 local NEW_CFLAGS=""
299 local NEW_CXXFLAGS=""
300 local NEW_FFLAGS=""
301 local NEW_FCFLAGS=""
302
303 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
304 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
305 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
306 fi
307
308 set -f # disable pathname expansion 358 set -f # disable pathname expansion
309 359
310 for x in ${CFLAGS}; do 360 for var in $(all-flag-vars) ; do
361 local new=()
362
363 for x in ${!var} ; do
364 local flag=${x%%=*}
311 for y in ${ALLOWED_FLAGS}; do 365 for y in ${ALLOWED_FLAGS} ; do
312 flag=${x%%=*}
313 if [ "${flag%%${y}}" = "" ] ; then 366 if [[ -z ${flag%%${y}} ]] ; then
314 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 367 new+=( "${x}" )
315 break 368 break
316 fi 369 fi
317 done 370 done
318 done 371 done
319 372
320 for x in ${CXXFLAGS}; do
321 for y in ${ALLOWED_FLAGS}; do
322 flag=${x%%=*}
323 if [ "${flag%%${y}}" = "" ] ; then
324 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
325 break
326 fi
327 done
328 done
329
330 for x in ${FFLAGS}; do
331 for y in ${ALLOWED_FLAGS}; do
332 flag=${x%%=*}
333 if [ "${flag%%${y}}" = "" ] ; then
334 NEW_FFLAGS="${NEW_FFLAGS} ${x}"
335 break
336 fi
337 done
338 done
339
340 for x in ${FCFLAGS}; do
341 for y in ${ALLOWED_FLAGS}; do
342 flag=${x%%=*}
343 if [ "${flag%%${y}}" = "" ] ; then
344 NEW_FCFLAGS="${NEW_FCFLAGS} ${x}"
345 break
346 fi
347 done
348 done
349
350 # In case we filtered out all optimization flags fallback to -O2 373 # In case we filtered out all optimization flags fallback to -O2
351 if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then 374 if _is_flagq ${var} "-O*" && ! _is_flagq new "-O*" ; then
352 NEW_CFLAGS="${NEW_CFLAGS} -O2" 375 new+=( -O2 )
353 fi 376 fi
354 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 377
355 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 378 eval export ${var}=\""${new[*]}"\"
356 fi 379 done
357 if [ "${FFLAGS/-O}" != "${FFLAGS}" -a "${NEW_FFLAGS/-O}" = "${NEW_FFLAGS}" ]; then
358 NEW_FFLAGS="${NEW_FFLAGS} -O2"
359 fi
360 if [ "${FCFLAGS/-O}" != "${FCFLAGS}" -a "${NEW_FCFLAGS/-O}" = "${NEW_FCFLAGS}" ]; then
361 NEW_FCFLAGS="${NEW_FCFLAGS} -O2"
362 fi
363 380
364 set +f # re-enable pathname expansion 381 set +f # re-enable pathname expansion
365 382
366 export CFLAGS="${NEW_CFLAGS}"
367 export CXXFLAGS="${NEW_CXXFLAGS}"
368 export FFLAGS="${NEW_FFLAGS}"
369 export FCFLAGS="${NEW_FCFLAGS}"
370 return 0 383 return 0
371} 384}
372 385
373test-flag-PROG() { 386test-flag-PROG() {
374 local comp=$1 387 local comp=$1
375 local flags="$2" 388 local flag=$2
376 389
377 [[ -z ${comp} || -z ${flags} ]] && \ 390 [[ -z ${comp} || -z ${flag} ]] && return 1
378 return 1
379 391
392 # use -c so we can test the assembler as well
380 local PROG=$(tc-get${comp}) 393 local PROG=$(tc-get${comp})
381 ${PROG} ${flags} -S -o /dev/null -xc /dev/null \ 394 ${PROG} "${flag}" -c -o /dev/null -xc /dev/null \
382 > /dev/null 2>&1 395 > /dev/null 2>&1
383} 396}
384 397
385# @FUNCTION: test-flag-CC 398# @FUNCTION: test-flag-CC
386# @USAGE: <flag> 399# @USAGE: <flag>
… …
413 426
414 shift 427 shift
415 428
416 [[ -z ${comp} ]] && return 1 429 [[ -z ${comp} ]] && return 1
417 430
418 x=""
419 for x in "$@" ; do 431 for x in "$@" ; do
420 test-flag-${comp} "${x}" && flags="${flags}${flags:+ }${x}" 432 test-flag-${comp} "${x}" && flags="${flags}${flags:+ }${x}"
421 done 433 done
422 434
423 echo "${flags}" 435 echo "${flags}"
… …
454# @USAGE: <flags> 466# @USAGE: <flags>
455# @DESCRIPTION: 467# @DESCRIPTION:
456# Short-hand that should hopefully work for both C and C++ compiler, but 468# Short-hand that should hopefully work for both C and C++ compiler, but
457# its really only present due to the append-flags() abomination. 469# its really only present due to the append-flags() abomination.
458test-flags() { test-flags-CC "$@"; } 470test-flags() { test-flags-CC "$@"; }
459
460# @FUNCTION: test_flag
461# @DESCRIPTION:
462# DEPRICIATED, use test-flags()
463test_flag() {
464 ewarn "test_flag: deprecated, please use test-flags()!" >&2
465
466 test-flags-CC "$@"
467}
468 471
469# @FUNCTION: test_version_info 472# @FUNCTION: test_version_info
470# @USAGE: <version> 473# @USAGE: <version>
471# @DESCRIPTION: 474# @DESCRIPTION:
472# Returns shell true if the current C compiler version matches <version>, else returns shell false. 475# Returns shell true if the current C compiler version matches <version>, else returns shell false.
… …
492# @FUNCTION: get-flag 495# @FUNCTION: get-flag
493# @USAGE: <flag> 496# @USAGE: <flag>
494# @DESCRIPTION: 497# @DESCRIPTION:
495# Find and echo the value for a particular flag. Accepts shell globs. 498# Find and echo the value for a particular flag. Accepts shell globs.
496get-flag() { 499get-flag() {
497 local f findflag="$1" 500 local f var findflag="$1"
498 501
499 # this code looks a little flaky but seems to work for 502 # this code looks a little flaky but seems to work for
500 # everything we want ... 503 # everything we want ...
501 # for example, if CFLAGS="-march=i686": 504 # for example, if CFLAGS="-march=i686":
502 # `get-flag -march` == "-march=i686" 505 # `get-flag -march` == "-march=i686"
503 # `get-flag march` == "i686" 506 # `get-flag march` == "i686"
504 for f in ${CFLAGS} ${CXXFLAGS} ${FFLAGS} ${FCFLAGS} ; do 507 for var in $(all-flag-vars) ; do
508 for f in ${!var} ; do
505 if [ "${f/${findflag}}" != "${f}" ] ; then 509 if [ "${f/${findflag}}" != "${f}" ] ; then
506 printf "%s\n" "${f/-${findflag}=}" 510 printf "%s\n" "${f/-${findflag}=}"
507 return 0 511 return 0
508 fi 512 fi
513 done
509 done 514 done
510 return 1 515 return 1
511}
512
513# @FUNCTION: has_hardened
514# @DESCRIPTION:
515# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
516has_hardened() {
517 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
518
519 test_version_info Hardened && return 0
520 # The specs file wont exist unless gcc has GCC_SPECS support
521 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
522}
523
524# @FUNCTION: has_pic
525# @DESCRIPTION:
526# DEPRECATED - use gcc-specs-pie from toolchain-funcs
527# indicate whether PIC is set
528has_pic() {
529 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
530
531 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
532 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
533 gcc-specs-pie
534}
535
536# @FUNCTION: has_pie
537# @DESCRIPTION:
538# DEPRECATED - use gcc-specs-pie from toolchain-funcs
539# indicate whether PIE is set
540has_pie() {
541 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
542
543 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \
544 ${CFLAGS/-fpie} != ${CFLAGS} ]] || \
545 gcc-specs-pie
546}
547
548# @FUNCTION: has_ssp_all
549# @DESCRIPTION:
550# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
551# indicate whether code for SSP is being generated for all functions
552has_ssp_all() {
553 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2
554
555 # note; this matches only -fstack-protector-all
556 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \
557 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
558 gcc-specs-ssp-all
559}
560
561# @FUNCTION: has_ssp
562# @DESCRIPTION:
563# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
564# indicate whether code for SSP is being generated
565has_ssp() {
566 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
567
568 # note; this matches both -fstack-protector and -fstack-protector-all
569 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
570 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
571 gcc-specs-ssp
572} 516}
573 517
574# @FUNCTION: has_m64 518# @FUNCTION: has_m64
575# @DESCRIPTION: 519# @DESCRIPTION:
576# This doesn't test if the flag is accepted, it tests if the flag actually 520# This doesn't test if the flag is accepted, it tests if the flag actually
577# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works 521# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works
578# return code is 0, else the return code is 1. 522# return code is 0, else the return code is 1.
579has_m64() { 523has_m64() {
524 eqawarn "${FUNCNAME}: don't use this anymore"
525
580 # this doesnt test if the flag is accepted, it tests if the flag 526 # this doesnt test if the flag is accepted, it tests if the flag
581 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 527 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
582 # please dont replace this function with test_flag in some future 528 # please dont replace this function with test_flag in some future
583 # clean-up! 529 # clean-up!
584 530
… …
590 rm -f "${temp}".c 536 rm -f "${temp}".c
591 [[ ${ret} != 1 ]] && return 0 537 [[ ${ret} != 1 ]] && return 0
592 return 1 538 return 1
593} 539}
594 540
595# @FUNCTION: has_m32
596# @DESCRIPTION:
597# This doesn't test if the flag is accepted, it tests if the flag actually
598# WORKS. Non-mulilib gcc will take both -m32 and -64. If the flag works return
599# code is 0, else return code is 1.
600has_m32() { 541has_m32() {
601 # this doesnt test if the flag is accepted, it tests if the flag 542 die "${FUNCNAME}: don't use this anymore"
602 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
603 # please dont replace this function with test_flag in some future
604 # clean-up!
605
606 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
607
608 local temp=$(emktemp)
609 echo "int main() { return(0); }" > "${temp}".c
610 MY_CC=$(tc-getCC)
611 ${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
612 local ret=$?
613 rm -f "${temp}".c
614 [[ ${ret} != 1 ]] && return 0
615 return 1
616} 543}
617 544
618# @FUNCTION: replace-sparc64-flags 545# @FUNCTION: replace-sparc64-flags
619# @DESCRIPTION: 546# @DESCRIPTION:
620# Sets mcpu to v8 and uses the original value as mtune if none specified. 547# Sets mcpu to v8 and uses the original value as mtune if none specified.
… …
642 fi 569 fi
643 570
644 export CFLAGS CXXFLAGS 571 export CFLAGS CXXFLAGS
645} 572}
646 573
647# @FUNCTION: append-ldflags 574# @FUNCTION: append-libs
648# @USAGE: <flags> 575# @USAGE: <libs>
649# @DESCRIPTION: 576# @DESCRIPTION:
650# Add extra <flags> to the current LDFLAGS. 577# Add extra <libs> to the current LIBS.
651append-ldflags() { 578append-libs() {
652 [[ -z $* ]] && return 0 579 [[ $# -eq 0 ]] && return 0
653 local flag 580 local flag
654 for flag in "$@"; do 581 for flag in "$@"; do
655 [[ ${flag} == -l* ]] && \ 582 [[ ${flag} == -l* ]] && flag=${flag#-l}
656 ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS" 583 export LIBS="${LIBS} -l${flag}"
657 done 584 done
658 585
659 export LDFLAGS="${LDFLAGS} $*"
660 return 0
661}
662
663# @FUNCTION: filter-ldflags
664# @USAGE: <flags>
665# @DESCRIPTION:
666# Remove particular <flags> from LDFLAGS. Accepts shell globs.
667filter-ldflags() {
668 _filter-var LDFLAGS "$@"
669 return 0 586 return 0
670} 587}
671 588
672# @FUNCTION: raw-ldflags 589# @FUNCTION: raw-ldflags
673# @USAGE: <flags> 590# @USAGE: [flags]
674# @DESCRIPTION: 591# @DESCRIPTION:
675# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results 592# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
676# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed 593# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
677# to gcc where it needs the '-Wl,'. 594# to gcc where it needs the '-Wl,'.
595#
596# If no flags are specified, then default to ${LDFLAGS}.
678raw-ldflags() { 597raw-ldflags() {
679 local x input="$@" 598 local x input="$@"
680 [[ -z ${input} ]] && input=${LDFLAGS} 599 [[ -z ${input} ]] && input=${LDFLAGS}
681 set -- 600 set --
682 for x in ${input} ; do 601 for x in ${input} ; do
… …
684 set -- "$@" ${x//,/ } 603 set -- "$@" ${x//,/ }
685 done 604 done
686 echo "$@" 605 echo "$@"
687} 606}
688 607
689# @FUNCTION: bindnow-flags 608# @FUNCTION: no-as-needed
690# @RETURN: Returns the flags to enable "now" binding in the current selected linker. 609# @RETURN: Flag to disable asneeded behavior for use with append-ldflags.
691# @DESCRIPTION: 610no-as-needed() {
692# DEPRECATED - Gets the flags needed for "NOW" binding
693bindnow-flags() {
694 ewarn "QA: stop using the bindnow-flags function ... simply drop it from your ebuild" >&2
695
696 case $($(tc-getLD) -v 2>&1 </dev/null) in 611 case $($(tc-getLD) -v 2>&1 </dev/null) in
697 *GNU* | *'with BFD'*) # GNU ld 612 *GNU*) # GNU ld
698 echo "-Wl,-z,now" ;; 613 echo "-Wl,--no-as-needed" ;;
699 *Apple*) # Darwin ld
700 echo "-bind_at_load" ;;
701 *)
702 # Some linkers just recognize -V instead of -v
703 case $($(tc-getLD) -V 2>&1 </dev/null) in
704 *Solaris*) # Solaris accept almost the same GNU options
705 echo "-Wl,-z,now" ;;
706 esac
707 ;;
708 esac 614 esac
709} 615}
710 616
711 617fi
712# Some tests for when we screw with things and want to make
713# sure we didn't break anything
714#TESTS() {
715# CFLAGS="-a -b -c=1"
716# CXXFLAGS="-x -y -z=2"
717# LDFLAGS="-l -m -n=3"
718#
719# die() { exit 1; }
720# (is-flag 1 2 3) && die
721# (is-ldflag 1 2 3) && die
722#
723# is-flagq -l && die
724# is-ldflagq -a && die
725# is-flagq -a || die
726# is-flagq -x || die
727# is-ldflagq -n=* || die
728# is-ldflagq -n && die
729#
730# strip-unsupported-flags
731# [[ ${CFLAGS} == "-c=1" ]] || die
732# [[ ${CXXFLAGS} == "-y -z=2" ]] || die
733#
734# echo "All tests pass"
735#}
736#TESTS
Legend:
Removed from v.1.124  
changed lines
  Added in v.1.179
  ViewVC Help
Powered by ViewVC 1.1.20