/[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.72
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.72 2004/10/09 18:28:46 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.
9IUSE="$IUSE debug" 12IUSE="${IUSE} debug"
13
14# need access to emktemp()
15inherit eutils
10 16
11# 17#
12#### filter-flags <flags> #### 18#### filter-flags <flags> ####
13# Remove particular flags from C[XX]FLAGS 19# Remove particular flags from C[XX]FLAGS
14# Matches only complete flags 20# Matches only complete flags
17# Add extra flags to your current C[XX]FLAGS 23# Add extra flags to your current C[XX]FLAGS
18# 24#
19#### replace-flags <orig.flag> <new.flag> ### 25#### replace-flags <orig.flag> <new.flag> ###
20# Replace a flag by another one 26# Replace a flag by another one
21# 27#
22#### replace-cpu-flags <new.cpu> <old.cpus> ### 28#### replace-cpu-flags <old.cpus> <new.cpu> ###
23# Replace march/mcpu flags that specify <old.cpus> 29# Replace march/mcpu flags that specify <old.cpus>
24# with flags that specify <new.cpu> 30# with flags that specify <new.cpu>
25# 31#
26#### is-flag <flag> #### 32#### is-flag <flag> ####
27# Returns "true" if flag is set in C[XX]FLAGS 33# Returns "true" if flag is set in C[XX]FLAGS
68# 74#
69 75
70# C[XX]FLAGS that we allow in strip-flags 76# C[XX]FLAGS that we allow in strip-flags
71setup-allowed-flags() { 77setup-allowed-flags() {
72 if [ -z "${ALLOWED_FLAGS}" ] ; then 78 if [ -z "${ALLOWED_FLAGS}" ] ; then
73 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -fno-unit-at-a-time -pipe -g" 79 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 80 case "${ARCH}" in
75 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" ;;
76 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;; 82 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
77 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;; 83 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
78 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 84 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
79 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 85 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
80 esac 86 esac
81 fi 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" ;;
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"
82 94
83 # 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
84 # NOTE: currently -Os have issues with gcc3 and K6* arch's 96 # NOTE: currently -Os have issues with gcc3 and K6* arch's
85 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 97 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
86 return 0 98 return 0
96 -fstack-protector|-fstack-protector-all) fstack-flags;; 108 -fstack-protector|-fstack-protector-all) fstack-flags;;
97 esac 109 esac
98 done 110 done
99 111
100 for fset in CFLAGS CXXFLAGS; do 112 for fset in CFLAGS CXXFLAGS; do
113 # Looping over the flags instead of using a global
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.
101 for f in ${!fset}; do 117 for f in ${!fset}; do
102 for x in "$@"; do 118 for x in "$@"; do
103 # Note this should work with globs like -O* 119 # Note this should work with globs like -O*
104 [[ ${f} == ${x} ]] && continue 2 120 [[ ${f} == ${x} ]] && continue 2
105 done 121 done
126 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags 142 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
127 return 0 143 return 0
128} 144}
129 145
130replace-flags() { 146replace-flags() {
131 # we do this fancy spacing stuff so as to not filter 147 local f fset
132 # out part of a flag ... we want flag atoms ! :D 148 declare -a new_CFLAGS new_CXXFLAGS
133 CFLAGS=" ${CFLAGS} " 149
134 CXXFLAGS=" ${CXXFLAGS} " 150 for fset in CFLAGS CXXFLAGS; do
135 CFLAGS="${CFLAGS// ${1} / ${2} }" 151 # Looping over the flags instead of using a global
136 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 152 # substitution ensures that we're working with flag atoms.
137 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 153 # Otherwise globs like -O* have the potential to wipe out the
138 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 154 # list of flags.
139 export CFLAGS CXXFLAGS 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
140 return 0 163 return 0
141} 164}
142 165
143replace-cpu-flags() { 166replace-cpu-flags() {
144 local oldcpu newcpu="$1" ; shift 167 local newcpu="$#" ; newcpu="${!newcpu}"
145 for oldcpu in "$@" ; do 168 while [ $# -gt 1 ] ; do
169 # quote to make sure that no globbing is done (particularly on
170 # ${oldcpu} prior to calling replace-flags
146 replace-flags -march=${oldcpu} -march=${newcpu} 171 replace-flags "-march=${1}" "-march=${newcpu}"
147 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 172 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
148 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 173 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
174 shift
149 done 175 done
150 return 0 176 return 0
151} 177}
152 178
153is-flag() { 179is-flag() {
154 local x 180 local x
155 181
156 for x in ${CFLAGS} ${CXXFLAGS} ; do 182 for x in ${CFLAGS} ${CXXFLAGS} ; do
183 # Note this should work with globs like -mcpu=ultrasparc*
157 if [ "${x}" == "$1" ] ; then 184 if [[ ${x} == ${1} ]]; then
158 echo true 185 echo true
159 return 0 186 return 0
160 fi 187 fi
161 done 188 done
162 return 1 189 return 1
205 set -f # disable pathname expansion 232 set -f # disable pathname expansion
206 233
207 for x in ${CFLAGS}; do 234 for x in ${CFLAGS}; do
208 for y in ${ALLOWED_FLAGS}; do 235 for y in ${ALLOWED_FLAGS}; do
209 flag=${x%%=*} 236 flag=${x%%=*}
210 if [ "${flag%%${y}}" = "" ]; then 237 if [ "${flag%%${y}}" = "" ] ; then
211 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 238 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
212 break 239 break
213 fi 240 fi
214 done 241 done
215 done 242 done
216 243
217 for x in ${CXXFLAGS}; do 244 for x in ${CXXFLAGS}; do
218 for y in ${ALLOWED_FLAGS}; do 245 for y in ${ALLOWED_FLAGS}; do
219 flag=${x%%=*} 246 flag=${x%%=*}
220 if [ "${flag%%${y}}" = "" ]; then 247 if [ "${flag%%${y}}" = "" ] ; then
221 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 248 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
222 break 249 break
223 fi 250 fi
224 done 251 done
225 done 252 done
239 return 0 266 return 0
240} 267}
241 268
242test_flag() { 269test_flag() {
243 local cc=${CC:-gcc} ; cc=${cc%% *} 270 local cc=${CC:-gcc} ; cc=${cc%% *}
244 if ${cc} -S -xc "$@" -o /dev/null /dev/null &>/dev/null; then 271 if ${cc} -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
245 printf "%s\n" "$*" 272 printf "%s\n" "$*"
246 return 0 273 return 0
247 fi 274 fi
248 return 1 275 return 1
249} 276}
287 done 314 done
288 return 1 315 return 1
289} 316}
290 317
291has_hardened() { 318has_hardened() {
292 test_version_info 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
293 return $? 323 return 1
294} 324}
295 325
296has_pic() { 326has_pic() {
297 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 327 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
298 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 328 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
316has_m64() { 346has_m64() {
317 # this doesnt test if the flag is accepted, it tests if the flag 347 # 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! 348 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
319 # please dont replace this function with test_flag in some future 349 # please dont replace this function with test_flag in some future
320 # clean-up! 350 # clean-up!
321 temp=`mktemp` 351 local temp="$(emktemp)"
322 echo "int main() { return(0); }" > ${temp}.c 352 echo "int main() { return(0); }" > ${temp}.c
323 ${CC/ .*/} -m64 -o /dev/null ${temp}.c > /dev/null 2>&1 353 ${CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
324 ret=$? 354 local ret=$?
325 rm -f ${temp}.c 355 rm -f ${temp}.c
326 [ "$ret" != "1" ] && return 0 356 [ "$ret" != "1" ] && return 0
327 return 1 357 return 1
328} 358}
329 359
330has_m32() { 360has_m32() {
331 # this doesnt test if the flag is accepted, it tests if the flag 361 # 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! 362 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
333 # please dont replace this function with test_flag in some future 363 # please dont replace this function with test_flag in some future
334 # clean-up! 364 # clean-up!
335 temp=`mktemp` 365 local temp="$(emktemp)"
336 echo "int main() { return(0); }" > ${temp}.c 366 echo "int main() { return(0); }" > ${temp}.c
337 ${CC/ .*/} -m32 -o /dev/null ${temp}.c > /dev/null 2>&1 367 ${CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
338 ret=$? 368 local ret=$?
339 rm -f ${temp}.c 369 rm -f ${temp}.c
340 [ "$ret" != "1" ] && return 0 370 [ "$ret" != "1" ] && return 0
341 return 1 371 return 1
342} 372}
343 373
388 418
389etexec-flags() { 419etexec-flags() {
390 # if you're not using a hardened compiler you wont need this 420 # if you're not using a hardened compiler you wont need this
391 # PIC/no-pic kludge in the first place. 421 # PIC/no-pic kludge in the first place.
392 has_hardened || return 0 422 has_hardened || return 0
423 # this kludge breaks on amd64, and probably other -fPIC dependant
424 # archs.
425 use amd64 && return 0
393 426
394 if has_pie || has_pic; then 427 if has_pie || has_pic; then
395 [ -z "`is-flag -fno-pic`" ] && 428 [ -z "`is-flag -fno-pic`" ] &&
396 export CFLAGS="${CFLAGS} `test_flag -fno-pic`" 429 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
397 [ -z "`is-flag -nopie`" ] && 430 [ -z "`is-flag -nopie`" ] &&

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

  ViewVC Help
Powered by ViewVC 1.1.20