/[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.101 Revision 1.129
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2009 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.101 2006/01/01 01:14:59 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.129 2009/01/04 17:22:16 vapier Exp $
4 4
5# @ECLASS: flag-o-matic.eclass
6# @MAINTAINER:
7# toolchain@gentoo.org
8# @BLURB: common functions to manipulate and query toolchain flags
9# @DESCRIPTION:
10# This eclass contains a suite of functions to help developers sanely
11# and safely manage toolchain flags in their builds.
5 12
6# need access to emktemp()
7inherit eutils toolchain-funcs multilib 13inherit eutils toolchain-funcs multilib
8 14
9#
10#### filter-flags <flags> ####
11# Remove particular flags from C[XX]FLAGS
12# Matches only complete flags
13#
14#### append-flags <flags> ####
15# Add extra flags to your current C[XX]FLAGS
16#
17#### replace-flags <orig.flag> <new.flag> ###
18# Replace a flag by another one
19#
20#### replace-cpu-flags <old.cpus> <new.cpu> ###
21# Replace march/mcpu flags that specify <old.cpus>
22# with flags that specify <new.cpu>
23#
24#### is-flag <flag> ####
25# Returns "true" if flag is set in C[XX]FLAGS
26# Matches only complete a flag
27#
28#### strip-flags ####
29# Strip C[XX]FLAGS of everything except known
30# good options.
31#
32#### strip-unsupported-flags ####
33# Strip C[XX]FLAGS of any flags not supported by
34# installed version of gcc
35#
36#### get-flag <flag> ####
37# Find and echo the value for a particular flag
38#
39#### replace-sparc64-flags ####
40# Sets mcpu to v8 and uses the original value
41# as mtune if none specified.
42#
43#### filter-mfpmath <math types> ####
44# Remove specified math types from the fpmath specification
45# If the user has -mfpmath=sse,386, running `filter-mfpmath sse`
46# will leave the user with -mfpmath=386
47#
48#### append-ldflags ####
49# Add extra flags to your current LDFLAGS
50#
51#### filter-ldflags <flags> ####
52# Remove particular flags from LDFLAGS
53# Matches only complete flags
54#
55#### fstack-flags ####
56# hooked function for hardened gcc that appends
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#### bindnow-flags ####
63# Returns the flags to enable "now" binding in the current selected linker.
64#
65################ DEPRECATED functions ################ 15################ DEPRECATED functions ################
66# The following are still present to avoid breaking existing 16# The following are still present to avoid breaking existing
67# code more than necessary; however they are deprecated. Please 17# code more than necessary; however they are deprecated. Please
68# use gcc-specs-* from toolchain-funcs.eclass instead, if you 18# use gcc-specs-* from toolchain-funcs.eclass instead, if you
69# need to know which hardened techs are active in the compiler. 19# need to know which hardened techs are active in the compiler.
70# See bug #100974 20# See bug #100974
71# 21#
72#### has_hardened #### 22# has_hardened
73# Returns true if the compiler has 'Hardened' in its version string, 23# has_pie
74# (note; switched-spec vanilla compilers satisfy this condition) or 24# has_pic
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 #### 25# has_ssp_all
86# Returns true if the compiler by default or with current CFLAGS 26# has_ssp
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
92#
93 27
28
94# C[XX]FLAGS that we allow in strip-flags 29# {C,CXX,F,FC}FLAGS that we allow in strip-flags
30# Note: shell globs and character lists are allowed
95setup-allowed-flags() { 31setup-allowed-flags() {
96 if [[ -z ${ALLOWED_FLAGS} ]] ; then 32 if [[ -z ${ALLOWED_FLAGS} ]] ; then
97 export ALLOWED_FLAGS="-pipe" 33 export ALLOWED_FLAGS="-pipe"
98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune" 34 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all" 35 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking" 36 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-strict-overflow"
101 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time" 37 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-PIE -fno-pie -fno-unit-at-a-time"
102 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3" 38 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+"
39 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-ident"
40 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -W* -w"
103 fi 41 fi
104 # allow a bunch of flags that negate features / control ABI 42 # allow a bunch of flags that negate features / control ABI
105 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 43 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all \
44 -fno-strict-aliasing -fno-bounds-checking -fstrict-overflow"
106 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \ 45 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
107 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \ 46 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
108 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \ 47 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
109 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \ 48 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
110 -mieee -mieee-with-inexact \ 49 -mieee -mieee-with-inexact -mschedule \
111 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \ 50 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \
112 -mflat -mno-flat -mno-faster-structs -mfaster-structs \ 51 -mflat -mno-flat -mno-faster-structs -mfaster-structs \
113 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \ 52 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
114 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias" 53 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias \
54 -msecure-plt -m*-toc -D* -U*"
115 55
116 # C[XX]FLAGS that we are think is ok, but needs testing 56 # {C,CXX,F,FC}FLAGS that we are think is ok, but needs testing
117 # NOTE: currently -Os have issues with gcc3 and K6* arch's 57 # NOTE: currently -Os have issues with gcc3 and K6* arch's
118 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 58 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
119 return 0 59 return 0
120} 60}
121 61
62# inverted filters for hardened compiler. This is trying to unpick
63# the hardened compiler defaults.
64_filter-hardened() {
65 local f
66 for f in "$@" ; do
67 case "${f}" in
68 # Ideally we should only concern ourselves with PIE flags,
69 # not -fPIC or -fpic, but too many places filter -fPIC without
70 # thinking about -fPIE.
71 -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie)
72 gcc-specs-pie || continue
73 is-flagq -nopie || append-flags -nopie;;
74 -fstack-protector)
75 gcc-specs-ssp || continue
76 is-flagq -fno-stack-protector || append-flags -fno-stack-protector;;
77 -fstack-protector-all)
78 gcc-specs-ssp-to-all || continue
79 is-flagq -fno-stack-protector-all || append-flags -fno-stack-protector-all;;
80 -fno-strict-overflow)
81 gcc-specs-nostrict || continue
82 is-flagq -fstrict-overflow || append-flags -fstrict-overflow;;
83 esac
84 done
85}
86
87# Remove occurrences of strings from variable given in $1
88# Strings removed are matched as globs, so for example
89# '-O*' would remove -O1, -O2 etc.
90_filter-var() {
91 local f x VAR VAL
92 declare -a new
93
94 VAR=$1
95 shift
96 eval VAL=\${${VAR}}
97 for f in ${VAL}; do
98 for x in "$@"; do
99 # Note this should work with globs like -O*
100 [[ ${f} == ${x} ]] && continue 2
101 done
102 eval new\[\${\#new\[@]}]=\${f}
103 done
104 eval export ${VAR}=\${new\[*]}
105}
106
107# @FUNCTION: filter-flags
108# @USAGE: <flags>
109# @DESCRIPTION:
110# Remove particular <flags> from {C,CPP,CXX,F,FC}FLAGS. Accepts shell globs.
122filter-flags() { 111filter-flags() {
123 local x f fset 112 _filter-hardened "$@"
124 declare -a new_CFLAGS new_CXXFLAGS 113 _filter-var CFLAGS "$@"
125 114 _filter-var CPPFLAGS "$@"
126 for x in "$@" ; do 115 _filter-var CXXFLAGS "$@"
127 case "${x}" in 116 _filter-var FFLAGS "$@"
128 -fPIC|-fpic|-fPIE|-fpie|-pie) 117 _filter-var FCFLAGS "$@"
129 append-flags `test_flag -fno-pie`;;
130 -fstack-protector|-fstack-protector-all)
131 fstack-flags;;
132 esac
133 done
134
135 for fset in CFLAGS CXXFLAGS; do
136 # Looping over the flags instead of using a global
137 # substitution ensures that we're working with flag atoms.
138 # Otherwise globs like -O* have the potential to wipe out the
139 # list of flags.
140 for f in ${!fset}; do
141 for x in "$@"; do
142 # Note this should work with globs like -O*
143 [[ ${f} == ${x} ]] && continue 2
144 done
145 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
146 done
147 eval export ${fset}=\${new_${fset}\[*]}
148 done
149
150 return 0 118 return 0
151} 119}
152 120
121# @FUNCTION: filter-lfs-flags
122# @DESCRIPTION:
123# Remove flags that enable Large File Support.
153filter-lfs-flags() { 124filter-lfs-flags() {
154 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments" 125 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
155 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 126 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
156} 127}
157 128
129# @FUNCTION: append-cppflags
130# @USAGE: <flags>
131# @DESCRIPTION:
132# Add extra <flags> to the current CPPFLAGS.
133append-cppflags() {
134 [[ -z $* ]] && return 0
135 export CPPFLAGS="${CPPFLAGS} $*"
136 return 0
137}
138
139# @FUNCTION: append-fflags
140# @USAGE: <flags>
141# @DESCRIPTION:
142# Add extra <flags> to the current {F,FC}FLAGS.
143append-fflags() {
144 [[ -z $* ]] && return 0
145 export FFLAGS="${FFLAGS} $*"
146 export FCFLAGS="${FCFLAGS} $*"
147 return 0
148}
149
150# @FUNCTION: append-lfs-flags
151# @DESCRIPTION:
152# Add flags that enable Large File Support.
158append-lfs-flags() { 153append-lfs-flags() {
159 [[ -n $@ ]] && die "append-lfs-flags takes no arguments" 154 [[ -n $@ ]] && die "append-lfs-flags takes no arguments"
160 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 155 append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
161} 156}
162 157
158# @FUNCTION: append-flags
159# @USAGE: <flags>
160# @DESCRIPTION:
161# Add extra <flags> to your current {C,CXX,F,FC}FLAGS.
163append-flags() { 162append-flags() {
164 [[ -z $* ]] && return 0 163 [[ -z $* ]] && return 0
165 export CFLAGS="${CFLAGS} $*" 164 export CFLAGS="${CFLAGS} $*"
166 export CXXFLAGS="${CXXFLAGS} $*" 165 export CXXFLAGS="${CXXFLAGS} $*"
167 [ -n "`is-flag -fno-stack-protector`" -o \ 166 export FFLAGS="${FFLAGS} $*"
168 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags 167 export FCFLAGS="${FCFLAGS} $*"
169 return 0 168 return 0
170} 169}
171 170
171# @FUNCTION: replace-flags
172# @USAGE: <old> <new>
173# @DESCRIPTION:
174# Replace the <old> flag with <new>. Accepts shell globs for <old>.
172replace-flags() { 175replace-flags() {
173 [[ $# != 2 ]] \ 176 [[ $# != 2 ]] \
174 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \ 177 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \
175 && die "replace-flags takes 2 arguments, not $#" 178 && die "replace-flags takes 2 arguments, not $#"
176 179
177 local f fset 180 local f fset
178 declare -a new_CFLAGS new_CXXFLAGS 181 declare -a new_CFLAGS new_CXXFLAGS new_FFLAGS new_FCFLAGS
179 182
180 for fset in CFLAGS CXXFLAGS; do 183 for fset in CFLAGS CXXFLAGS FFLAGS FCFLAGS; do
181 # Looping over the flags instead of using a global 184 # Looping over the flags instead of using a global
182 # substitution ensures that we're working with flag atoms. 185 # substitution ensures that we're working with flag atoms.
183 # Otherwise globs like -O* have the potential to wipe out the 186 # Otherwise globs like -O* have the potential to wipe out the
184 # list of flags. 187 # list of flags.
185 for f in ${!fset}; do 188 for f in ${!fset}; do
191 done 194 done
192 195
193 return 0 196 return 0
194} 197}
195 198
199# @FUNCTION: replace-cpu-flags
200# @USAGE: <old> <new>
201# @DESCRIPTION:
202# Replace cpu flags (like -march/-mcpu/-mtune) that select the <old> cpu
203# with flags that select the <new> cpu. Accepts shell globs for <old>.
196replace-cpu-flags() { 204replace-cpu-flags() {
197 local newcpu="$#" ; newcpu="${!newcpu}" 205 local newcpu="$#" ; newcpu="${!newcpu}"
198 while [ $# -gt 1 ] ; do 206 while [ $# -gt 1 ] ; do
199 # quote to make sure that no globbing is done (particularly on 207 # quote to make sure that no globbing is done (particularly on
200 # ${oldcpu} prior to calling replace-flags 208 # ${oldcpu}) prior to calling replace-flags
201 replace-flags "-march=${1}" "-march=${newcpu}" 209 replace-flags "-march=${1}" "-march=${newcpu}"
202 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}" 210 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
203 replace-flags "-mtune=${1}" "-mtune=${newcpu}" 211 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
204 shift 212 shift
205 done 213 done
206 return 0 214 return 0
207} 215}
208 216
217_is_flagq() {
218 local x
219 for x in ${!1} ; do
220 [[ ${x} == $2 ]] && return 0
221 done
222 return 1
223}
224
225# @FUNCTION: is-flagq
226# @USAGE: <flag>
227# @DESCRIPTION:
228# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs.
229is-flagq() {
230 [[ -n $2 ]] && die "Usage: is-flag <flag>"
231 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1 || _is_flagq FFLAGS $1 || _is_flagq FCFLAGS $1
232}
233
234# @FUNCTION: is-flag
235# @USAGE: <flag>
236# @DESCRIPTION:
237# Echo's "true" if flag is set in {C,CXX,F,FC}FLAGS. Accepts shell globs.
209is-flag() { 238is-flag() {
210 local x 239 is-flagq "$@" && echo true
211
212 for x in ${CFLAGS} ${CXXFLAGS} ; do
213 # Note this should work with globs like -mcpu=ultrasparc*
214 if [[ ${x} == ${1} ]]; then
215 echo true
216 return 0
217 fi
218 done
219 return 1
220} 240}
221 241
242# @FUNCTION: is-ldflagq
243# @USAGE: <flag>
244# @DESCRIPTION:
245# Returns shell true if <flag> is in LDFLAGS, else returns shell false. Accepts shell globs.
246is-ldflagq() {
247 [[ -n $2 ]] && die "Usage: is-ldflag <flag>"
248 _is_flagq LDFLAGS $1
249}
250
251# @FUNCTION: is-ldflag
252# @USAGE: <flag>
253# @DESCRIPTION:
254# Echo's "true" if flag is set in LDFLAGS. Accepts shell globs.
255is-ldflag() {
256 is-ldflagq "$@" && echo true
257}
258
259# @FUNCTION: filter-mfpmath
260# @USAGE: <math types>
261# @DESCRIPTION:
262# Remove specified math types from the fpmath flag. For example, if the user
263# has -mfpmath=sse,386, running `filter-mfpmath sse` will leave the user with
264# -mfpmath=386.
222filter-mfpmath() { 265filter-mfpmath() {
223 local orig_mfpmath new_math prune_math 266 local orig_mfpmath new_math prune_math
224 267
225 # save the original -mfpmath flag 268 # save the original -mfpmath flag
226 orig_mfpmath="`get-flag -mfpmath`" 269 orig_mfpmath=$(get-flag -mfpmath)
227 # get the value of the current -mfpmath flag 270 # get the value of the current -mfpmath flag
228 new_math=" `get-flag mfpmath | tr , ' '` " 271 new_math=$(get-flag mfpmath)
272 new_math=" ${new_math//,/ } "
229 # figure out which math values are to be removed 273 # figure out which math values are to be removed
230 prune_math="" 274 prune_math=""
231 for prune_math in "$@" ; do 275 for prune_math in "$@" ; do
232 new_math="${new_math/ ${prune_math} / }" 276 new_math=${new_math/ ${prune_math} / }
233 done 277 done
234 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 278 new_math=$(echo ${new_math})
279 new_math=${new_math// /,}
235 280
236 if [ -z "${new_math}" ] ; then 281 if [[ -z ${new_math} ]] ; then
237 # if we're removing all user specified math values are 282 # if we're removing all user specified math values are
238 # slated for removal, then we just filter the flag 283 # slated for removal, then we just filter the flag
239 filter-flags ${orig_mfpmath} 284 filter-flags ${orig_mfpmath}
240 else 285 else
241 # if we only want to filter some of the user specified 286 # if we only want to filter some of the user specified
243 replace-flags ${orig_mfpmath} -mfpmath=${new_math} 288 replace-flags ${orig_mfpmath} -mfpmath=${new_math}
244 fi 289 fi
245 return 0 290 return 0
246} 291}
247 292
293# @FUNCTION: strip-flags
294# @DESCRIPTION:
295# Strip C[XX]FLAGS of everything except known good/safe flags.
248strip-flags() { 296strip-flags() {
249 local x y flag NEW_CFLAGS NEW_CXXFLAGS 297 local x y flag NEW_CFLAGS NEW_CXXFLAGS NEW_FFLAGS NEW_FCFLAGS
250 298
251 setup-allowed-flags 299 setup-allowed-flags
252 300
253 local NEW_CFLAGS="" 301 local NEW_CFLAGS=""
254 local NEW_CXXFLAGS="" 302 local NEW_CXXFLAGS=""
303 local NEW_FFLAGS=""
304 local NEW_FCFLAGS=""
255 305
256 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 306 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
257 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then 307 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
258 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 308 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
259 fi 309 fi
278 break 328 break
279 fi 329 fi
280 done 330 done
281 done 331 done
282 332
333 for x in ${FFLAGS}; do
334 for y in ${ALLOWED_FLAGS}; do
335 flag=${x%%=*}
336 if [ "${flag%%${y}}" = "" ] ; then
337 NEW_FFLAGS="${NEW_FFLAGS} ${x}"
338 break
339 fi
340 done
341 done
342
343 for x in ${FCFLAGS}; do
344 for y in ${ALLOWED_FLAGS}; do
345 flag=${x%%=*}
346 if [ "${flag%%${y}}" = "" ] ; then
347 NEW_FCFLAGS="${NEW_FCFLAGS} ${x}"
348 break
349 fi
350 done
351 done
352
283 # In case we filtered out all optimization flags fallback to -O2 353 # In case we filtered out all optimization flags fallback to -O2
284 if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then 354 if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then
285 NEW_CFLAGS="${NEW_CFLAGS} -O2" 355 NEW_CFLAGS="${NEW_CFLAGS} -O2"
286 fi 356 fi
287 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 357 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then
288 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 358 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2"
289 fi 359 fi
360 if [ "${FFLAGS/-O}" != "${FFLAGS}" -a "${NEW_FFLAGS/-O}" = "${NEW_FFLAGS}" ]; then
361 NEW_FFLAGS="${NEW_FFLAGS} -O2"
362 fi
363 if [ "${FCFLAGS/-O}" != "${FCFLAGS}" -a "${NEW_FCFLAGS/-O}" = "${NEW_FCFLAGS}" ]; then
364 NEW_FCFLAGS="${NEW_FCFLAGS} -O2"
365 fi
290 366
291 set +f # re-enable pathname expansion 367 set +f # re-enable pathname expansion
292 368
293 export CFLAGS="${NEW_CFLAGS}" 369 export CFLAGS="${NEW_CFLAGS}"
294 export CXXFLAGS="${NEW_CXXFLAGS}" 370 export CXXFLAGS="${NEW_CXXFLAGS}"
371 export FFLAGS="${NEW_FFLAGS}"
372 export FCFLAGS="${NEW_FCFLAGS}"
295 return 0 373 return 0
296} 374}
297 375
298test-flag-PROG() { 376test-flag-PROG() {
299 local comp=$1 377 local comp=$1
305 local PROG=$(tc-get${comp}) 383 local PROG=$(tc-get${comp})
306 ${PROG} ${flags} -S -o /dev/null -xc /dev/null \ 384 ${PROG} ${flags} -S -o /dev/null -xc /dev/null \
307 > /dev/null 2>&1 385 > /dev/null 2>&1
308} 386}
309 387
310# Returns true if C compiler support given flag 388# @FUNCTION: test-flag-CC
389# @USAGE: <flag>
390# @DESCRIPTION:
391# Returns shell true if <flag> is supported by the C compiler, else returns shell false.
311test-flag-CC() { test-flag-PROG "CC" "$1"; } 392test-flag-CC() { test-flag-PROG "CC" "$1"; }
312 393
313# Returns true if C++ compiler support given flag 394# @FUNCTION: test-flag-CXX
395# @USAGE: <flag>
396# @DESCRIPTION:
397# Returns shell true if <flag> is supported by the C++ compiler, else returns shell false.
314test-flag-CXX() { test-flag-PROG "CXX" "$1"; } 398test-flag-CXX() { test-flag-PROG "CXX" "$1"; }
399
400# @FUNCTION: test-flag-F77
401# @USAGE: <flag>
402# @DESCRIPTION:
403# Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false.
404test-flag-F77() { test-flag-PROG "F77" "$1"; }
405
406# @FUNCTION: test-flag-FC
407# @USAGE: <flag>
408# @DESCRIPTION:
409# Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false.
410test-flag-FC() { test-flag-PROG "FC" "$1"; }
315 411
316test-flags-PROG() { 412test-flags-PROG() {
317 local comp=$1 413 local comp=$1
318 local flags 414 local flags
319 local x 415 local x
320 416
321 shift 417 shift
322 418
323 [[ -z ${comp} ]] && \ 419 [[ -z ${comp} ]] && return 1
324 return 1
325 420
421 x=""
326 for x in "$@" ; do 422 for x in "$@" ; do
327 test-flag-${comp} "${x}" && flags="${flags} ${x}" 423 test-flag-${comp} "${x}" && flags="${flags}${flags:+ }${x}"
328 done 424 done
329 425
330 echo "${flags}" 426 echo "${flags}"
331 427
332 # Just bail if we dont have any flags 428 # Just bail if we dont have any flags
333 [[ -n ${flags} ]] 429 [[ -n ${flags} ]]
334} 430}
335 431
336# Returns (echo's) the given flags supported by the C compiler 432# @FUNCTION: test-flags-CC
433# @USAGE: <flags>
434# @DESCRIPTION:
435# Returns shell true if <flags> are supported by the C compiler, else returns shell false.
337test-flags-CC() { test-flags-PROG "CC" "$@"; } 436test-flags-CC() { test-flags-PROG "CC" "$@"; }
338 437
339# Returns (echo's) the given flags supported by the C++ compiler 438# @FUNCTION: test-flags-CXX
439# @USAGE: <flags>
440# @DESCRIPTION:
441# Returns shell true if <flags> are supported by the C++ compiler, else returns shell false.
340test-flags-CXX() { test-flags-PROG "CXX" "$@"; } 442test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
341 443
444# @FUNCTION: test-flags-F77
445# @USAGE: <flags>
446# @DESCRIPTION:
447# Returns shell true if <flags> are supported by the Fortran 77 compiler, else returns shell false.
448test-flags-F77() { test-flags-PROG "F77" "$@"; }
449
450# @FUNCTION: test-flags-FC
451# @USAGE: <flags>
452# @DESCRIPTION:
453# Returns shell true if <flags> are supported by the Fortran 90 compiler, else returns shell false.
454test-flags-FC() { test-flags-PROG "FC" "$@"; }
455
456# @FUNCTION: test-flags
457# @USAGE: <flags>
458# @DESCRIPTION:
342# Short-hand that should hopefully work for both C and C++ compiler, but 459# Short-hand that should hopefully work for both C and C++ compiler, but
343# its really only present due to the append-flags() abomination. 460# its really only present due to the append-flags() abomination.
344test-flags() { test-flags-CC "$@"; } 461test-flags() { test-flags-CC "$@"; }
345 462
346# Depriciated, use test-flags() 463# @FUNCTION: test_flag
464# @DESCRIPTION:
465# DEPRICIATED, use test-flags()
347test_flag() { 466test_flag() {
348 addwrite "/dev/stderr"
349 ewarn "test_flag: deprecated, please use test-flags()!" >/dev/stderr 467 ewarn "test_flag: deprecated, please use test-flags()!" >&2
350 468
351 test-flags-CC "$@" 469 test-flags-CC "$@"
352} 470}
353 471
472# @FUNCTION: test_version_info
473# @USAGE: <version>
474# @DESCRIPTION:
475# Returns shell true if the current C compiler version matches <version>, else returns shell false.
476# Accepts shell globs.
354test_version_info() { 477test_version_info() {
355 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then 478 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
356 return 0 479 return 0
357 else 480 else
358 return 1 481 return 1
359 fi 482 fi
360} 483}
361 484
485# @FUNCTION: strip-unsupported-flags
486# @DESCRIPTION:
487# Strip {C,CXX,F,FC}FLAGS of any flags not supported by the active toolchain.
362strip-unsupported-flags() { 488strip-unsupported-flags() {
363 local x NEW_CFLAGS NEW_CXXFLAGS 489 export CFLAGS=$(test-flags-CC ${CFLAGS})
364 490 export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS})
365 for x in ${CFLAGS} ; do 491 export FFLAGS=$(test-flags-F77 ${FFLAGS})
366 NEW_CFLAGS="${NEW_CFLAGS} $(test-flags ${x})" 492 export FCFLAGS=$(test-flags-FC ${FCFLAGS})
367 done
368 for x in ${CXXFLAGS} ; do
369 NEW_CXXFLAGS="${NEW_CXXFLAGS} $(test-flags ${x})"
370 done
371
372 export CFLAGS=${NEW_CFLAGS}
373 export CXXFLAGS=${NEW_CXXFLAGS}
374} 493}
375 494
495# @FUNCTION: get-flag
496# @USAGE: <flag>
497# @DESCRIPTION:
498# Find and echo the value for a particular flag. Accepts shell globs.
376get-flag() { 499get-flag() {
377 local f findflag="$1" 500 local f findflag="$1"
378 501
379 # this code looks a little flaky but seems to work for 502 # this code looks a little flaky but seems to work for
380 # everything we want ... 503 # everything we want ...
381 # for example, if CFLAGS="-march=i686": 504 # for example, if CFLAGS="-march=i686":
382 # `get-flag -march` == "-march=i686" 505 # `get-flag -march` == "-march=i686"
383 # `get-flag march` == "i686" 506 # `get-flag march` == "i686"
384 for f in ${CFLAGS} ${CXXFLAGS} ; do 507 for f in ${CFLAGS} ${CXXFLAGS} ${FFLAGS} ${FCFLAGS} ; do
385 if [ "${f/${findflag}}" != "${f}" ] ; then 508 if [ "${f/${findflag}}" != "${f}" ] ; then
386 printf "%s\n" "${f/-${findflag}=}" 509 printf "%s\n" "${f/-${findflag}=}"
387 return 0 510 return 0
388 fi 511 fi
389 done 512 done
390 return 1 513 return 1
391} 514}
392 515
516# @FUNCTION: has_hardened
517# @DESCRIPTION:
393# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs 518# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
394has_hardened() { 519has_hardened() {
395 addwrite "/dev/stderr"
396 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" \ 520 ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2
397 >/dev/stderr
398 521
399 test_version_info Hardened && return 0 522 test_version_info Hardened && return 0
400 # The specs file wont exist unless gcc has GCC_SPECS support 523 # The specs file wont exist unless gcc has GCC_SPECS support
401 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]] 524 [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]]
402} 525}
403 526
527# @FUNCTION: has_pic
528# @DESCRIPTION:
404# DEPRECATED - use gcc-specs-pie from toolchain-funcs 529# DEPRECATED - use gcc-specs-pie from toolchain-funcs
405# indicate whether PIC is set 530# indicate whether PIC is set
406has_pic() { 531has_pic() {
407 addwrite "/dev/stderr"
408 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >/dev/stderr 532 ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2
409 533
410 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \ 534 [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \
411 ${CFLAGS/-fpic} != ${CFLAGS} || \ 535 ${CFLAGS/-fpic} != ${CFLAGS} ]] || \
412 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__) ]] 536 gcc-specs-pie
413} 537}
414 538
539# @FUNCTION: has_pie
540# @DESCRIPTION:
415# DEPRECATED - use gcc-specs-pie from toolchain-funcs 541# DEPRECATED - use gcc-specs-pie from toolchain-funcs
416# indicate whether PIE is set 542# indicate whether PIE is set
417has_pie() { 543has_pie() {
418 addwrite "/dev/stderr"
419 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >/dev/stderr 544 ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2
420 545
421 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \ 546 [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \
422 ${CFLAGS/-fpie} != ${CFLAGS} || \ 547 ${CFLAGS/-fpie} != ${CFLAGS} ]] || \
423 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__) || \ 548 gcc-specs-pie
424 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__) ]]
425 # test PIC while waiting for specs to be updated to generate __PIE__
426} 549}
427 550
551# @FUNCTION: has_ssp_all
552# @DESCRIPTION:
428# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 553# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
429# indicate whether code for SSP is being generated for all functions 554# indicate whether code for SSP is being generated for all functions
430has_ssp_all() { 555has_ssp_all() {
431 addwrite "/dev/stderr"
432 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >/dev/stderr 556 ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2
433 557
434 # note; this matches only -fstack-protector-all 558 # note; this matches only -fstack-protector-all
435 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \ 559 [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \
436 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \ 560 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \
437 gcc-specs-ssp 561 gcc-specs-ssp-all
438} 562}
439 563
564# @FUNCTION: has_ssp
565# @DESCRIPTION:
440# DEPRECATED - use gcc-specs-ssp from toolchain-funcs 566# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
441# indicate whether code for SSP is being generated 567# indicate whether code for SSP is being generated
442has_ssp() { 568has_ssp() {
443 addwrite "/dev/stderr"
444 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >/dev/stderr 569 ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2
445 570
446 # note; this matches both -fstack-protector and -fstack-protector-all 571 # note; this matches both -fstack-protector and -fstack-protector-all
447 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \ 572 [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \
448 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \ 573 -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \
449 gcc-specs-ssp 574 gcc-specs-ssp
450} 575}
451 576
577# @FUNCTION: has_m64
578# @DESCRIPTION:
579# This doesn't test if the flag is accepted, it tests if the flag actually
580# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works
581# return code is 0, else the return code is 1.
452has_m64() { 582has_m64() {
453 # this doesnt test if the flag is accepted, it tests if the flag 583 # this doesnt test if the flag is accepted, it tests if the flag
454 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 584 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
455 # please dont replace this function with test_flag in some future 585 # please dont replace this function with test_flag in some future
456 # clean-up! 586 # clean-up!
463 rm -f "${temp}".c 593 rm -f "${temp}".c
464 [[ ${ret} != 1 ]] && return 0 594 [[ ${ret} != 1 ]] && return 0
465 return 1 595 return 1
466} 596}
467 597
598# @FUNCTION: has_m32
599# @DESCRIPTION:
600# This doesn't test if the flag is accepted, it tests if the flag actually
601# WORKS. Non-mulilib gcc will take both -m32 and -64. If the flag works return
602# code is 0, else return code is 1.
468has_m32() { 603has_m32() {
469 # this doesnt test if the flag is accepted, it tests if the flag 604 # this doesnt test if the flag is accepted, it tests if the flag
470 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 605 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
471 # please dont replace this function with test_flag in some future 606 # please dont replace this function with test_flag in some future
472 # clean-up! 607 # clean-up!
481 rm -f "${temp}".c 616 rm -f "${temp}".c
482 [[ ${ret} != 1 ]] && return 0 617 [[ ${ret} != 1 ]] && return 0
483 return 1 618 return 1
484} 619}
485 620
621# @FUNCTION: replace-sparc64-flags
622# @DESCRIPTION:
623# Sets mcpu to v8 and uses the original value as mtune if none specified.
486replace-sparc64-flags() { 624replace-sparc64-flags() {
487 local SPARC64_CPUS="ultrasparc3 ultrasparc v9" 625 local SPARC64_CPUS="ultrasparc3 ultrasparc v9"
488 626
489 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 627 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
490 for x in ${SPARC64_CPUS}; do 628 for x in ${SPARC64_CPUS}; do
491 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 629 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
492 done 630 done
493 else 631 else
494 for x in ${SPARC64_CPUS}; do 632 for x in ${SPARC64_CPUS}; do
495 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 633 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
496 done 634 done
497 fi 635 fi
498 636
499 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then 637 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
500 for x in ${SPARC64_CPUS}; do 638 for x in ${SPARC64_CPUS}; do
501 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 639 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
502 done 640 done
503 else 641 else
504 for x in ${SPARC64_CPUS}; do 642 for x in ${SPARC64_CPUS}; do
505 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 643 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
506 done 644 done
507 fi 645 fi
508 646
509 export CFLAGS CXXFLAGS 647 export CFLAGS CXXFLAGS
510} 648}
511 649
650# @FUNCTION: append-ldflags
651# @USAGE: <flags>
652# @DESCRIPTION:
653# Add extra <flags> to the current LDFLAGS.
512append-ldflags() { 654append-ldflags() {
655 [[ -z $* ]] && return 0
656 local flag
657 for flag in "$@"; do
658 [[ ${flag} == -l* ]] && \
659 ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
660 done
661
513 export LDFLAGS="${LDFLAGS} $*" 662 export LDFLAGS="${LDFLAGS} $*"
514 return 0 663 return 0
515} 664}
516 665
666# @FUNCTION: filter-ldflags
667# @USAGE: <flags>
668# @DESCRIPTION:
669# Remove particular <flags> from LDFLAGS. Accepts shell globs.
517filter-ldflags() { 670filter-ldflags() {
518 local x 671 _filter-var LDFLAGS "$@"
672 return 0
673}
519 674
520 # we do this fancy spacing stuff so as to not filter 675# @FUNCTION: raw-ldflags
521 # out part of a flag ... we want flag atoms ! :D 676# @USAGE: <flags>
522 LDFLAGS=" ${LDFLAGS} " 677# @DESCRIPTION:
678# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results
679# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed
680# to gcc where it needs the '-Wl,'.
681raw-ldflags() {
682 local x input="$@"
683 [[ -z ${input} ]] && input=${LDFLAGS}
684 set --
523 for x in "$@" ; do 685 for x in ${input} ; do
524 LDFLAGS=${LDFLAGS// ${x} / } 686 x=${x#-Wl,}
687 set -- "$@" ${x//,/ }
525 done 688 done
526 [[ -z ${LDFLAGS// } ]] \ 689 echo "$@"
527 && LDFLAGS="" \
528 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
529 export LDFLAGS
530 return 0
531} 690}
532 691
533fstack-flags() { 692# @FUNCTION: bindnow-flags
534 if gcc-specs-ssp; then 693# @RETURN: Returns the flags to enable "now" binding in the current selected linker.
535 [ -z "`is-flag -fno-stack-protector`" ] && 694# @DESCRIPTION:
536 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 695# DEPRECATED - Gets the flags needed for "NOW" binding
537 fi 696bindnow-flags() {
538 return 0 697 ewarn "QA: stop using the bindnow-flags function ... simply drop it from your ebuild"
539} 698}
540 699
541# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>, 700
542# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more 701# Some tests for when we screw with things and want to make
543# fixes. 702# sure we didn't break anything
703#TESTS() {
704# CFLAGS="-a -b -c=1"
705# CXXFLAGS="-x -y -z=2"
706# LDFLAGS="-l -m -n=3"
544# 707#
545# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3 708# die() { exit 1; }
546gcc2-flags() { 709# (is-flag 1 2 3) && die
547 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then 710# (is-ldflag 1 2 3) && die
548 CFLAGS=${CFLAGS//-mtune=/-mcpu=} 711#
549 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=} 712# is-flagq -l && die
550 fi 713# is-ldflagq -a && die
551 714# is-flagq -a || die
552 replace-cpu-flags k6-{2,3} k6 715# is-flagq -x || die
553 replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686 716# is-ldflagq -n=* || die
554 717# is-ldflagq -n && die
555 replace-cpu-flags pentium-mmx i586 718#
556 replace-cpu-flags pentium{2,3,4} i686 719# strip-unsupported-flags
557 720# [[ ${CFLAGS} == "-c=1" ]] || die
558 replace-cpu-flags ev6{7,8} ev6 721# [[ ${CXXFLAGS} == "-y -z=2" ]] || die
559 722#
560 export CFLAGS CXXFLAGS 723# echo "All tests pass"
561} 724#}
562 725#TESTS
563# Gets the flags needed for "NOW" binding
564bindnow-flags() {
565 case $($(tc-getLD) -v 2>&1 </dev/null) in
566 *GNU* | *'with BFD'*) # GNU ld
567 echo "-Wl,-z,now" ;;
568 *Apple*) # Darwin ld
569 echo "-bind_at_load" ;;
570 *)
571 # Some linkers just recognize -V instead of -v
572 case $($(tc-getLD) -V 2>&1 </dev/null) in
573 *Solaris*) # Solaris accept almost the same GNU options
574 echo "-Wl,-z,now" ;;
575 esac
576 ;;
577 esac
578}

Legend:
Removed from v.1.101  
changed lines
  Added in v.1.129

  ViewVC Help
Powered by ViewVC 1.1.20