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

Legend:
Removed from v.1.37  
changed lines
  Added in v.1.72

  ViewVC Help
Powered by ViewVC 1.1.20