/[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.47 Revision 1.82
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.47 2004/04/12 02:33:29 swtaylor Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.82 2005/02/07 17:50:24 solar 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
10IUSE="debug"
11
12# need access to emktemp()
13inherit eutils toolchain-funcs multilib
9 14
10# 15#
11#### filter-flags <flags> #### 16#### filter-flags <flags> ####
12# Remove particular flags from C[XX]FLAGS 17# Remove particular flags from C[XX]FLAGS
13# Matches only complete flags 18# Matches only complete flags
16# Add extra flags to your current C[XX]FLAGS 21# Add extra flags to your current C[XX]FLAGS
17# 22#
18#### replace-flags <orig.flag> <new.flag> ### 23#### replace-flags <orig.flag> <new.flag> ###
19# Replace a flag by another one 24# Replace a flag by another one
20# 25#
21#### replace-cpu-flags <new.cpu> <old.cpus> ### 26#### replace-cpu-flags <old.cpus> <new.cpu> ###
22# Replace march/mcpu flags that specify <old.cpus> 27# Replace march/mcpu flags that specify <old.cpus>
23# with flags that specify <new.cpu> 28# with flags that specify <new.cpu>
24# 29#
25#### is-flag <flag> #### 30#### is-flag <flag> ####
26# Returns "true" if flag is set in C[XX]FLAGS 31# Returns "true" if flag is set in C[XX]FLAGS
51# 56#
52#### filter-ldflags <flags> #### 57#### filter-ldflags <flags> ####
53# Remove particular flags from LDFLAGS 58# Remove particular flags from LDFLAGS
54# Matches only complete flags 59# Matches only complete flags
55# 60#
56#### etexec-flags ####
57# hooked function for hardened-gcc that appends
58# -yet_exec {C,CXX,LD}FLAGS when hardened-gcc is installed
59# and a package is filtering -fPIC,-fpic, -fPIE, -fpie
60#
61#### fstack-flags #### 61#### fstack-flags ####
62# hooked function for hardened-gcc that appends 62# hooked function for hardened gcc that appends
63# -yno_propolice to {C,CXX,LD}FLAGS when hardened-gcc is installed 63# -fno-stack-protector to {C,CXX,LD}FLAGS
64# and a package is filtering -fstack-protector, -fstack-protector-all 64# when a package is filtering -fstack-protector, -fstack-protector-all
65# notice: modern automatic specs files will also suppress -fstack-protector-all
66# when only -fno-stack-protector is given
65# 67#
66 68
67# C[XX]FLAGS that we allow in strip-flags 69# C[XX]FLAGS that we allow in strip-flags
68setup-allowed-flags() { 70setup-allowed-flags() {
69 if [ -z "${ALLOWED_FLAGS}" ] ; then 71 if [ -z "${ALLOWED_FLAGS}" ] ; then
70 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -pipe -g" 72 export ALLOWED_FLAGS="-pipe"
73 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
74 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fno-stack-protector"
75 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time"
76 export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
71 case "${ARCH}" in 77 case "${ARCH}" in
72 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;; 78 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -EL -EB -mabi" ;;
73 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 79 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
80 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
74 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 81 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
75 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 82 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
83 sparc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32 -m64" ;;
84 ppc) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mabi" ;;
76 esac 85 esac
77 fi 86 fi
87 # allow a bunch of flags that negate features / control ABI
88 ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
89 case "${ARCH}" in
90 x86|amd64|ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" ;;
91 esac
92 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"
78 93
79 # C[XX]FLAGS that we are think is ok, but needs testing 94 # C[XX]FLAGS that we are think is ok, but needs testing
80 # NOTE: currently -Os have issues with gcc3 and K6* arch's 95 # NOTE: currently -Os have issues with gcc3 and K6* arch's
81 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 96 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
82 return 0 97 return 0
83} 98}
84 99
85filter-flags() { 100filter-flags() {
101 local x f fset
102 declare -a new_CFLAGS new_CXXFLAGS
103
86 for x in "$@" ; do 104 for x in "$@" ; do
87 case "${x}" in 105 case "${x}" in
88 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 106 -fPIC|-fpic|-fPIE|-fpie|-pie)
107 append-flags `test_flag -fno-pie`;;
89 -fstack-protector|-fstack-protector-all) fstack-flags;; 108 -fstack-protector|-fstack-protector-all)
90 *) ;; 109 fstack-flags;;
91 esac 110 esac
92 done 111 done
93 112
94 # we do this fancy spacing stuff so as to not filter 113 for fset in CFLAGS CXXFLAGS; do
95 # out part of a flag ... we want flag atoms ! :D 114 # Looping over the flags instead of using a global
96 CFLAGS=" ${CFLAGS} " 115 # substitution ensures that we're working with flag atoms.
97 CXXFLAGS=" ${CXXFLAGS} " 116 # Otherwise globs like -O* have the potential to wipe out the
117 # list of flags.
118 for f in ${!fset}; do
98 for x in "$@" ; do 119 for x in "$@"; do
99 CFLAGS="${CFLAGS// ${x} / }" 120 # Note this should work with globs like -O*
100 CXXFLAGS="${CXXFLAGS// ${x} / }" 121 [[ ${f} == ${x} ]] && continue 2
122 done
123 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
101 done 124 done
102 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 125 eval export ${fset}=\${new_${fset}\[*]}
103 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 126 done
127
104 return 0 128 return 0
105} 129}
106 130
107filter-lfs-flags() { 131filter-lfs-flags() {
108 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 132 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
109} 133}
110 134
135append-lfs-flags() {
136 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
137}
138
111append-flags() { 139append-flags() {
140 [[ -z $* ]] && return 0
112 export CFLAGS="${CFLAGS} $@" 141 export CFLAGS="${CFLAGS} $*"
113 export CXXFLAGS="${CXXFLAGS} $@" 142 export CXXFLAGS="${CXXFLAGS} $*"
114 [ "`is-flag -fno-stack-protector`" -o "`is-flag -fno-stack-protector-all`" ] && fstack-flags 143 [ -n "`is-flag -fno-stack-protector`" -o \
144 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
115 return 0 145 return 0
116} 146}
117 147
118replace-flags() { 148replace-flags() {
119 # we do this fancy spacing stuff so as to not filter 149 local f fset
120 # out part of a flag ... we want flag atoms ! :D 150 declare -a new_CFLAGS new_CXXFLAGS
121 CFLAGS=" ${CFLAGS} " 151
122 CXXFLAGS=" ${CXXFLAGS} " 152 for fset in CFLAGS CXXFLAGS; do
123 CFLAGS="${CFLAGS// ${1} / ${2} }" 153 # Looping over the flags instead of using a global
124 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 154 # substitution ensures that we're working with flag atoms.
125 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 155 # Otherwise globs like -O* have the potential to wipe out the
126 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 156 # list of flags.
157 for f in ${!fset}; do
158 # Note this should work with globs like -O*
159 [[ ${f} == ${1} ]] && f=${2}
160 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
161 done
162 eval export ${fset}=\${new_${fset}\[*]}
163 done
164
127 return 0 165 return 0
128} 166}
129 167
130replace-cpu-flags() { 168replace-cpu-flags() {
131 local newcpu="$1" ; shift 169 local newcpu="$#" ; newcpu="${!newcpu}"
132 local oldcpu="" 170 while [ $# -gt 1 ] ; do
133 for oldcpu in "$@" ; do 171 # quote to make sure that no globbing is done (particularly on
172 # ${oldcpu} prior to calling replace-flags
134 replace-flags -march=${oldcpu} -march=${newcpu} 173 replace-flags "-march=${1}" "-march=${newcpu}"
135 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 174 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
136 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 175 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
176 shift
137 done 177 done
138 return 0 178 return 0
139} 179}
140 180
141is-flag() { 181is-flag() {
182 local x
183
142 for x in ${CFLAGS} ${CXXFLAGS} ; do 184 for x in ${CFLAGS} ${CXXFLAGS} ; do
185 # Note this should work with globs like -mcpu=ultrasparc*
143 if [ "${x}" == "$1" ] ; then 186 if [[ ${x} == ${1} ]]; then
144 echo true 187 echo true
145 return 0 188 return 0
146 fi 189 fi
147 done 190 done
148 return 1 191 return 1
149} 192}
150 193
151filter-mfpmath() { 194filter-mfpmath() {
195 local orig_mfpmath new_math prune_math
196
152 # save the original -mfpmath flag 197 # save the original -mfpmath flag
153 local orig_mfpmath="`get-flag -mfpmath`" 198 orig_mfpmath="`get-flag -mfpmath`"
154 # get the value of the current -mfpmath flag 199 # get the value of the current -mfpmath flag
155 local new_math=" `get-flag mfpmath | tr , ' '` " 200 new_math=" `get-flag mfpmath | tr , ' '` "
156 # figure out which math values are to be removed 201 # figure out which math values are to be removed
157 local prune_math="" 202 prune_math=""
158 for prune_math in "$@" ; do 203 for prune_math in "$@" ; do
159 new_math="${new_math/ ${prune_math} / }" 204 new_math="${new_math/ ${prune_math} / }"
160 done 205 done
161 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 206 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`"
162 207
171 fi 216 fi
172 return 0 217 return 0
173} 218}
174 219
175strip-flags() { 220strip-flags() {
221 local x y flag NEW_CFLAGS NEW_CXXFLAGS
222
176 setup-allowed-flags 223 setup-allowed-flags
177 224
178 local NEW_CFLAGS="" 225 local NEW_CFLAGS=""
179 local NEW_CXXFLAGS="" 226 local NEW_CXXFLAGS=""
180 227
181 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 228 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
182 if [ `has ~${ARCH} ${ACCEPT_KEYWORDS}` ] ; then 229 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then
183 [ `use debug` ] && einfo "Enabling the use of some unstable flags" 230 use debug && einfo "Enabling the use of some unstable flags"
184 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 231 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
185 fi 232 fi
186 233
187 set -f 234 set -f # disable pathname expansion
188 235
189 for x in ${CFLAGS} 236 for x in ${CFLAGS}; do
190 do
191 for y in ${ALLOWED_FLAGS} 237 for y in ${ALLOWED_FLAGS}; do
192 do
193 flag=${x%%=*} 238 flag=${x%%=*}
194 if [ "${flag%%${y}}" = "" ] 239 if [ "${flag%%${y}}" = "" ] ; then
195 then
196 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 240 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
197 break 241 break
198 fi 242 fi
199 done 243 done
200 done 244 done
201 245
202 for x in ${CXXFLAGS} 246 for x in ${CXXFLAGS}; do
203 do
204 for y in ${ALLOWED_FLAGS} 247 for y in ${ALLOWED_FLAGS}; do
205 do
206 flag=${x%%=*} 248 flag=${x%%=*}
207 if [ "${flag%%${y}}" = "" ] 249 if [ "${flag%%${y}}" = "" ] ; then
208 then
209 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 250 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
210 break 251 break
211 fi 252 fi
212 done 253 done
213 done 254 done
218 fi 259 fi
219 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 260 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then
220 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 261 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2"
221 fi 262 fi
222 263
223 set +f 264 set +f # re-enable pathname expansion
224
225 [ `use debug` ] \
226 && einfo "CFLAGS=\"${NEW_CFLAGS}\"" \
227 && einfo "CXXFLAGS=\"${NEW_CXXFLAGS}\""
228 265
229 export CFLAGS="${NEW_CFLAGS}" 266 export CFLAGS="${NEW_CFLAGS}"
230 export CXXFLAGS="${NEW_CXXFLAGS}" 267 export CXXFLAGS="${NEW_CXXFLAGS}"
231 return 0 268 return 0
232} 269}
233 270
234test_flag() { 271test_flag() {
235 if [ -z "`gcc -S -xc "$@" -o /dev/null /dev/null 2>&1`" ]; then 272 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
236 echo "$@" 273 printf "%s\n" "$*"
237 return 0 274 return 0
238 fi 275 fi
239 return 1 276 return 1
240} 277}
241 278
279test_version_info() {
280 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
281 return 0
282 else
283 return 1
284 fi
285}
286
242strip-unsupported-flags() { 287strip-unsupported-flags() {
288 local NEW_CFLAGS NEW_CXXFLAGS
289
243 for x in ${CFLAGS} ; do 290 for x in ${CFLAGS} ; do
244 NEW_CFLAGS=${NEW_CFLAGS}" ""`test_flag ${x}`" 291 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`"
245 done 292 done
246 for x in ${CXXFLAGS} ; do 293 for x in ${CXXFLAGS} ; do
247 NEW_CXXFLAGS=${NEW_CXXFLAGS}" ""`test_flag ${x}`" 294 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`"
248 done 295 done
249 296
250 export CFLAGS="${NEW_CFLAGS}" 297 export CFLAGS="${NEW_CFLAGS}"
251 export CXXFLAGS="${NEW_CXXFLAGS}" 298 export CXXFLAGS="${NEW_CXXFLAGS}"
252} 299}
253 300
254get-flag() { 301get-flag() {
302 local f findflag="$1"
303
255 # this code looks a little flaky but seems to work for 304 # this code looks a little flaky but seems to work for
256 # everything we want ... 305 # everything we want ...
257 # for example, if CFLAGS="-march=i686": 306 # for example, if CFLAGS="-march=i686":
258 # `get-flags -march` == "-march=i686" 307 # `get-flag -march` == "-march=i686"
259 # `get-flags march` == "i686" 308 # `get-flag march` == "i686"
260 local findflag="$1"
261 for f in ${CFLAGS} ${CXXFLAGS} ; do 309 for f in ${CFLAGS} ${CXXFLAGS} ; do
262 if [ "${f/${findflag}}" != "${f}" ] ; then 310 if [ "${f/${findflag}}" != "${f}" ] ; then
263 echo "${f/-${findflag}=}" 311 printf "%s\n" "${f/-${findflag}=}"
264 return 0 312 return 0
265 fi 313 fi
266 done 314 done
267 return 1 315 return 1
268} 316}
269 317
318has_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
323 return 1
324}
325
326# indicate whether PIC is set
270has_pic() { 327has_pic() {
271 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 328 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
272 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 329 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
273 has_version sys-devel/hardened-gcc && return 0 330 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
274 [ ! -z "`${CC/ .*/} --version| grep pie`" ] && return 0 331 test_version_info pie && return 0
275 return 1 332 return 1
276} 333}
277 334
335# indicate whether PIE is set
278has_pie() { 336has_pie() {
279 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 337 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
280 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0 338 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
281 has_version sys-devel/hardened-gcc && return 0 339 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0
282 [ ! -z "`${CC/ .*/} --version| grep pie`" ] && return 0 340 # test PIC while waiting for specs to be updated to generate __PIE__
341 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
283 return 1 342 return 1
284} 343}
285 344
345# indicate whether code for SSP is being generated
286has_ssp() { 346has_ssp() {
347 # note; this matches both -fstack-protector and -fstack-protector-all
287 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 348 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
288 has_version sys-devel/hardened-gcc && return 0 349 [ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0
289 [ ! -z "`${CC/ .*/} --version| grep ssp`" ] && return 0 350 return 1
351}
352
353has_m64() {
354 # this doesnt test if the flag is accepted, it tests if the flag
355 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
356 # please dont replace this function with test_flag in some future
357 # clean-up!
358 local temp="$(emktemp)"
359 echo "int main() { return(0); }" > ${temp}.c
360 MY_CC=$(tc-getCC)
361 ${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
362 local ret=$?
363 rm -f ${temp}.c
364 [ "$ret" != "1" ] && return 0
365 return 1
366}
367
368has_m32() {
369 # this doesnt test if the flag is accepted, it tests if the flag
370 # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
371 # please dont replace this function with test_flag in some future
372 # clean-up!
373
374 [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
375
376 local temp="$(emktemp)"
377 echo "int main() { return(0); }" > ${temp}.c
378 MY_CC=$(tc-getCC)
379 ${MY_CC/ .*/} -m32 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
380 local ret=$?
381 rm -f ${temp}.c
382 [ "$ret" != "1" ] && return 0
290 return 1 383 return 1
291} 384}
292 385
293replace-sparc64-flags() { 386replace-sparc64-flags() {
294 local SPARC64_CPUS="ultrasparc v9" 387 local SPARC64_CPUS="ultrasparc v9"
295 388
296 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ] 389 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
297 then
298 for x in ${SPARC64_CPUS} 390 for x in ${SPARC64_CPUS}; do
299 do
300 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 391 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
301 done 392 done
302 else 393 else
303 for x in ${SPARC64_CPUS} 394 for x in ${SPARC64_CPUS}; do
304 do
305 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 395 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
306 done 396 done
307 fi 397 fi
308 398
309 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ] 399 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
310 then
311 for x in ${SPARC64_CPUS} 400 for x in ${SPARC64_CPUS}; do
312 do
313 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 401 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
314 done 402 done
315 else 403 else
316 for x in ${SPARC64_CPUS} 404 for x in ${SPARC64_CPUS}; do
317 do
318 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 405 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
319 done 406 done
320 fi 407 fi
408
409 export CFLAGS CXXFLAGS
321} 410}
322 411
323append-ldflags() { 412append-ldflags() {
324 LDFLAGS="${LDFLAGS} $@" 413 export LDFLAGS="${LDFLAGS} $*"
325 return 0 414 return 0
326} 415}
327 416
328filter-ldflags() { 417filter-ldflags() {
418 local x
419
329 # we do this fancy spacing stuff so as to not filter 420 # we do this fancy spacing stuff so as to not filter
330 # out part of a flag ... we want flag atoms ! :D 421 # out part of a flag ... we want flag atoms ! :D
331 LDFLAGS=" ${LDFLAGS} " 422 LDFLAGS=" ${LDFLAGS} "
332 for x in "$@" ; do 423 for x in "$@" ; do
333 LDFLAGS="${LDFLAGS// ${x} / }" 424 LDFLAGS="${LDFLAGS// ${x} / }"
334 done 425 done
335 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 426 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}"
427 export LDFLAGS
336 return 0 428 return 0
337}
338
339etexec-flags() {
340 has_pie || has_pic
341 if [ $? == 0 ] ; then
342 [ -z "`is-flag -yet_exec`" ] &&
343 export CFLAGS="${CFLAGS} `test_flag -yet_exec`"
344 [ -z "`is-flag -nopie`" ] &&
345 export CFLAGS="${CFLAGS} `test_flag -nopie`"
346 fi
347} 429}
348 430
349fstack-flags() { 431fstack-flags() {
350 has_ssp 432 if has_ssp; then
351 if [ $? == 0 ] ; then
352 [ -z "`is-flag -yno_propolice`" ] && 433 [ -z "`is-flag -fno-stack-protector`" ] &&
353 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 434 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
354 fi 435 fi
436 return 0
355} 437}
438
439# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
440# bug #9016. Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
441# fixes.
442#
443# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
444gcc2-flags() {
445 CFLAGS=${CFLAGS//pentium-mmx/i586}
446 CFLAGS=${CFLAGS//pentium[234]/i686}
447 CFLAGS=${CFLAGS//k6-[23]/k6}
448 CFLAGS=${CFLAGS//athlon-tbird/i686}
449 CFLAGS=${CFLAGS//athlon-4/i686}
450 CFLAGS=${CFLAGS//athlon-[xm]p/i686}
451 CFLAGS=${CFLAGS//athlon/i686}
452
453 CXXFLAGS=${CXXFLAGS//pentium-mmx/i586}
454 CXXFLAGS=${CXXFLAGS//pentium[234]/i686}
455 CXXFLAGS=${CXXFLAGS//k6-[23]/k6}
456 CXXFLAGS=${CXXFLAGS//athlon-tbird/i686}
457 CXXFLAGS=${CXXFLAGS//athlon-4/i686}
458 CXXFLAGS=${CXXFLAGS//athlon-[xm]p/i686}
459 CXXFLAGS=${CXXFLAGS//athlon/i686}
460
461 if [ "$ARCH" = alpha ]; then
462 CHOST=${CHOST/#alphaev6[78]/alphaev6}
463 CFLAGS=${CFLAGS//ev6[78]/ev6}
464 CXXFLAGS=${CXXFLAGS//ev6[78]/ev6}
465 fi
466
467 export CFLAGS CXXFLAGS
468}

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20