/[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.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.47 2004/04/12 02:33:29 swtaylor 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
10IUSE="debug"
11
12# need access to emktemp()
13inherit eutils toolchain-funcs
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
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 #### 61#### etexec-flags ####
57# hooked function for hardened-gcc that appends 62# hooked function for hardened gcc that appends
58# -yet_exec {C,CXX,LD}FLAGS when hardened-gcc is installed 63# -fno-pic to {C,CXX,LD}FLAGS
59# and a package is filtering -fPIC,-fpic, -fPIE, -fpie 64# when a package is filtering -fpic, -fPIC, -fpie, -fPIE
60# 65#
61#### fstack-flags #### 66#### fstack-flags ####
62# hooked function for hardened-gcc that appends 67# hooked function for hardened gcc that appends
63# -yno_propolice to {C,CXX,LD}FLAGS when hardened-gcc is installed 68# -fno-stack-protector to {C,CXX,LD}FLAGS
64# and a package is filtering -fstack-protector, -fstack-protector-all 69# when a package is filtering -fstack-protector, -fstack-protector-all
70# notice: modern automatic specs files will also suppress -fstack-protector-all
71# when only -fno-stack-protector is given
65# 72#
66 73
67# C[XX]FLAGS that we allow in strip-flags 74# C[XX]FLAGS that we allow in strip-flags
68setup-allowed-flags() { 75setup-allowed-flags() {
69 if [ -z "${ALLOWED_FLAGS}" ] ; then 76 if [ -z "${ALLOWED_FLAGS}" ] ; then
70 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -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"
71 case "${ARCH}" in 82 case "${ARCH}" in
72 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" ;;
73 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 84 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
85 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
74 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 86 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
75 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" ;;
76 esac 90 esac
77 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"
78 98
79 # 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
80 # NOTE: currently -Os have issues with gcc3 and K6* arch's 100 # NOTE: currently -Os have issues with gcc3 and K6* arch's
81 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 101 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
82 return 0 102 return 0
83} 103}
84 104
85filter-flags() { 105filter-flags() {
106 local x f fset
107 declare -a new_CFLAGS new_CXXFLAGS
108
86 for x in "$@" ; do 109 for x in "$@" ; do
87 case "${x}" in 110 case "${x}" in
88 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 111 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;;
89 -fstack-protector|-fstack-protector-all) fstack-flags;; 112 -fstack-protector|-fstack-protector-all) fstack-flags;;
90 *) ;;
91 esac 113 esac
92 done 114 done
93 115
94 # we do this fancy spacing stuff so as to not filter 116 for fset in CFLAGS CXXFLAGS; do
95 # out part of a flag ... we want flag atoms ! :D 117 # Looping over the flags instead of using a global
96 CFLAGS=" ${CFLAGS} " 118 # substitution ensures that we're working with flag atoms.
97 CXXFLAGS=" ${CXXFLAGS} " 119 # Otherwise globs like -O* have the potential to wipe out the
120 # list of flags.
121 for f in ${!fset}; do
98 for x in "$@" ; do 122 for x in "$@"; do
99 CFLAGS="${CFLAGS// ${x} / }" 123 # Note this should work with globs like -O*
100 CXXFLAGS="${CXXFLAGS// ${x} / }" 124 [[ ${f} == ${x} ]] && continue 2
125 done
126 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
101 done 127 done
102 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 128 eval export ${fset}=\${new_${fset}\[*]}
103 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 129 done
130
104 return 0 131 return 0
105} 132}
106 133
107filter-lfs-flags() { 134filter-lfs-flags() {
108 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
109} 136}
110 137
138append-lfs-flags() {
139 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
140}
141
111append-flags() { 142append-flags() {
112 export CFLAGS="${CFLAGS} $@" 143 export CFLAGS="${CFLAGS} $*"
113 export CXXFLAGS="${CXXFLAGS} $@" 144 export CXXFLAGS="${CXXFLAGS} $*"
114 [ "`is-flag -fno-stack-protector`" -o "`is-flag -fno-stack-protector-all`" ] && fstack-flags 145 [ -n "`is-flag -fno-stack-protector`" -o \
146 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
115 return 0 147 return 0
116} 148}
117 149
118replace-flags() { 150replace-flags() {
119 # we do this fancy spacing stuff so as to not filter 151 local f fset
120 # out part of a flag ... we want flag atoms ! :D 152 declare -a new_CFLAGS new_CXXFLAGS
121 CFLAGS=" ${CFLAGS} " 153
122 CXXFLAGS=" ${CXXFLAGS} " 154 for fset in CFLAGS CXXFLAGS; do
123 CFLAGS="${CFLAGS// ${1} / ${2} }" 155 # Looping over the flags instead of using a global
124 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 156 # substitution ensures that we're working with flag atoms.
125 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 157 # Otherwise globs like -O* have the potential to wipe out the
126 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 158 # list of flags.
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
127 return 0 167 return 0
128} 168}
129 169
130replace-cpu-flags() { 170replace-cpu-flags() {
131 local newcpu="$1" ; shift 171 local newcpu="$#" ; newcpu="${!newcpu}"
132 local oldcpu="" 172 while [ $# -gt 1 ] ; do
133 for oldcpu in "$@" ; do 173 # quote to make sure that no globbing is done (particularly on
174 # ${oldcpu} prior to calling replace-flags
134 replace-flags -march=${oldcpu} -march=${newcpu} 175 replace-flags "-march=${1}" "-march=${newcpu}"
135 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 176 replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
136 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 177 replace-flags "-mtune=${1}" "-mtune=${newcpu}"
178 shift
137 done 179 done
138 return 0 180 return 0
139} 181}
140 182
141is-flag() { 183is-flag() {
184 local x
185
142 for x in ${CFLAGS} ${CXXFLAGS} ; do 186 for x in ${CFLAGS} ${CXXFLAGS} ; do
187 # Note this should work with globs like -mcpu=ultrasparc*
143 if [ "${x}" == "$1" ] ; then 188 if [[ ${x} == ${1} ]]; then
144 echo true 189 echo true
145 return 0 190 return 0
146 fi 191 fi
147 done 192 done
148 return 1 193 return 1
149} 194}
150 195
151filter-mfpmath() { 196filter-mfpmath() {
197 local orig_mfpmath new_math prune_math
198
152 # save the original -mfpmath flag 199 # save the original -mfpmath flag
153 local orig_mfpmath="`get-flag -mfpmath`" 200 orig_mfpmath="`get-flag -mfpmath`"
154 # get the value of the current -mfpmath flag 201 # get the value of the current -mfpmath flag
155 local new_math=" `get-flag mfpmath | tr , ' '` " 202 new_math=" `get-flag mfpmath | tr , ' '` "
156 # figure out which math values are to be removed 203 # figure out which math values are to be removed
157 local prune_math="" 204 prune_math=""
158 for prune_math in "$@" ; do 205 for prune_math in "$@" ; do
159 new_math="${new_math/ ${prune_math} / }" 206 new_math="${new_math/ ${prune_math} / }"
160 done 207 done
161 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 208 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`"
162 209
171 fi 218 fi
172 return 0 219 return 0
173} 220}
174 221
175strip-flags() { 222strip-flags() {
223 local x y flag NEW_CFLAGS NEW_CXXFLAGS
224
176 setup-allowed-flags 225 setup-allowed-flags
177 226
178 local NEW_CFLAGS="" 227 local NEW_CFLAGS=""
179 local NEW_CXXFLAGS="" 228 local NEW_CXXFLAGS=""
180 229
181 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 230 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
182 if [ `has ~${ARCH} ${ACCEPT_KEYWORDS}` ] ; then 231 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then
183 [ `use debug` ] && einfo "Enabling the use of some unstable flags" 232 use debug && einfo "Enabling the use of some unstable flags"
184 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 233 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
185 fi 234 fi
186 235
187 set -f 236 set -f # disable pathname expansion
188 237
189 for x in ${CFLAGS} 238 for x in ${CFLAGS}; do
190 do
191 for y in ${ALLOWED_FLAGS} 239 for y in ${ALLOWED_FLAGS}; do
192 do
193 flag=${x%%=*} 240 flag=${x%%=*}
194 if [ "${flag%%${y}}" = "" ] 241 if [ "${flag%%${y}}" = "" ] ; then
195 then
196 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 242 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
197 break 243 break
198 fi 244 fi
199 done 245 done
200 done 246 done
201 247
202 for x in ${CXXFLAGS} 248 for x in ${CXXFLAGS}; do
203 do
204 for y in ${ALLOWED_FLAGS} 249 for y in ${ALLOWED_FLAGS}; do
205 do
206 flag=${x%%=*} 250 flag=${x%%=*}
207 if [ "${flag%%${y}}" = "" ] 251 if [ "${flag%%${y}}" = "" ] ; then
208 then
209 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 252 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
210 break 253 break
211 fi 254 fi
212 done 255 done
213 done 256 done
218 fi 261 fi
219 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 262 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then
220 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 263 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2"
221 fi 264 fi
222 265
223 set +f 266 set +f # re-enable pathname expansion
224
225 [ `use debug` ] \
226 && einfo "CFLAGS=\"${NEW_CFLAGS}\"" \
227 && einfo "CXXFLAGS=\"${NEW_CXXFLAGS}\""
228 267
229 export CFLAGS="${NEW_CFLAGS}" 268 export CFLAGS="${NEW_CFLAGS}"
230 export CXXFLAGS="${NEW_CXXFLAGS}" 269 export CXXFLAGS="${NEW_CXXFLAGS}"
231 return 0 270 return 0
232} 271}
233 272
234test_flag() { 273test_flag() {
235 if [ -z "`gcc -S -xc "$@" -o /dev/null /dev/null 2>&1`" ]; then 274 if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
236 echo "$@" 275 printf "%s\n" "$*"
237 return 0 276 return 0
238 fi 277 fi
239 return 1 278 return 1
240} 279}
241 280
281test_version_info() {
282 if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
283 return 0
284 else
285 return 1
286 fi
287}
288
242strip-unsupported-flags() { 289strip-unsupported-flags() {
290 local NEW_CFLAGS NEW_CXXFLAGS
291
243 for x in ${CFLAGS} ; do 292 for x in ${CFLAGS} ; do
244 NEW_CFLAGS=${NEW_CFLAGS}" ""`test_flag ${x}`" 293 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`"
245 done 294 done
246 for x in ${CXXFLAGS} ; do 295 for x in ${CXXFLAGS} ; do
247 NEW_CXXFLAGS=${NEW_CXXFLAGS}" ""`test_flag ${x}`" 296 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`"
248 done 297 done
249 298
250 export CFLAGS="${NEW_CFLAGS}" 299 export CFLAGS="${NEW_CFLAGS}"
251 export CXXFLAGS="${NEW_CXXFLAGS}" 300 export CXXFLAGS="${NEW_CXXFLAGS}"
252} 301}
253 302
254get-flag() { 303get-flag() {
304 local f findflag="$1"
305
255 # this code looks a little flaky but seems to work for 306 # this code looks a little flaky but seems to work for
256 # everything we want ... 307 # everything we want ...
257 # for example, if CFLAGS="-march=i686": 308 # for example, if CFLAGS="-march=i686":
258 # `get-flags -march` == "-march=i686" 309 # `get-flag -march` == "-march=i686"
259 # `get-flags march` == "i686" 310 # `get-flag march` == "i686"
260 local findflag="$1"
261 for f in ${CFLAGS} ${CXXFLAGS} ; do 311 for f in ${CFLAGS} ${CXXFLAGS} ; do
262 if [ "${f/${findflag}}" != "${f}" ] ; then 312 if [ "${f/${findflag}}" != "${f}" ] ; then
263 echo "${f/-${findflag}=}" 313 printf "%s\n" "${f/-${findflag}=}"
264 return 0 314 return 0
265 fi 315 fi
266 done 316 done
317 return 1
318}
319
320has_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
267 return 1 325 return 1
268} 326}
269 327
270has_pic() { 328has_pic() {
271 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 329 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
272 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 330 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
273 has_version sys-devel/hardened-gcc && return 0 331 test_version_info pie && return 0
274 [ ! -z "`${CC/ .*/} --version| grep pie`" ] && return 0
275 return 1 332 return 1
276} 333}
277 334
278has_pie() { 335has_pie() {
279 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0 336 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
280 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0 337 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
281 has_version sys-devel/hardened-gcc && return 0 338 test_version_info pie && return 0
282 [ ! -z "`${CC/ .*/} --version| grep pie`" ] && return 0
283 return 1 339 return 1
284} 340}
285 341
286has_ssp() { 342has_ssp() {
287 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0 343 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
288 has_version sys-devel/hardened-gcc && return 0 344 test_version_info ssp && return 0
289 [ ! -z "`${CC/ .*/} --version| grep ssp`" ] && return 0 345 return 1
346}
347
348has_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
360 return 1
361}
362
363has_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
290 return 1 375 return 1
291} 376}
292 377
293replace-sparc64-flags() { 378replace-sparc64-flags() {
294 local SPARC64_CPUS="ultrasparc v9" 379 local SPARC64_CPUS="ultrasparc v9"
295 380
296 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ] 381 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
297 then
298 for x in ${SPARC64_CPUS} 382 for x in ${SPARC64_CPUS}; do
299 do
300 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 383 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
301 done 384 done
302 else 385 else
303 for x in ${SPARC64_CPUS} 386 for x in ${SPARC64_CPUS}; do
304 do
305 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 387 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
306 done 388 done
307 fi 389 fi
308 390
309 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ] 391 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
310 then
311 for x in ${SPARC64_CPUS} 392 for x in ${SPARC64_CPUS}; do
312 do
313 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 393 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
314 done 394 done
315 else 395 else
316 for x in ${SPARC64_CPUS} 396 for x in ${SPARC64_CPUS}; do
317 do
318 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 397 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
319 done 398 done
320 fi 399 fi
400
401 export CFLAGS CXXFLAGS
321} 402}
322 403
323append-ldflags() { 404append-ldflags() {
324 LDFLAGS="${LDFLAGS} $@" 405 export LDFLAGS="${LDFLAGS} $*"
325 return 0 406 return 0
326} 407}
327 408
328filter-ldflags() { 409filter-ldflags() {
410 local x
411
329 # we do this fancy spacing stuff so as to not filter 412 # we do this fancy spacing stuff so as to not filter
330 # out part of a flag ... we want flag atoms ! :D 413 # out part of a flag ... we want flag atoms ! :D
331 LDFLAGS=" ${LDFLAGS} " 414 LDFLAGS=" ${LDFLAGS} "
332 for x in "$@" ; do 415 for x in "$@" ; do
333 LDFLAGS="${LDFLAGS// ${x} / }" 416 LDFLAGS="${LDFLAGS// ${x} / }"
334 done 417 done
335 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}" 418 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}"
419 export LDFLAGS
336 return 0 420 return 0
337} 421}
338 422
339etexec-flags() { 423etexec-flags() {
424 # if you're not using a hardened compiler you wont need this
425 # PIC/no-pic kludge in the first place.
426 has_hardened || return 0
427 use amd64 && return 0
428 use mips && return 0
429
340 has_pie || has_pic 430 if has_pie || has_pic; then
341 if [ $? == 0 ] ; then
342 [ -z "`is-flag -yet_exec`" ] && 431 [ -z "`is-flag -fno-pic`" ] &&
343 export CFLAGS="${CFLAGS} `test_flag -yet_exec`" 432 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
344 [ -z "`is-flag -nopie`" ] && 433 [ -z "`is-flag -nopie`" ] &&
345 export CFLAGS="${CFLAGS} `test_flag -nopie`" 434 export CFLAGS="${CFLAGS} `test_flag -nopie`"
346 fi 435 fi
436 return 0
347} 437}
348 438
349fstack-flags() { 439fstack-flags() {
350 has_ssp 440 if has_ssp; then
351 if [ $? == 0 ] ; then
352 [ -z "`is-flag -yno_propolice`" ] && 441 [ -z "`is-flag -fno-stack-protector`" ] &&
353 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`" 442 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
354 fi 443 fi
444 return 0
355} 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.47  
changed lines
  Added in v.1.79

  ViewVC Help
Powered by ViewVC 1.1.20