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

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.73

  ViewVC Help
Powered by ViewVC 1.1.20