/[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.59 Revision 1.79
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.59 2004/06/25 00:18:04 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.79 2004/12/25 18:45:56 chriswhite 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="-pipe"
78 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
79 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fno-stack-protector"
80 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 case "${ARCH}" in 82 case "${ARCH}" in
75 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;; 83 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;;
76 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;; 84 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
77 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;; 85 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
78 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 86 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
79 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 87 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
88 sparc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32 -m64" ;;
89 ppc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mabi" ;;
80 esac 90 esac
81 fi 91 fi
92 # allow a bunch of flags that negate features / control ABI
93 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
94 case "${ARCH}" in
95 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;;
96 esac
97 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 98
83 # C[XX]FLAGS that we are think is ok, but needs testing 99 # C[XX]FLAGS that we are think is ok, but needs testing
84 # NOTE: currently -Os have issues with gcc3 and K6* arch's 100 # NOTE: currently -Os have issues with gcc3 and K6* arch's
85 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 101 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
86 return 0 102 return 0
87} 103}
88 104
89filter-flags() { 105filter-flags() {
90 local x 106 local x f fset
107 declare -a new_CFLAGS new_CXXFLAGS
91 108
92 for x in "$@" ; do 109 for x in "$@" ; do
93 case "${x}" in 110 case "${x}" in
94 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 111 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;;
95 -fstack-protector|-fstack-protector-all) fstack-flags;; 112 -fstack-protector|-fstack-protector-all) fstack-flags;;
96 *) ;;
97 esac 113 esac
98 done 114 done
99 115
100 # we do this fancy spacing stuff so as to not filter 116 for fset in CFLAGS CXXFLAGS; do
101 # out part of a flag ... we want flag atoms ! :D 117 # Looping over the flags instead of using a global
102 CFLAGS=" ${CFLAGS} " 118 # substitution ensures that we're working with flag atoms.
103 CXXFLAGS=" ${CXXFLAGS} " 119 # Otherwise globs like -O* have the potential to wipe out the
120 # list of flags.
121 for f in ${!fset}; do
104 for x in "$@" ; do 122 for x in "$@"; do
105 CFLAGS="${CFLAGS// ${x} / }" 123 # Note this should work with globs like -O*
106 CXXFLAGS="${CXXFLAGS// ${x} / }" 124 [[ ${f} == ${x} ]] && continue 2
125 done
126 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
107 done 127 done
108 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 128 eval export ${fset}=\${new_${fset}\[*]}
109 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 129 done
110 export CFLAGS CXXFLAGS 130
111 return 0 131 return 0
112} 132}
113 133
114filter-lfs-flags() { 134filter-lfs-flags() {
115 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 135 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
… …
126 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags 146 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
127 return 0 147 return 0
128} 148}
129 149
130replace-flags() { 150replace-flags() {
131 # we do this fancy spacing stuff so as to not filter 151 local f fset
132 # out part of a flag ... we want flag atoms ! :D 152 declare -a new_CFLAGS new_CXXFLAGS
133 CFLAGS=" ${CFLAGS} " 153
134 CXXFLAGS=" ${CXXFLAGS} " 154 for fset in CFLAGS CXXFLAGS; do
135 CFLAGS="${CFLAGS// ${1} / ${2} }" 155 # Looping over the flags instead of using a global
136 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 156 # substitution ensures that we're working with flag atoms.
137 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 157 # Otherwise globs like -O* have the potential to wipe out the
138 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 158 # list of flags.
139 export CFLAGS CXXFLAGS 159 for f in ${!fset}; do
160 # Note this should work with globs like -O*
161 [[ ${f} == ${1} ]] && f=${2}
162 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
163 done
164 eval export ${fset}=\${new_${fset}\[*]}
165 done
166
140 return 0 167 return 0
141} 168}
142 169
143replace-cpu-flags() { 170replace-cpu-flags() {
144 local oldcpu newcpu="$1" ; shift 171 local newcpu="$#" ; newcpu="${!newcpu}"
145 for oldcpu in "$@" ; do 172 while [ $# -gt 1 ] ; do
173 # quote to make sure that no globbing is done (particularly on
174 # ${oldcpu} prior to calling replace-flags
146 replace-flags -march=${oldcpu} -march=${newcpu} 175 replace-flags "-march=${1}" "-march=${newcpu}"
147 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 176 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
148 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 177 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
178 shift
149 done 179 done
150 return 0 180 return 0
151} 181}
152 182
153is-flag() { 183is-flag() {
154 local x 184 local x
155 185
156 for x in ${CFLAGS} ${CXXFLAGS} ; do 186 for x in ${CFLAGS} ${CXXFLAGS} ; do
187 # Note this should work with globs like -mcpu=ultrasparc*
157 if [ "${x}" == "$1" ] ; then 188 if [[ ${x} == ${1} ]]; then
158 echo true 189 echo true
159 return 0 190 return 0
160 fi 191 fi
161 done 192 done
162 return 1 193 return 1
… …
205 set -f # disable pathname expansion 236 set -f # disable pathname expansion
206 237
207 for x in ${CFLAGS}; do 238 for x in ${CFLAGS}; do
208 for y in ${ALLOWED_FLAGS}; do 239 for y in ${ALLOWED_FLAGS}; do
209 flag=${x%%=*} 240 flag=${x%%=*}
210 if [ "${flag%%${y}}" = "" ]; then 241 if [ "${flag%%${y}}" = "" ] ; then
211 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 242 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
212 break 243 break
213 fi 244 fi
214 done 245 done
215 done 246 done
216 247
217 for x in ${CXXFLAGS}; do 248 for x in ${CXXFLAGS}; do
218 for y in ${ALLOWED_FLAGS}; do 249 for y in ${ALLOWED_FLAGS}; do
219 flag=${x%%=*} 250 flag=${x%%=*}
220 if [ "${flag%%${y}}" = "" ]; then 251 if [ "${flag%%${y}}" = "" ] ; then
221 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 252 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
222 break 253 break
223 fi 254 fi
224 done 255 done
225 done 256 done
… …
238 export CXXFLAGS="${NEW_CXXFLAGS}" 269 export CXXFLAGS="${NEW_CXXFLAGS}"
239 return 0 270 return 0
240} 271}
241 272
242test_flag() { 273test_flag() {
243 local cc=${CC:-gcc} ; cc=${cc%% *} 274 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" "$*" 275 printf "%s\n" "$*"
246 return 0 276 return 0
247 fi 277 fi
248 return 1 278 return 1
249} 279}
250 280
251test_version_info() { 281test_version_info() {
252 local cc=${CC:-gcc} ; cc=${cc%% *}
253 if [[ $(${cc} --version 2>&1) == *$1* ]]; then 282 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
254 return 0 283 return 0
255 else 284 else
256 return 1 285 return 1
257 fi 286 fi
258} 287}
… …
287 done 316 done
288 return 1 317 return 1
289} 318}
290 319
291has_hardened() { 320has_hardened() {
292 test_version_info Hardened 321 test_version_info Hardened && return 0
322 # the specs file wont exist unless gcc has GCC_SPECS support
323 [ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \
324 return 0
293 return $? 325 return 1
294} 326}
295 327
296has_pic() { 328has_pic() {
297 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 329 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
298 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 330 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
… …
312 test_version_info ssp && return 0 344 test_version_info ssp && return 0
313 return 1 345 return 1
314} 346}
315 347
316has_m64() { 348has_m64() {
317 test_flag -m64 349 # this doesnt test if the flag is accepted, it tests if the flag
350 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
351 # please dont replace this function with test_flag in some future
352 # clean-up!
353 local temp="$(emktemp)"
354 echo "int main() { return(0); }" > ${temp}.c
355 MY_CC=$(tc-getCC)
356 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
357 local ret=$?
358 rm -f ${temp}.c
359 [ "$ret" != "1" ] && return 0
318 return $? 360 return 1
319} 361}
320 362
321has_m32() { 363has_m32() {
322 test_flag -m32 364 # this doesnt test if the flag is accepted, it tests if the flag
365 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
366 # please dont replace this function with test_flag in some future
367 # clean-up!
368 local temp="$(emktemp)"
369 echo "int main() { return(0); }" > ${temp}.c
370 MY_CC=$(tc-getCC)
371 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
372 local ret=$?
373 rm -f ${temp}.c
374 [ "$ret" != "1" ] && return 0
323 return $? 375 return 1
324} 376}
325 377
326replace-sparc64-flags() { 378replace-sparc64-flags() {
327 local SPARC64_CPUS="ultrasparc v9" 379 local SPARC64_CPUS="ultrasparc v9"
328 380
… …
370 422
371etexec-flags() { 423etexec-flags() {
372 # if you're not using a hardened compiler you wont need this 424 # if you're not using a hardened compiler you wont need this
373 # PIC/no-pic kludge in the first place. 425 # PIC/no-pic kludge in the first place.
374 has_hardened || return 0 426 has_hardened || return 0
427 use amd64 && return 0
428 use mips && return 0
375 429
376 if has_pie || has_pic; then 430 if has_pie || has_pic; then
377 [ -z "`is-flag -fno-pic`" ] && 431 [ -z "`is-flag -fno-pic`" ] &&
378 export CFLAGS="${CFLAGS} `test_flag -fno-pic`" 432 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
379 [ -z "`is-flag -nopie`" ] && 433 [ -z "`is-flag -nopie`" ] &&
… …
387 [ -z "`is-flag -fno-stack-protector`" ] && 441 [ -z "`is-flag -fno-stack-protector`" ] &&
388 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 442 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
389 fi 443 fi
390 return 0 444 return 0
391} 445}
446
447# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
448# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
449# fixes.
450#
451# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
452gcc2-flags() {
453 CFLAGS=${CFLAGS//pentium-mmx/i586}
454 CFLAGS=${CFLAGS//pentium[234]/i686}
455 CFLAGS=${CFLAGS//k6-[23]/k6}
456 CFLAGS=${CFLAGS//athlon-tbird/i686}
457 CFLAGS=${CFLAGS//athlon-4/i686}
458 CFLAGS=${CFLAGS//athlon-[xm]p/i686}
459 CFLAGS=${CFLAGS//athlon/i686}
460
461 CXXFLAGS=${CXXFLAGS//pentium-mmx/i586}
462 CXXFLAGS=${CXXFLAGS//pentium[234]/i686}
463 CXXFLAGS=${CXXFLAGS//k6-[23]/k6}
464 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686}
465 CXXFLAGS=${CXXFLAGS//athlon-4/i686}
466 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686}
467 CXXFLAGS=${CXXFLAGS//athlon/i686}
468
469 if [ "$ARCH" = alpha ]; then
470 CHOST=${CHOST/#alphaev6[78]/alphaev6}
471 CFLAGS=${CFLAGS//ev6[78]/ev6}
472 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6}
473 fi
474
475 export CFLAGS CXXFLAGS
476}
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.79
  ViewVC Help
Powered by ViewVC 1.1.13