/[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.73 Revision 1.93
1# Copyright 1999-2004 Gentoo Foundation 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.73 2004/10/13 14:11:52 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.93 2005/09/27 01:06:47 vapier Exp $
4#
5# Author Bart Verwilst <verwilst@gentoo.org>
6 4
7ECLASS=flag-o-matic
8INHERITED="$INHERITED $ECLASS"
9
10# Please leave ${IUSE} in this until portage .51 is stable, otherwise
11# IUSE gets clobbered.
12IUSE="${IUSE} debug"
13 5
14# need access to emktemp() 6# need access to emktemp()
15inherit eutils 7inherit eutils toolchain-funcs multilib
16 8
17# 9#
18#### filter-flags <flags> #### 10#### filter-flags <flags> ####
19# Remove particular flags from C[XX]FLAGS 11# Remove particular flags from C[XX]FLAGS
20# Matches only complete flags 12# Matches only complete flags
57# Add extra flags to your current LDFLAGS 49# Add extra flags to your current LDFLAGS
58# 50#
59#### filter-ldflags <flags> #### 51#### filter-ldflags <flags> ####
60# Remove particular flags from LDFLAGS 52# Remove particular flags from LDFLAGS
61# Matches only complete flags 53# Matches only complete flags
62#
63#### etexec-flags ####
64# hooked function for hardened gcc that appends
65# -fno-pic to {C,CXX,LD}FLAGS
66# when a package is filtering -fpic, -fPIC, -fpie, -fPIE
67# 54#
68#### fstack-flags #### 55#### fstack-flags ####
69# hooked function for hardened gcc that appends 56# hooked function for hardened gcc that appends
70# -fno-stack-protector to {C,CXX,LD}FLAGS 57# -fno-stack-protector to {C,CXX,LD}FLAGS
71# when a package is filtering -fstack-protector, -fstack-protector-all 58# when a package is filtering -fstack-protector, -fstack-protector-all
72# notice: modern automatic specs files will also suppress -fstack-protector-all 59# notice: modern automatic specs files will also suppress -fstack-protector-all
73# when only -fno-stack-protector is given 60# when only -fno-stack-protector is given
74# 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
90#
75 91
76# C[XX]FLAGS that we allow in strip-flags 92# C[XX]FLAGS that we allow in strip-flags
77setup-allowed-flags() { 93setup-allowed-flags() {
78 if [ -z "${ALLOWED_FLAGS}" ] ; then 94 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" 95 export ALLOWED_FLAGS="-pipe"
80 case "${ARCH}" in 96 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
81 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;; 97 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
82 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;; 98 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking"
83 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;; 99 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time"
84 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 100 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
85 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
86 esac
87 fi 101 fi
88 # allow a bunch of flags that negate features / control ABI 102 # allow a bunch of flags that negate features / control ABI
89 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 103 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
90 case "${ARCH}" in 104 ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
91 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;; 105 -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
92 esac 106 -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
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" 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"
94 113
95 # 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
96 # NOTE: currently -Os have issues with gcc3 and K6* arch's 115 # NOTE: currently -Os have issues with gcc3 and K6* arch's
97 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 116 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
98 return 0 117 return 0
99} 118}
100 119
101filter-flags() { 120filter-flags() {
102 local x f fset 121 local x f fset
103 declare -a new_CFLAGS new_CXXFLAGS 122 declare -a new_CFLAGS new_CXXFLAGS
104 123
105 for x in "$@" ; do 124 for x in "$@" ; do
106 case "${x}" in 125 case "${x}" in
107 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 126 -fPIC|-fpic|-fPIE|-fpie|-pie)
127 append-flags `test_flag -fno-pie`;;
108 -fstack-protector|-fstack-protector-all) fstack-flags;; 128 -fstack-protector|-fstack-protector-all)
129 fstack-flags;;
109 esac 130 esac
110 done 131 done
111 132
112 for fset in CFLAGS CXXFLAGS; do 133 for fset in CFLAGS CXXFLAGS; do
113 # Looping over the flags instead of using a global 134 # Looping over the flags instead of using a global
126 147
127 return 0 148 return 0
128} 149}
129 150
130filter-lfs-flags() { 151filter-lfs-flags() {
152 [[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
131 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 153 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
132} 154}
133 155
134append-lfs-flags() { 156append-lfs-flags() {
157 [[ -n $@ ]] && die "append-lfs-flags takes no arguments"
135 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 158 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
136} 159}
137 160
138append-flags() { 161append-flags() {
162 [[ -z $* ]] && return 0
139 export CFLAGS="${CFLAGS} $*" 163 export CFLAGS="${CFLAGS} $*"
140 export CXXFLAGS="${CXXFLAGS} $*" 164 export CXXFLAGS="${CXXFLAGS} $*"
141 [ -n "`is-flag -fno-stack-protector`" -o \ 165 [ -n "`is-flag -fno-stack-protector`" -o \
142 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags 166 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
143 return 0 167 return 0
144} 168}
145 169
146replace-flags() { 170replace-flags() {
171 [[ $# != 2 ]] \
172 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \
173 && die "replace-flags takes 2 arguments, not $#"
174
147 local f fset 175 local f fset
148 declare -a new_CFLAGS new_CXXFLAGS 176 declare -a new_CFLAGS new_CXXFLAGS
149 177
150 for fset in CFLAGS CXXFLAGS; do 178 for fset in CFLAGS CXXFLAGS; do
151 # Looping over the flags instead of using a global 179 # Looping over the flags instead of using a global
152 # substitution ensures that we're working with flag atoms. 180 # substitution ensures that we're working with flag atoms.
222 250
223 local NEW_CFLAGS="" 251 local NEW_CFLAGS=""
224 local NEW_CXXFLAGS="" 252 local NEW_CXXFLAGS=""
225 253
226 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 254 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
227 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then 255 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
228 use debug && einfo "Enabling the use of some unstable flags"
229 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 256 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
230 fi 257 fi
231 258
232 set -f # disable pathname expansion 259 set -f # disable pathname expansion
233 260
265 export CXXFLAGS="${NEW_CXXFLAGS}" 292 export CXXFLAGS="${NEW_CXXFLAGS}"
266 return 0 293 return 0
267} 294}
268 295
269test_flag() { 296test_flag() {
270 local cc=${CC:-gcc} ; cc=${cc%% *}
271 if ${cc} -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then 297 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
272 printf "%s\n" "$*" 298 printf "%s\n" "$*"
273 return 0 299 return 0
274 fi 300 fi
275 return 1 301 return 1
276} 302}
277 303
278test_version_info() { 304test_version_info() {
279 local cc=${CC:-gcc} ; cc=${cc%% *}
280 if [[ $(${cc} --version 2>&1) == *$1* ]]; then 305 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
281 return 0 306 return 0
282 else 307 else
283 return 1 308 return 1
284 fi 309 fi
285} 310}
313 fi 338 fi
314 done 339 done
315 return 1 340 return 1
316} 341}
317 342
343# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
318has_hardened() { 344has_hardened() {
319 test_version_info Hardened && return 0 345 test_version_info Hardened && return 0
320 # the specs file wont exist unless gcc has GCC_SPECS support 346 # the specs file wont exist unless gcc has GCC_SPECS support
321 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \ 347 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \
322 return 0 348 return 0
323 return 1 349 return 1
324} 350}
325 351
352# DEPRECATED - use gcc-specs-pie from toolchain-funcs
353# indicate whether PIC is set
326has_pic() { 354has_pic() {
327 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 355 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
328 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 356 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
329 test_version_info pie && return 0 357 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
330 return 1 358 return 1
331} 359}
332 360
361# DEPRECATED - use gcc-specs-pie from toolchain-funcs
362# indicate whether PIE is set
333has_pie() { 363has_pie() {
334 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 364 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
335 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0 365 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
336 test_version_info pie && return 0 366 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0
367 # test PIC while waiting for specs to be updated to generate __PIE__
368 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
337 return 1 369 return 1
338} 370}
339 371
372# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
373# indicate whether code for SSP is being generated for all functions
374has_ssp_all() {
375 # note; this matches only -fstack-protector-all
376 [ "${CFLAGS/-fstack-protector-all}" != "${CFLAGS}" ] && return 0
377 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__)" ] && return 0
378 gcc-specs-ssp && return 0
379 return 1
380}
381
382# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
383# indicate whether code for SSP is being generated
340has_ssp() { 384has_ssp() {
385 # note; this matches both -fstack-protector and -fstack-protector-all
341 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 386 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
342 test_version_info ssp && return 0 387 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0
388 gcc-specs-ssp && return 0
343 return 1 389 return 1
344} 390}
345 391
346has_m64() { 392has_m64() {
347 # this doesnt test if the flag is accepted, it tests if the flag 393 # 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! 394 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
349 # please dont replace this function with test_flag in some future 395 # please dont replace this function with test_flag in some future
350 # clean-up! 396 # clean-up!
351 local temp="$(emktemp)" 397 local temp="$(emktemp)"
352 echo "int main() { return(0); }" > ${temp}.c 398 echo "int main() { return(0); }" > ${temp}.c
399 MY_CC=$(tc-getCC)
353 ${CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 400 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
354 local ret=$? 401 local ret=$?
355 rm -f ${temp}.c 402 rm -f ${temp}.c
356 [ "$ret" != "1" ] && return 0 403 [ "$ret" != "1" ] && return 0
357 return 1 404 return 1
358} 405}
360has_m32() { 407has_m32() {
361 # this doesnt test if the flag is accepted, it tests if the flag 408 # 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! 409 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
363 # please dont replace this function with test_flag in some future 410 # please dont replace this function with test_flag in some future
364 # clean-up! 411 # clean-up!
412
413 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
414
365 local temp="$(emktemp)" 415 local temp="$(emktemp)"
366 echo "int main() { return(0); }" > ${temp}.c 416 echo "int main() { return(0); }" > ${temp}.c
417 MY_CC=$(tc-getCC)
367 ${CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 418 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
368 local ret=$? 419 local ret=$?
369 rm -f ${temp}.c 420 rm -f ${temp}.c
370 [ "$ret" != "1" ] && return 0 421 [ "$ret" != "1" ] && return 0
371 return 1 422 return 1
372} 423}
373 424
374replace-sparc64-flags() { 425replace-sparc64-flags() {
375 local SPARC64_CPUS="ultrasparc v9" 426 local SPARC64_CPUS="ultrasparc v9"
376 427
377 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 428 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
378 for x in ${SPARC64_CPUS}; do 429 for x in ${SPARC64_CPUS}; do
379 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 430 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
380 done 431 done
381 else 432 else
382 for x in ${SPARC64_CPUS}; do 433 for x in ${SPARC64_CPUS}; do
383 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 434 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
384 done 435 done
385 fi 436 fi
386 437
387 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then 438 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
388 for x in ${SPARC64_CPUS}; do 439 for x in ${SPARC64_CPUS}; do
389 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 440 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
390 done 441 done
391 else 442 else
392 for x in ${SPARC64_CPUS}; do 443 for x in ${SPARC64_CPUS}; do
407 458
408 # we do this fancy spacing stuff so as to not filter 459 # we do this fancy spacing stuff so as to not filter
409 # out part of a flag ... we want flag atoms ! :D 460 # out part of a flag ... we want flag atoms ! :D
410 LDFLAGS=" ${LDFLAGS} " 461 LDFLAGS=" ${LDFLAGS} "
411 for x in "$@" ; do 462 for x in "$@" ; do
412 LDFLAGS="${LDFLAGS// ${x} / }" 463 LDFLAGS=${LDFLAGS// ${x} / }
413 done 464 done
465 [[ -z ${LDFLAGS// } ]] \
466 && LDFLAGS="" \
414 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 467 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
415 export LDFLAGS 468 export LDFLAGS
416 return 0 469 return 0
417} 470}
418 471
419etexec-flags() {
420 # if you're not using a hardened compiler you wont need this
421 # PIC/no-pic kludge in the first place.
422 has_hardened || return 0
423 # this kludge breaks on amd64, and probably other -fPIC dependant
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
434}
435
436fstack-flags() { 472fstack-flags() {
437 if has_ssp; then 473 if gcc-specs-ssp; then
438 [ -z "`is-flag -fno-stack-protector`" ] && 474 [ -z "`is-flag -fno-stack-protector`" ] &&
439 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 475 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
440 fi 476 fi
441 return 0 477 return 0
442} 478}
443 479
445# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more 481# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
446# fixes. 482# fixes.
447# 483#
448# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3 484# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
449gcc2-flags() { 485gcc2-flags() {
450 CFLAGS=${CFLAGS//pentium-mmx/i586} 486 if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
451 CFLAGS=${CFLAGS//pentium[234]/i686} 487 CFLAGS=${CFLAGS//-mtune=/-mcpu=}
452 CFLAGS=${CFLAGS//k6-[23]/k6} 488 CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
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 489 fi
490
491 replace-cpu-flags k6-{2,3} k6
492 replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
493
494 replace-cpu-flags pentium-mmx i586
495 replace-cpu-flags pentium{2,3,4} i686
496
497 replace-cpu-flags ev6{7,8} ev6
471 498
472 export CFLAGS CXXFLAGS 499 export CFLAGS CXXFLAGS
473} 500}

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

  ViewVC Help
Powered by ViewVC 1.1.20