/[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.62 Revision 1.75
1# Copyright 1999-2004 Gentoo Foundation 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.62 2004/07/15 04:59:44 lv Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.75 2004/10/28 01:38:31 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
9IUSE="$IUSE debug" 10IUSE="debug"
11
12# need access to emktemp()
13inherit eutils toolchain-funcs
10 14
11# 15#
12#### filter-flags <flags> #### 16#### filter-flags <flags> ####
13# Remove particular flags from C[XX]FLAGS 17# Remove particular flags from C[XX]FLAGS
14# Matches only complete flags 18# Matches only complete flags
17# Add extra flags to your current C[XX]FLAGS 21# Add extra flags to your current C[XX]FLAGS
18# 22#
19#### replace-flags <orig.flag> <new.flag> ### 23#### replace-flags <orig.flag> <new.flag> ###
20# Replace a flag by another one 24# Replace a flag by another one
21# 25#
22#### replace-cpu-flags <new.cpu> <old.cpus> ### 26#### replace-cpu-flags <old.cpus> <new.cpu> ###
23# Replace march/mcpu flags that specify <old.cpus> 27# Replace march/mcpu flags that specify <old.cpus>
24# with flags that specify <new.cpu> 28# with flags that specify <new.cpu>
25# 29#
26#### is-flag <flag> #### 30#### is-flag <flag> ####
27# Returns "true" if flag is set in C[XX]FLAGS 31# Returns "true" if flag is set in C[XX]FLAGS
68# 72#
69 73
70# C[XX]FLAGS that we allow in strip-flags 74# C[XX]FLAGS that we allow in strip-flags
71setup-allowed-flags() { 75setup-allowed-flags() {
72 if [ -z "${ALLOWED_FLAGS}" ] ; then 76 if [ -z "${ALLOWED_FLAGS}" ] ; then
73 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -fno-unit-at-a-time -pipe -g" 77 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -fno-stack-protector -fno-pie -fno-unit-at-a-time -pipe -g"
74 case "${ARCH}" in 78 case "${ARCH}" in
75 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;; 79 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;;
76 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;; 80 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
77 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;; 81 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
78 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 82 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
79 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 83 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
80 esac 84 esac
81 fi 85 fi
86 # allow a bunch of flags that negate features / control ABI
87 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
88 case "${ARCH}" in
89 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;;
90 esac
91 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"
82 92
83 # C[XX]FLAGS that we are think is ok, but needs testing 93 # C[XX]FLAGS that we are think is ok, but needs testing
84 # NOTE: currently -Os have issues with gcc3 and K6* arch's 94 # NOTE: currently -Os have issues with gcc3 and K6* arch's
85 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 95 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
86 return 0 96 return 0
96 -fstack-protector|-fstack-protector-all) fstack-flags;; 106 -fstack-protector|-fstack-protector-all) fstack-flags;;
97 esac 107 esac
98 done 108 done
99 109
100 for fset in CFLAGS CXXFLAGS; do 110 for fset in CFLAGS CXXFLAGS; do
111 # Looping over the flags instead of using a global
112 # substitution ensures that we're working with flag atoms.
113 # Otherwise globs like -O* have the potential to wipe out the
114 # list of flags.
101 for f in ${!fset}; do 115 for f in ${!fset}; do
102 for x in "$@"; do 116 for x in "$@"; do
103 # Note this should work with globs like -O* 117 # Note this should work with globs like -O*
104 [[ ${f} == ${x} ]] && continue 2 118 [[ ${f} == ${x} ]] && continue 2
105 done 119 done
126 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags 140 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
127 return 0 141 return 0
128} 142}
129 143
130replace-flags() { 144replace-flags() {
131 # we do this fancy spacing stuff so as to not filter 145 local f fset
132 # out part of a flag ... we want flag atoms ! :D 146 declare -a new_CFLAGS new_CXXFLAGS
133 CFLAGS=" ${CFLAGS} " 147
134 CXXFLAGS=" ${CXXFLAGS} " 148 for fset in CFLAGS CXXFLAGS; do
135 CFLAGS="${CFLAGS// ${1} / ${2} }" 149 # Looping over the flags instead of using a global
136 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 150 # substitution ensures that we're working with flag atoms.
137 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 151 # Otherwise globs like -O* have the potential to wipe out the
138 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 152 # list of flags.
139 export CFLAGS CXXFLAGS 153 for f in ${!fset}; do
154 # Note this should work with globs like -O*
155 [[ ${f} == ${1} ]] && f=${2}
156 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
157 done
158 eval export ${fset}=\${new_${fset}\[*]}
159 done
160
140 return 0 161 return 0
141} 162}
142 163
143replace-cpu-flags() { 164replace-cpu-flags() {
144 local oldcpu newcpu="$1" ; shift 165 local newcpu="$#" ; newcpu="${!newcpu}"
145 for oldcpu in "$@" ; do 166 while [ $# -gt 1 ] ; do
167 # quote to make sure that no globbing is done (particularly on
168 # ${oldcpu} prior to calling replace-flags
146 replace-flags -march=${oldcpu} -march=${newcpu} 169 replace-flags "-march=${1}" "-march=${newcpu}"
147 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 170 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
148 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 171 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
172 shift
149 done 173 done
150 return 0 174 return 0
151} 175}
152 176
153is-flag() { 177is-flag() {
154 local x 178 local x
155 179
156 for x in ${CFLAGS} ${CXXFLAGS} ; do 180 for x in ${CFLAGS} ${CXXFLAGS} ; do
181 # Note this should work with globs like -mcpu=ultrasparc*
157 if [ "${x}" == "$1" ] ; then 182 if [[ ${x} == ${1} ]]; then
158 echo true 183 echo true
159 return 0 184 return 0
160 fi 185 fi
161 done 186 done
162 return 1 187 return 1
205 set -f # disable pathname expansion 230 set -f # disable pathname expansion
206 231
207 for x in ${CFLAGS}; do 232 for x in ${CFLAGS}; do
208 for y in ${ALLOWED_FLAGS}; do 233 for y in ${ALLOWED_FLAGS}; do
209 flag=${x%%=*} 234 flag=${x%%=*}
210 if [ "${flag%%${y}}" = "" ]; then 235 if [ "${flag%%${y}}" = "" ] ; then
211 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 236 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
212 break 237 break
213 fi 238 fi
214 done 239 done
215 done 240 done
216 241
217 for x in ${CXXFLAGS}; do 242 for x in ${CXXFLAGS}; do
218 for y in ${ALLOWED_FLAGS}; do 243 for y in ${ALLOWED_FLAGS}; do
219 flag=${x%%=*} 244 flag=${x%%=*}
220 if [ "${flag%%${y}}" = "" ]; then 245 if [ "${flag%%${y}}" = "" ] ; then
221 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 246 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
222 break 247 break
223 fi 248 fi
224 done 249 done
225 done 250 done
238 export CXXFLAGS="${NEW_CXXFLAGS}" 263 export CXXFLAGS="${NEW_CXXFLAGS}"
239 return 0 264 return 0
240} 265}
241 266
242test_flag() { 267test_flag() {
243 local cc=${CC:-gcc} ; cc=${cc%% *} 268 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
244 if ${cc} -S -xc "$@" -o /dev/null /dev/null &>/dev/null; then
245 printf "%s\n" "$*" 269 printf "%s\n" "$*"
246 return 0 270 return 0
247 fi 271 fi
248 return 1 272 return 1
249} 273}
250 274
251test_version_info() { 275test_version_info() {
252 local cc=${CC:-gcc} ; cc=${cc%% *}
253 if [[ $(${cc} --version 2>&1) == *$1* ]]; then 276 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
254 return 0 277 return 0
255 else 278 else
256 return 1 279 return 1
257 fi 280 fi
258} 281}
287 done 310 done
288 return 1 311 return 1
289} 312}
290 313
291has_hardened() { 314has_hardened() {
292 test_version_info Hardened 315 test_version_info Hardened && return 0
316 # the specs file wont exist unless gcc has GCC_SPECS support
317 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \
318 return 0
293 return $? 319 return 1
294} 320}
295 321
296has_pic() { 322has_pic() {
297 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 323 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
298 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 324 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
316has_m64() { 342has_m64() {
317 # this doesnt test if the flag is accepted, it tests if the flag 343 # this doesnt test if the flag is accepted, it tests if the flag
318 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 344 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
319 # please dont replace this function with test_flag in some future 345 # please dont replace this function with test_flag in some future
320 # clean-up! 346 # clean-up!
321 temp=`mktemp` 347 local temp="$(emktemp)"
322 echo "int main() { return(0); }" > ${temp}.c 348 echo "int main() { return(0); }" > ${temp}.c
323 ${CC/ .*/} -m64 -o /dev/null ${temp}.c > /dev/null 2>&1 349 MY_CC=$(tc-getCC)
324 ret=$? 350 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
351 local ret=$?
325 rm -f ${temp}.c 352 rm -f ${temp}.c
326 [ "$ret" != "1" ] && return 0 353 [ "$ret" != "1" ] && return 0
327 return 1 354 return 1
328} 355}
329 356
330has_m32() { 357has_m32() {
331 # this doesnt test if the flag is accepted, it tests if the flag 358 # this doesnt test if the flag is accepted, it tests if the flag
332 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64! 359 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
333 # please dont replace this function with test_flag in some future 360 # please dont replace this function with test_flag in some future
334 # clean-up! 361 # clean-up!
335 temp=`mktemp` 362 local temp="$(emktemp)"
336 echo "int main() { return(0); }" > ${temp}.c 363 echo "int main() { return(0); }" > ${temp}.c
337 ${CC/ .*/} -m32 -o /dev/null ${temp}.c > /dev/null 2>&1 364 MY_CC=$(tc-getCC)
338 ret=$? 365 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
366 local ret=$?
339 rm -f ${temp}.c 367 rm -f ${temp}.c
340 [ "$ret" != "1" ] && return 0 368 [ "$ret" != "1" ] && return 0
341 return 1 369 return 1
342} 370}
343 371
388 416
389etexec-flags() { 417etexec-flags() {
390 # if you're not using a hardened compiler you wont need this 418 # if you're not using a hardened compiler you wont need this
391 # PIC/no-pic kludge in the first place. 419 # PIC/no-pic kludge in the first place.
392 has_hardened || return 0 420 has_hardened || return 0
421 # this kludge breaks on amd64, and probably other -fPIC dependant
422 # archs.
423 use amd64 && return 0
393 424
394 if has_pie || has_pic; then 425 if has_pie || has_pic; then
395 [ -z "`is-flag -fno-pic`" ] && 426 [ -z "`is-flag -fno-pic`" ] &&
396 export CFLAGS="${CFLAGS} `test_flag -fno-pic`" 427 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
397 [ -z "`is-flag -nopie`" ] && 428 [ -z "`is-flag -nopie`" ] &&
405 [ -z "`is-flag -fno-stack-protector`" ] && 436 [ -z "`is-flag -fno-stack-protector`" ] &&
406 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 437 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
407 fi 438 fi
408 return 0 439 return 0
409} 440}
441
442# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
443# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
444# fixes.
445#
446# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
447gcc2-flags() {
448 CFLAGS=${CFLAGS//pentium-mmx/i586}
449 CFLAGS=${CFLAGS//pentium[234]/i686}
450 CFLAGS=${CFLAGS//k6-[23]/k6}
451 CFLAGS=${CFLAGS//athlon-tbird/i686}
452 CFLAGS=${CFLAGS//athlon-4/i686}
453 CFLAGS=${CFLAGS//athlon-[xm]p/i686}
454 CFLAGS=${CFLAGS//athlon/i686}
455
456 CXXFLAGS=${CXXFLAGS//pentium-mmx/i586}
457 CXXFLAGS=${CXXFLAGS//pentium[234]/i686}
458 CXXFLAGS=${CXXFLAGS//k6-[23]/k6}
459 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686}
460 CXXFLAGS=${CXXFLAGS//athlon-4/i686}
461 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686}
462 CXXFLAGS=${CXXFLAGS//athlon/i686}
463
464 if [ "$ARCH" = alpha ]; then
465 CHOST=${CHOST/#alphaev6[78]/alphaev6}
466 CFLAGS=${CFLAGS//ev6[78]/ev6}
467 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6}
468 fi
469
470 export CFLAGS CXXFLAGS
471}

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.75

  ViewVC Help
Powered by ViewVC 1.1.20