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

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.73

  ViewVC Help
Powered by ViewVC 1.1.20