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

  ViewVC Help
Powered by ViewVC 1.1.20