/[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.41 Revision 1.92
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2005 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.41 2004/03/16 21:37:09 solar Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.92 2005/08/01 10:50:55 kevquinn Exp $
4#
5# Author Bart Verwilst <verwilst@gentoo.org>
6 4
7ECLASS=flag-o-matic 5
8INHERITED="$INHERITED $ECLASS" 6# need access to emktemp()
7inherit eutils toolchain-funcs multilib
9 8
10# 9#
11#### filter-flags <flags> #### 10#### filter-flags <flags> ####
12# Remove particular flags from C[XX]FLAGS 11# Remove particular flags from C[XX]FLAGS
13# Matches only complete flags 12# Matches only complete flags
16# Add extra flags to your current C[XX]FLAGS 15# Add extra flags to your current C[XX]FLAGS
17# 16#
18#### replace-flags <orig.flag> <new.flag> ### 17#### replace-flags <orig.flag> <new.flag> ###
19# Replace a flag by another one 18# Replace a flag by another one
20# 19#
21#### replace-cpu-flags <new.cpu> <old.cpus> ### 20#### replace-cpu-flags <old.cpus> <new.cpu> ###
22# Replace march/mcpu flags that specify <old.cpus> 21# Replace march/mcpu flags that specify <old.cpus>
23# with flags that specify <new.cpu> 22# with flags that specify <new.cpu>
24# 23#
25#### is-flag <flag> #### 24#### is-flag <flag> ####
26# Returns "true" if flag is set in C[XX]FLAGS 25# Returns "true" if flag is set in C[XX]FLAGS
51# 50#
52#### filter-ldflags <flags> #### 51#### filter-ldflags <flags> ####
53# Remove particular flags from LDFLAGS 52# Remove particular flags from LDFLAGS
54# Matches only complete flags 53# Matches only complete flags
55# 54#
56#### etexec-flags ####
57# hooked function for hardened-gcc that appends
58# -yet_exec {C,CXX,LD}FLAGS when hardened-gcc is installed
59# and a package is filtering -fPIC,-fpic, -fPIE, -fpie
60#
61#### fstack-flags #### 55#### fstack-flags ####
62# hooked function for hardened-gcc that appends 56# hooked function for hardened gcc that appends
63# -yno_propolice to {C,CXX,LD}FLAGS when hardened-gcc is installed 57# -fno-stack-protector to {C,CXX,LD}FLAGS
64# and a package is filtering -fstack-protector, -fstack-protector-all 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#
63################ DEPRECATED functions ################
64# The following are still present to avoid breaking existing
65# code more than necessary; however they are deprecated. Please
66# use gcc-specs-* from toolchain-funcs.eclass instead, if you
67# need to know which hardened techs are active in the compiler.
68# See bug #100974
69#
70#### has_hardened ####
71# Returns true if the compiler has 'Hardened' in its version string,
72# (note; switched-spec vanilla compilers satisfy this condition) or
73# the specs file name contains 'hardened'.
74#
75#### has_pie ####
76# Returns true if the compiler by default or with current CFLAGS
77# builds position-independent code.
78#
79#### has_pic ####
80# Returns true if the compiler by default or with current CFLAGS
81# builds position-independent code.
82#
83#### has_ssp_all ####
84# Returns true if the compiler by default or with current CFLAGS
85# generates stack smash protections for all functions
86#
87#### has_ssp ####
88# Returns true if the compiler by default or with current CFLAGS
89# generates stack smash protections for most vulnerable functions
65# 90#
66 91
67# C[XX]FLAGS that we allow in strip-flags 92# C[XX]FLAGS that we allow in strip-flags
68setup-allowed-flags() { 93setup-allowed-flags() {
69 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -pipe -g" 94 if [[ -z ${ALLOWED_FLAGS} ]] ; then
70 case "${ARCH}" in 95 export ALLOWED_FLAGS="-pipe"
71 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;; 96 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
72 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 97 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
73 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking"
74 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time"
75 esac 100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
101 fi
102 # allow a bunch of flags that negate features / control ABI
103 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
104 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
105 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
106 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
107 -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
108 -mieee -mieee-with-inexact \
109 -mtls-direct-seg-refs -mno-tls-direct-seg-refs \
110 -mflat -mno-flat -mno-faster-structs -mfaster-structs \
111 -m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
112 -mlive-g0 -mcmodel -mstack-bias -mno-stack-bias"
76 113
77 # C[XX]FLAGS that we are think is ok, but needs testing 114 # C[XX]FLAGS that we are think is ok, but needs testing
78 # NOTE: currently -Os have issues with gcc3 and K6* arch's 115 # NOTE: currently -Os have issues with gcc3 and K6* arch's
79 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 116 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
80 return 0 117 return 0
81} 118}
82 119
83filter-flags() { 120filter-flags() {
121 local x f fset
122 declare -a new_CFLAGS new_CXXFLAGS
123
84 for x in "$@" ; do 124 for x in "$@" ; do
85 case "${x}" in 125 case "${x}" in
86 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 126 -fPIC|-fpic|-fPIE|-fpie|-pie)
127 append-flags `test_flag -fno-pie`;;
87 -fstack-protector|-fstack-protector-all) fstack-flags;; 128 -fstack-protector|-fstack-protector-all)
88 *) ;; 129 fstack-flags;;
89 esac 130 esac
90 done 131 done
91 132
92 # we do this fancy spacing stuff so as to not filter 133 for fset in CFLAGS CXXFLAGS; do
93 # out part of a flag ... we want flag atoms ! :D 134 # Looping over the flags instead of using a global
94 CFLAGS=" ${CFLAGS} " 135 # substitution ensures that we're working with flag atoms.
95 CXXFLAGS=" ${CXXFLAGS} " 136 # Otherwise globs like -O* have the potential to wipe out the
137 # list of flags.
138 for f in ${!fset}; do
96 for x in "$@" ; do 139 for x in "$@"; do
97 CFLAGS="${CFLAGS// ${x} / }" 140 # Note this should work with globs like -O*
98 CXXFLAGS="${CXXFLAGS// ${x} / }" 141 [[ ${f} == ${x} ]] && continue 2
142 done
143 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
99 done 144 done
100 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 145 eval export ${fset}=\${new_${fset}\[*]}
101 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 146 done
147
102 return 0 148 return 0
103} 149}
104 150
105filter-lfs-flags() { 151filter-lfs-flags() {
106 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 152 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
107} 153}
108 154
155append-lfs-flags() {
156 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
157}
158
109append-flags() { 159append-flags() {
160 [[ -z $* ]] && return 0
110 export CFLAGS="${CFLAGS} $@" 161 export CFLAGS="${CFLAGS} $*"
111 export CXXFLAGS="${CXXFLAGS} $@" 162 export CXXFLAGS="${CXXFLAGS} $*"
112 [ "`is-flag -fno-stack-protector`" -o "`is-flag -fno-stack-protector-all`" ] && fstack-flags 163 [ -n "`is-flag -fno-stack-protector`" -o \
164 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
113 return 0 165 return 0
114} 166}
115 167
116replace-flags() { 168replace-flags() {
117 # we do this fancy spacing stuff so as to not filter 169 local f fset
118 # out part of a flag ... we want flag atoms ! :D 170 declare -a new_CFLAGS new_CXXFLAGS
119 CFLAGS=" ${CFLAGS} " 171
120 CXXFLAGS=" ${CXXFLAGS} " 172 for fset in CFLAGS CXXFLAGS; do
121 CFLAGS="${CFLAGS// ${1} / ${2} }" 173 # Looping over the flags instead of using a global
122 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 174 # substitution ensures that we're working with flag atoms.
123 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 175 # Otherwise globs like -O* have the potential to wipe out the
124 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 176 # list of flags.
177 for f in ${!fset}; do
178 # Note this should work with globs like -O*
179 [[ ${f} == ${1} ]] && f=${2}
180 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
181 done
182 eval export ${fset}=\${new_${fset}\[*]}
183 done
184
125 return 0 185 return 0
126} 186}
127 187
128replace-cpu-flags() { 188replace-cpu-flags() {
129 local newcpu="$1" ; shift 189 local newcpu="$#" ; newcpu="${!newcpu}"
130 local oldcpu="" 190 while [ $# -gt 1 ] ; do
131 for oldcpu in "$@" ; do 191 # quote to make sure that no globbing is done (particularly on
192 # ${oldcpu} prior to calling replace-flags
132 replace-flags -march=${oldcpu} -march=${newcpu} 193 replace-flags "-march=${1}" "-march=${newcpu}"
133 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 194 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
134 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 195 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
196 shift
135 done 197 done
136 return 0 198 return 0
137} 199}
138 200
139is-flag() { 201is-flag() {
202 local x
203
140 for x in ${CFLAGS} ${CXXFLAGS} ; do 204 for x in ${CFLAGS} ${CXXFLAGS} ; do
205 # Note this should work with globs like -mcpu=ultrasparc*
141 if [ "${x}" == "$1" ] ; then 206 if [[ ${x} == ${1} ]]; then
142 echo true 207 echo true
143 return 0 208 return 0
144 fi 209 fi
145 done 210 done
146 return 1 211 return 1
147} 212}
148 213
149filter-mfpmath() { 214filter-mfpmath() {
215 local orig_mfpmath new_math prune_math
216
150 # save the original -mfpmath flag 217 # save the original -mfpmath flag
151 local orig_mfpmath="`get-flag -mfpmath`" 218 orig_mfpmath="`get-flag -mfpmath`"
152 # get the value of the current -mfpmath flag 219 # get the value of the current -mfpmath flag
153 local new_math=" `get-flag mfpmath | tr , ' '` " 220 new_math=" `get-flag mfpmath | tr , ' '` "
154 # figure out which math values are to be removed 221 # figure out which math values are to be removed
155 local prune_math="" 222 prune_math=""
156 for prune_math in "$@" ; do 223 for prune_math in "$@" ; do
157 new_math="${new_math/ ${prune_math} / }" 224 new_math="${new_math/ ${prune_math} / }"
158 done 225 done
159 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 226 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`"
160 227
169 fi 236 fi
170 return 0 237 return 0
171} 238}
172 239
173strip-flags() { 240strip-flags() {
241 local x y flag NEW_CFLAGS NEW_CXXFLAGS
242
174 setup-allowed-flags 243 setup-allowed-flags
175 244
176 local NEW_CFLAGS="" 245 local NEW_CFLAGS=""
177 local NEW_CXXFLAGS="" 246 local NEW_CXXFLAGS=""
178 247
179 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 248 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
180 if [ `has ~${ARCH} ${ACCEPT_KEYWORDS}` ] ; then 249 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
181 [ `use debug` ] && einfo "Enabling the use of some unstable flags"
182 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 250 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
183 fi 251 fi
184 252
185 set -f 253 set -f # disable pathname expansion
186 254
187 for x in ${CFLAGS} 255 for x in ${CFLAGS}; do
188 do
189 for y in ${ALLOWED_FLAGS} 256 for y in ${ALLOWED_FLAGS}; do
190 do
191 flag=${x%%=*} 257 flag=${x%%=*}
192 if [ "${flag%%${y}}" = "" ] 258 if [ "${flag%%${y}}" = "" ] ; then
193 then
194 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 259 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
195 break 260 break
196 fi 261 fi
197 done 262 done
198 done 263 done
199 264
200 for x in ${CXXFLAGS} 265 for x in ${CXXFLAGS}; do
201 do
202 for y in ${ALLOWED_FLAGS} 266 for y in ${ALLOWED_FLAGS}; do
203 do
204 flag=${x%%=*} 267 flag=${x%%=*}
205 if [ "${flag%%${y}}" = "" ] 268 if [ "${flag%%${y}}" = "" ] ; then
206 then
207 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 269 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
208 break 270 break
209 fi 271 fi
210 done 272 done
211 done 273 done
216 fi 278 fi
217 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 279 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then
218 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 280 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2"
219 fi 281 fi
220 282
221 set +f 283 set +f # re-enable pathname expansion
222
223 [ `use debug` ] \
224 && einfo "CFLAGS=\"${NEW_CFLAGS}\"" \
225 && einfo "CXXFLAGS=\"${NEW_CXXFLAGS}\""
226 284
227 export CFLAGS="${NEW_CFLAGS}" 285 export CFLAGS="${NEW_CFLAGS}"
228 export CXXFLAGS="${NEW_CXXFLAGS}" 286 export CXXFLAGS="${NEW_CXXFLAGS}"
229 return 0 287 return 0
230} 288}
231 289
232test_flag() { 290test_flag() {
233 if gcc -S -xc "$@" -o /dev/null /dev/null >/dev/null 2>&1; then 291 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
234 echo "$@" 292 printf "%s\n" "$*"
235 return 0 293 return 0
236 fi 294 fi
237 return 1 295 return 1
238} 296}
239 297
298test_version_info() {
299 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
300 return 0
301 else
302 return 1
303 fi
304}
305
240strip-unsupported-flags() { 306strip-unsupported-flags() {
307 local NEW_CFLAGS NEW_CXXFLAGS
308
241 for x in ${CFLAGS} ; do 309 for x in ${CFLAGS} ; do
242 NEW_CFLAGS=${NEW_CFLAGS}" ""`test_flag ${x}`" 310 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`"
243 done 311 done
244 for x in ${CXXFLAGS} ; do 312 for x in ${CXXFLAGS} ; do
245 NEW_CXXFLAGS=${NEW_CXXFLAGS}" ""`test_flag ${x}`" 313 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`"
246 done 314 done
247 315
248 export CFLAGS="${NEW_CFLAGS}" 316 export CFLAGS="${NEW_CFLAGS}"
249 export CXXFLAGS="${NEW_CXXFLAGS}" 317 export CXXFLAGS="${NEW_CXXFLAGS}"
250} 318}
251 319
252get-flag() { 320get-flag() {
321 local f findflag="$1"
322
253 # this code looks a little flaky but seems to work for 323 # this code looks a little flaky but seems to work for
254 # everything we want ... 324 # everything we want ...
255 # for example, if CFLAGS="-march=i686": 325 # for example, if CFLAGS="-march=i686":
256 # `get-flags -march` == "-march=i686" 326 # `get-flag -march` == "-march=i686"
257 # `get-flags march` == "i686" 327 # `get-flag march` == "i686"
258 local findflag="$1"
259 for f in ${CFLAGS} ${CXXFLAGS} ; do 328 for f in ${CFLAGS} ${CXXFLAGS} ; do
260 if [ "${f/${findflag}}" != "${f}" ] ; then 329 if [ "${f/${findflag}}" != "${f}" ] ; then
261 echo "${f/-${findflag}=}" 330 printf "%s\n" "${f/-${findflag}=}"
262 return 0 331 return 0
263 fi 332 fi
264 done 333 done
265 return 1 334 return 1
266} 335}
267 336
337# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
338has_hardened() {
339 test_version_info Hardened && return 0
340 # the specs file wont exist unless gcc has GCC_SPECS support
341 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \
342 return 0
343 return 1
344}
345
346# DEPRECATED - use gcc-specs-pie from toolchain-funcs
347# indicate whether PIC is set
348has_pic() {
349 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
350 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
351 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
352 return 1
353}
354
355# DEPRECATED - use gcc-specs-pie from toolchain-funcs
356# indicate whether PIE is set
357has_pie() {
358 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
359 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
360 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0
361 # test PIC while waiting for specs to be updated to generate __PIE__
362 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
363 return 1
364}
365
366# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
367# indicate whether code for SSP is being generated for all functions
368has_ssp_all() {
369 # note; this matches only -fstack-protector-all
370 [ "${CFLAGS/-fstack-protector-all}" != "${CFLAGS}" ] && return 0
371 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__)" ] && return 0
372 gcc-specs-ssp && return 0
373 return 1
374}
375
376# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
377# indicate whether code for SSP is being generated
378has_ssp() {
379 # note; this matches both -fstack-protector and -fstack-protector-all
380 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
381 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0
382 gcc-specs-ssp && return 0
383 return 1
384}
385
386has_m64() {
387 # this doesnt test if the flag is accepted, it tests if the flag
388 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
389 # please dont replace this function with test_flag in some future
390 # clean-up!
391 local temp="$(emktemp)"
392 echo "int main() { return(0); }" > ${temp}.c
393 MY_CC=$(tc-getCC)
394 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
395 local ret=$?
396 rm -f ${temp}.c
397 [ "$ret" != "1" ] && return 0
398 return 1
399}
400
401has_m32() {
402 # this doesnt test if the flag is accepted, it tests if the flag
403 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
404 # please dont replace this function with test_flag in some future
405 # clean-up!
406
407 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
408
409 local temp="$(emktemp)"
410 echo "int main() { return(0); }" > ${temp}.c
411 MY_CC=$(tc-getCC)
412 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
413 local ret=$?
414 rm -f ${temp}.c
415 [ "$ret" != "1" ] && return 0
416 return 1
417}
418
268replace-sparc64-flags() { 419replace-sparc64-flags() {
269 local SPARC64_CPUS="ultrasparc v9" 420 local SPARC64_CPUS="ultrasparc v9"
270 421
271 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ] 422 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
272 then
273 for x in ${SPARC64_CPUS} 423 for x in ${SPARC64_CPUS}; do
274 do
275 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 424 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
276 done 425 done
277 else 426 else
278 for x in ${SPARC64_CPUS} 427 for x in ${SPARC64_CPUS}; do
279 do
280 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 428 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
281 done 429 done
282 fi 430 fi
283 431
284 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ] 432 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
285 then
286 for x in ${SPARC64_CPUS} 433 for x in ${SPARC64_CPUS}; do
287 do
288 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 434 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
289 done 435 done
290 else 436 else
291 for x in ${SPARC64_CPUS} 437 for x in ${SPARC64_CPUS}; do
292 do
293 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 438 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
294 done 439 done
295 fi 440 fi
441
442 export CFLAGS CXXFLAGS
296} 443}
297 444
298append-ldflags() { 445append-ldflags() {
299 LDFLAGS="${LDFLAGS} $@" 446 export LDFLAGS="${LDFLAGS} $*"
300 return 0 447 return 0
301} 448}
302 449
303filter-ldflags() { 450filter-ldflags() {
451 local x
452
304 # we do this fancy spacing stuff so as to not filter 453 # we do this fancy spacing stuff so as to not filter
305 # out part of a flag ... we want flag atoms ! :D 454 # out part of a flag ... we want flag atoms ! :D
306 LDFLAGS=" ${LDFLAGS} " 455 LDFLAGS=" ${LDFLAGS} "
307 for x in "$@" ; do 456 for x in "$@" ; do
308 LDFLAGS="${LDFLAGS// ${x} / }" 457 LDFLAGS=${LDFLAGS// ${x} / }
309 done 458 done
459 [[ -z ${LDFLAGS// } ]] \
460 && LDFLAGS="" \
310 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 461 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
462 export LDFLAGS
311 return 0 463 return 0
312}
313
314etexec-flags() {
315 has_version sys-devel/hardened-gcc
316 if [ $? == 0 ] ; then
317 if [ "`is-flag -yet_exec`" != "true" ]; then
318 debug-print ">>> appending flags -yet_exec"
319 append-flags -yet_exec
320 append-ldflags -yet_exec
321 fi
322 fi
323} 464}
324 465
325fstack-flags() { 466fstack-flags() {
326 has_version sys-devel/hardened-gcc 467 if gcc-specs-ssp; then
327 if [ $? == 0 ] ; then 468 [ -z "`is-flag -fno-stack-protector`" ] &&
328 if [ "`is-flag -yno_propolice`" != "true" ]; then 469 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
329 debug-print ">>> appending flags -yno_propolice"
330 append-flags -yno_propolice
331 append-ldflags -yno_propolice
332 fi 470 fi
333 fi 471 return 0
334} 472}
473
474# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
475# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
476# fixes.
477#
478# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
479gcc2-flags() {
480 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
481 CFLAGS=${CFLAGS//-mtune=/-mcpu=}
482 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
483 fi
484
485 replace-cpu-flags k6-{2,3} k6
486 replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
487
488 replace-cpu-flags pentium-mmx i586
489 replace-cpu-flags pentium{2,3,4} i686
490
491 replace-cpu-flags ev6{7,8} ev6
492
493 export CFLAGS CXXFLAGS
494}

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20