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

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

  ViewVC Help
Powered by ViewVC 1.1.20