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

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.86

  ViewVC Help
Powered by ViewVC 1.1.20