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

  ViewVC Help
Powered by ViewVC 1.1.20