/[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.78 Revision 1.84
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.78 2004/12/22 21:18:35 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.84 2005/03/18 03:48:14 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"
9 7
10IUSE="debug" 8IUSE="debug"
11 9
12# need access to emktemp() 10# need access to emktemp()
13inherit eutils toolchain-funcs 11inherit eutils toolchain-funcs multilib
14 12
15# 13#
16#### filter-flags <flags> #### 14#### filter-flags <flags> ####
17# Remove particular flags from C[XX]FLAGS 15# Remove particular flags from C[XX]FLAGS
18# Matches only complete flags 16# Matches only complete flags
55# Add extra flags to your current LDFLAGS 53# Add extra flags to your current LDFLAGS
56# 54#
57#### filter-ldflags <flags> #### 55#### filter-ldflags <flags> ####
58# Remove particular flags from LDFLAGS 56# Remove particular flags from LDFLAGS
59# Matches only complete flags 57# Matches only complete flags
60#
61#### etexec-flags ####
62# hooked function for hardened gcc that appends
63# -fno-pic to {C,CXX,LD}FLAGS
64# when a package is filtering -fpic, -fPIC, -fpie, -fPIE
65# 58#
66#### fstack-flags #### 59#### fstack-flags ####
67# hooked function for hardened gcc that appends 60# hooked function for hardened gcc that appends
68# -fno-stack-protector to {C,CXX,LD}FLAGS 61# -fno-stack-protector to {C,CXX,LD}FLAGS
69# when a package is filtering -fstack-protector, -fstack-protector-all 62# when a package is filtering -fstack-protector, -fstack-protector-all
71# when only -fno-stack-protector is given 64# when only -fno-stack-protector is given
72# 65#
73 66
74# C[XX]FLAGS that we allow in strip-flags 67# C[XX]FLAGS that we allow in strip-flags
75setup-allowed-flags() { 68setup-allowed-flags() {
76 if [ -z "${ALLOWED_FLAGS}" ] ; then 69 if [[ -z ${ALLOWED_FLAGS} ]] ; then
77 export ALLOWED_FLAGS="-pipe" 70 export ALLOWED_FLAGS="-pipe"
78 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune" 71 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
79 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fno-stack-protector" 72 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fno-stack-protector"
80 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time" 73 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time"
81 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3" 74 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
82 case "${ARCH}" in 75 case $(tc-arch) in
83 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;; 76 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;;
84 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;; 77 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
85 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;; 78 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
86 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 79 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
87 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 80 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
88 sparc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32 -m64" ;; 81 sparc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32 -m64" ;;
82 ppc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mabi" ;;
89 esac 83 esac
90 fi 84 fi
91 # allow a bunch of flags that negate features / control ABI 85 # allow a bunch of flags that negate features / control ABI
92 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all" 86 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
93 case "${ARCH}" in 87 case $(tc-arch) in
94 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;; 88 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;;
95 esac 89 esac
96 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" 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"
97 91
98 # 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
100 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 94 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
101 return 0 95 return 0
102} 96}
103 97
104filter-flags() { 98filter-flags() {
105 local x f fset 99 local x f fset
106 declare -a new_CFLAGS new_CXXFLAGS 100 declare -a new_CFLAGS new_CXXFLAGS
107 101
108 for x in "$@" ; do 102 for x in "$@" ; do
109 case "${x}" in 103 case "${x}" in
110 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 104 -fPIC|-fpic|-fPIE|-fpie|-pie)
105 append-flags `test_flag -fno-pie`;;
111 -fstack-protector|-fstack-protector-all) fstack-flags;; 106 -fstack-protector|-fstack-protector-all)
107 fstack-flags;;
112 esac 108 esac
113 done 109 done
114 110
115 for fset in CFLAGS CXXFLAGS; do 111 for fset in CFLAGS CXXFLAGS; do
116 # Looping over the flags instead of using a global 112 # Looping over the flags instead of using a global
137append-lfs-flags() { 133append-lfs-flags() {
138 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 134 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
139} 135}
140 136
141append-flags() { 137append-flags() {
138 [[ -z $* ]] && return 0
142 export CFLAGS="${CFLAGS} $*" 139 export CFLAGS="${CFLAGS} $*"
143 export CXXFLAGS="${CXXFLAGS} $*" 140 export CXXFLAGS="${CXXFLAGS} $*"
144 [ -n "`is-flag -fno-stack-protector`" -o \ 141 [ -n "`is-flag -fno-stack-protector`" -o \
145 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags 142 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
146 return 0 143 return 0
147} 144}
148 145
149replace-flags() { 146replace-flags() {
150 local f fset 147 local f fset
151 declare -a new_CFLAGS new_CXXFLAGS 148 declare -a new_CFLAGS new_CXXFLAGS
152 149
153 for fset in CFLAGS CXXFLAGS; do 150 for fset in CFLAGS CXXFLAGS; do
154 # Looping over the flags instead of using a global 151 # Looping over the flags instead of using a global
155 # substitution ensures that we're working with flag atoms. 152 # substitution ensures that we're working with flag atoms.
225 222
226 local NEW_CFLAGS="" 223 local NEW_CFLAGS=""
227 local NEW_CXXFLAGS="" 224 local NEW_CXXFLAGS=""
228 225
229 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 226 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
230 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then 227 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
231 use debug && einfo "Enabling the use of some unstable flags" 228 use debug && einfo "Enabling the use of some unstable flags"
232 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 229 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
233 fi 230 fi
234 231
235 set -f # disable pathname expansion 232 set -f # disable pathname expansion
322 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \ 319 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \
323 return 0 320 return 0
324 return 1 321 return 1
325} 322}
326 323
324# indicate whether PIC is set
327has_pic() { 325has_pic() {
328 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 326 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
329 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 327 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
328 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
330 test_version_info pie && return 0 329 test_version_info pie && return 0
331 return 1 330 return 1
332} 331}
333 332
333# indicate whether PIE is set
334has_pie() { 334has_pie() {
335 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 335 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
336 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0 336 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
337 test_version_info pie && 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
338 return 1 340 return 1
339} 341}
340 342
343# indicate whether code for SSP is being generated
341has_ssp() { 344has_ssp() {
345 # note; this matches both -fstack-protector and -fstack-protector-all
342 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 346 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
343 test_version_info ssp && return 0 347 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0
344 return 1 348 return 1
345} 349}
346 350
347has_m64() { 351has_m64() {
348 # this doesnt test if the flag is accepted, it tests if the flag 352 # this doesnt test if the flag is accepted, it tests if the flag
362has_m32() { 366has_m32() {
363 # this doesnt test if the flag is accepted, it tests if the flag 367 # 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! 368 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
365 # please dont replace this function with test_flag in some future 369 # please dont replace this function with test_flag in some future
366 # clean-up! 370 # clean-up!
371
372 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
373
367 local temp="$(emktemp)" 374 local temp="$(emktemp)"
368 echo "int main() { return(0); }" > ${temp}.c 375 echo "int main() { return(0); }" > ${temp}.c
369 MY_CC=$(tc-getCC) 376 MY_CC=$(tc-getCC)
370 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1 377 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
371 local ret=$? 378 local ret=$?
375} 382}
376 383
377replace-sparc64-flags() { 384replace-sparc64-flags() {
378 local SPARC64_CPUS="ultrasparc v9" 385 local SPARC64_CPUS="ultrasparc v9"
379 386
380 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then 387 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
381 for x in ${SPARC64_CPUS}; do 388 for x in ${SPARC64_CPUS}; do
382 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 389 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
383 done 390 done
384 else 391 else
385 for x in ${SPARC64_CPUS}; do 392 for x in ${SPARC64_CPUS}; do
386 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 393 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
387 done 394 done
388 fi 395 fi
389 396
390 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then 397 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
391 for x in ${SPARC64_CPUS}; do 398 for x in ${SPARC64_CPUS}; do
392 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 399 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
393 done 400 done
394 else 401 else
395 for x in ${SPARC64_CPUS}; do 402 for x in ${SPARC64_CPUS}; do
410 417
411 # we do this fancy spacing stuff so as to not filter 418 # we do this fancy spacing stuff so as to not filter
412 # out part of a flag ... we want flag atoms ! :D 419 # out part of a flag ... we want flag atoms ! :D
413 LDFLAGS=" ${LDFLAGS} " 420 LDFLAGS=" ${LDFLAGS} "
414 for x in "$@" ; do 421 for x in "$@" ; do
415 LDFLAGS="${LDFLAGS// ${x} / }" 422 LDFLAGS=${LDFLAGS// ${x} / }
416 done 423 done
424 [[ -z ${LDFLAGS// } ]] \
425 && LDFLAGS="" \
417 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 426 || LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
418 export LDFLAGS 427 export LDFLAGS
419 return 0
420}
421
422etexec-flags() {
423 # if you're not using a hardened compiler you wont need this
424 # PIC/no-pic kludge in the first place.
425 has_hardened || return 0
426 use amd64 && return 0
427 use mips && return 0
428
429 if has_pie || has_pic; then
430 [ -z "`is-flag -fno-pic`" ] &&
431 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
432 [ -z "`is-flag -nopie`" ] &&
433 export CFLAGS="${CFLAGS} `test_flag -nopie`"
434 fi
435 return 0 428 return 0
436} 429}
437 430
438fstack-flags() { 431fstack-flags() {
439 if has_ssp; then 432 if has_ssp; then
440 [ -z "`is-flag -fno-stack-protector`" ] && 433 [ -z "`is-flag -fno-stack-protector`" ] &&
441 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 434 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
442 fi 435 fi
443 return 0 436 return 0
444} 437}
445 438
463 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686} 456 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686}
464 CXXFLAGS=${CXXFLAGS//athlon-4/i686} 457 CXXFLAGS=${CXXFLAGS//athlon-4/i686}
465 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686} 458 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686}
466 CXXFLAGS=${CXXFLAGS//athlon/i686} 459 CXXFLAGS=${CXXFLAGS//athlon/i686}
467 460
468 if [ "$ARCH" = alpha ]; then 461 if [[ $(tc-arch) == "alpha" ]] ; then
469 CHOST=${CHOST/#alphaev6[78]/alphaev6} 462 CHOST=${CHOST/#alphaev6[78]/alphaev6}
470 CFLAGS=${CFLAGS//ev6[78]/ev6} 463 CFLAGS=${CFLAGS//ev6[78]/ev6}
471 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6} 464 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6}
472 fi 465 fi
473 466

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.84

  ViewVC Help
Powered by ViewVC 1.1.20