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

Legend:
Removed from v.1.37  
changed lines
  Added in v.1.87

  ViewVC Help
Powered by ViewVC 1.1.20