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

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

  ViewVC Help
Powered by ViewVC 1.1.20