/[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.40 Revision 1.61
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.40 2004/03/12 11:21:15 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.61 2004/07/12 02:31:55 agriffis 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"
9IUSE="$IUSE debug"
9 10
10# 11#
11#### filter-flags <flags> #### 12#### filter-flags <flags> ####
12# Remove particular flags from C[XX]FLAGS 13# Remove particular flags from C[XX]FLAGS
13# Matches only complete flags 14# Matches only complete flags
47# will leave the user with -mfpmath=386 48# will leave the user with -mfpmath=386
48# 49#
49#### append-ldflags #### 50#### append-ldflags ####
50# Add extra flags to your current LDFLAGS 51# Add extra flags to your current LDFLAGS
51# 52#
53#### filter-ldflags <flags> ####
54# Remove particular flags from LDFLAGS
55# Matches only complete flags
56#
52#### etexec-flags #### 57#### etexec-flags ####
53# hooked function for hardened-gcc that appends 58# hooked function for hardened gcc that appends
54# -yet_exec {C,CXX,LD}FLAGS when hardened-gcc is installed 59# -fno-pic to {C,CXX,LD}FLAGS
55# and a package is filtering -fPIC,-fpic, -fPIE, -fpie 60# when a package is filtering -fpic, -fPIC, -fpie, -fPIE
56# 61#
57#### fstack-flags #### 62#### fstack-flags ####
58# hooked function for hardened-gcc that appends 63# hooked function for hardened gcc that appends
59# -yno_propolice to {C,CXX,LD}FLAGS when hardened-gcc is installed 64# -fno-stack-protector to {C,CXX,LD}FLAGS
60# and a package is filtering -fstack-protector, -fstack-protector-all 65# when a package is filtering -fstack-protector, -fstack-protector-all
66# notice: modern automatic specs files will also suppress -fstack-protector-all
67# when only -fno-stack-protector is given
61# 68#
62 69
63# C[XX]FLAGS that we allow in strip-flags 70# C[XX]FLAGS that we allow in strip-flags
64setup-allowed-flags() { 71setup-allowed-flags() {
72 if [ -z "${ALLOWED_FLAGS}" ] ; then
65 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -pipe -g" 73 export ALLOWED_FLAGS="-O -O1 -O2 -mcpu -march -mtune -fstack-protector -fno-unit-at-a-time -pipe -g"
66 case "${ARCH}" in 74 case "${ARCH}" in
67 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;; 75 mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" ;;
68 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 76 amd64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC -m64" ;;
77 x86) ALLOWED_FLAGS="${ALLOWED_FLAGS} -m32" ;;
69 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 78 alpha) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
70 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;; 79 ia64) ALLOWED_FLAGS="${ALLOWED_FLAGS} -fPIC" ;;
71 esac 80 esac
81 fi
72 82
73 # C[XX]FLAGS that we are think is ok, but needs testing 83 # C[XX]FLAGS that we are think is ok, but needs testing
74 # NOTE: currently -Os have issues with gcc3 and K6* arch's 84 # NOTE: currently -Os have issues with gcc3 and K6* arch's
75 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays" 85 export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
76 return 0 86 return 0
77} 87}
78 88
79filter-flags() { 89filter-flags() {
90 local x f fset
91 declare -a new_CFLAGS new_CXXFLAGS
92
80 for x in "$@" ; do 93 for x in "$@" ; do
81 case "${x}" in 94 case "${x}" in
82 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;; 95 -fPIC|-fpic|-fPIE|-fpie|-pie) etexec-flags;;
83 -fstack-protector|-fstack-protector-all) fstack-flags;; 96 -fstack-protector|-fstack-protector-all) fstack-flags;;
84 *) ;;
85 esac 97 esac
86 done 98 done
87 99
88 # we do this fancy spacing stuff so as to not filter 100 for fset in CFLAGS CXXFLAGS; do
89 # out part of a flag ... we want flag atoms ! :D 101 for f in ${!fset}; do
90 CFLAGS=" ${CFLAGS} "
91 CXXFLAGS=" ${CXXFLAGS} "
92 for x in "$@" ; do 102 for x in "$@"; do
93 CFLAGS="${CFLAGS// ${x} / }" 103 # Note this should work with globs like -O*
94 CXXFLAGS="${CXXFLAGS// ${x} / }" 104 [[ ${f} == ${x} ]] && continue 2
105 done
106 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
95 done 107 done
96 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 108 eval export ${fset}=\${new_${fset}\[*]}
97 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 109 done
110
98 return 0 111 return 0
99} 112}
100 113
101filter-lfs-flags() { 114filter-lfs-flags() {
102 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 115 filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
103} 116}
104 117
118append-lfs-flags() {
119 append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
120}
121
105append-flags() { 122append-flags() {
106 export CFLAGS="${CFLAGS} $@" 123 export CFLAGS="${CFLAGS} $*"
107 export CXXFLAGS="${CXXFLAGS} $@" 124 export CXXFLAGS="${CXXFLAGS} $*"
108 [ "`is-flag -fno-stack-protector`" -o "`is-flag -fno-stack-protector-all`" ] && fstack-flags 125 [ -n "`is-flag -fno-stack-protector`" -o \
126 -n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
109 return 0 127 return 0
110} 128}
111 129
112replace-flags() { 130replace-flags() {
113 # we do this fancy spacing stuff so as to not filter 131 # we do this fancy spacing stuff so as to not filter
116 CXXFLAGS=" ${CXXFLAGS} " 134 CXXFLAGS=" ${CXXFLAGS} "
117 CFLAGS="${CFLAGS// ${1} / ${2} }" 135 CFLAGS="${CFLAGS// ${1} / ${2} }"
118 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }" 136 CXXFLAGS="${CXXFLAGS// ${1} / ${2} }"
119 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}" 137 CFLAGS="${CFLAGS:1:${#CFLAGS}-2}"
120 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}" 138 CXXFLAGS="${CXXFLAGS:1:${#CXXFLAGS}-2}"
139 export CFLAGS CXXFLAGS
121 return 0 140 return 0
122} 141}
123 142
124replace-cpu-flags() { 143replace-cpu-flags() {
125 local newcpu="$1" ; shift 144 local oldcpu newcpu="$1" ; shift
126 local oldcpu=""
127 for oldcpu in "$@" ; do 145 for oldcpu in "$@" ; do
128 replace-flags -march=${oldcpu} -march=${newcpu} 146 replace-flags -march=${oldcpu} -march=${newcpu}
129 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu} 147 replace-flags -mcpu=${oldcpu} -mcpu=${newcpu}
130 replace-flags -mtune=${oldcpu} -mtune=${newcpu} 148 replace-flags -mtune=${oldcpu} -mtune=${newcpu}
131 done 149 done
132 return 0 150 return 0
133} 151}
134 152
135is-flag() { 153is-flag() {
154 local x
155
136 for x in ${CFLAGS} ${CXXFLAGS} ; do 156 for x in ${CFLAGS} ${CXXFLAGS} ; do
137 if [ "${x}" == "$1" ] ; then 157 if [ "${x}" == "$1" ] ; then
138 echo true 158 echo true
139 return 0 159 return 0
140 fi 160 fi
141 done 161 done
142 return 1 162 return 1
143} 163}
144 164
145filter-mfpmath() { 165filter-mfpmath() {
166 local orig_mfpmath new_math prune_math
167
146 # save the original -mfpmath flag 168 # save the original -mfpmath flag
147 local orig_mfpmath="`get-flag -mfpmath`" 169 orig_mfpmath="`get-flag -mfpmath`"
148 # get the value of the current -mfpmath flag 170 # get the value of the current -mfpmath flag
149 local new_math=" `get-flag mfpmath | tr , ' '` " 171 new_math=" `get-flag mfpmath | tr , ' '` "
150 # figure out which math values are to be removed 172 # figure out which math values are to be removed
151 local prune_math="" 173 prune_math=""
152 for prune_math in "$@" ; do 174 for prune_math in "$@" ; do
153 new_math="${new_math/ ${prune_math} / }" 175 new_math="${new_math/ ${prune_math} / }"
154 done 176 done
155 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`" 177 new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`"
156 178
165 fi 187 fi
166 return 0 188 return 0
167} 189}
168 190
169strip-flags() { 191strip-flags() {
192 local x y flag NEW_CFLAGS NEW_CXXFLAGS
193
170 setup-allowed-flags 194 setup-allowed-flags
171 195
172 local NEW_CFLAGS="" 196 local NEW_CFLAGS=""
173 local NEW_CXXFLAGS="" 197 local NEW_CXXFLAGS=""
174 198
175 # Allow unstable C[XX]FLAGS if we are using unstable profile ... 199 # Allow unstable C[XX]FLAGS if we are using unstable profile ...
176 if [ `has ~${ARCH} ${ACCEPT_KEYWORDS}` ] ; then 200 if has ~${ARCH} ${ACCEPT_KEYWORDS} ; then
177 [ `use debug` ] && einfo "Enabling the use of some unstable flags" 201 use debug && einfo "Enabling the use of some unstable flags"
178 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" 202 ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
179 fi 203 fi
180 204
181 set -f 205 set -f # disable pathname expansion
182 206
183 for x in ${CFLAGS} 207 for x in ${CFLAGS}; do
184 do
185 for y in ${ALLOWED_FLAGS} 208 for y in ${ALLOWED_FLAGS}; do
186 do
187 flag=${x%%=*} 209 flag=${x%%=*}
188 if [ "${flag%%${y}}" = "" ] 210 if [ "${flag%%${y}}" = "" ]; then
189 then
190 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 211 NEW_CFLAGS="${NEW_CFLAGS} ${x}"
191 break 212 break
192 fi 213 fi
193 done 214 done
194 done 215 done
195 216
196 for x in ${CXXFLAGS} 217 for x in ${CXXFLAGS}; do
197 do
198 for y in ${ALLOWED_FLAGS} 218 for y in ${ALLOWED_FLAGS}; do
199 do
200 flag=${x%%=*} 219 flag=${x%%=*}
201 if [ "${flag%%${y}}" = "" ] 220 if [ "${flag%%${y}}" = "" ]; then
202 then
203 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}" 221 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
204 break 222 break
205 fi 223 fi
206 done 224 done
207 done 225 done
212 fi 230 fi
213 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 231 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then
214 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 232 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2"
215 fi 233 fi
216 234
217 set +f 235 set +f # re-enable pathname expansion
218
219 [ `use debug` ] \
220 && einfo "CFLAGS=\"${NEW_CFLAGS}\"" \
221 && einfo "CXXFLAGS=\"${NEW_CXXFLAGS}\""
222 236
223 export CFLAGS="${NEW_CFLAGS}" 237 export CFLAGS="${NEW_CFLAGS}"
224 export CXXFLAGS="${NEW_CXXFLAGS}" 238 export CXXFLAGS="${NEW_CXXFLAGS}"
225 return 0 239 return 0
226} 240}
227 241
228test_flag() { 242test_flag() {
243 local cc=${CC:-gcc} ; cc=${cc%% *}
229 if gcc -S -xc "$@" -o /dev/null /dev/null >/dev/null 2>&1; then 244 if ${cc} -S -xc "$@" -o /dev/null /dev/null &>/dev/null; then
230 echo "$@" 245 printf "%s\n" "$*"
231 return 0 246 return 0
232 fi 247 fi
233 return 1 248 return 1
234} 249}
235 250
251test_version_info() {
252 local cc=${CC:-gcc} ; cc=${cc%% *}
253 if [[ $(${cc} --version 2>&1) == *$1* ]]; then
254 return 0
255 else
256 return 1
257 fi
258}
259
236strip-unsupported-flags() { 260strip-unsupported-flags() {
261 local NEW_CFLAGS NEW_CXXFLAGS
262
237 for x in ${CFLAGS} ; do 263 for x in ${CFLAGS} ; do
238 NEW_CFLAGS=${NEW_CFLAGS}" ""`test_flag ${x}`" 264 NEW_CFLAGS="${NEW_CFLAGS} `test_flag ${x}`"
239 done 265 done
240 for x in ${CXXFLAGS} ; do 266 for x in ${CXXFLAGS} ; do
241 NEW_CXXFLAGS=${NEW_CXXFLAGS}" ""`test_flag ${x}`" 267 NEW_CXXFLAGS="${NEW_CXXFLAGS} `test_flag ${x}`"
242 done 268 done
243 269
244 export CFLAGS="${NEW_CFLAGS}" 270 export CFLAGS="${NEW_CFLAGS}"
245 export CXXFLAGS="${NEW_CXXFLAGS}" 271 export CXXFLAGS="${NEW_CXXFLAGS}"
246} 272}
247 273
248get-flag() { 274get-flag() {
275 local f findflag="$1"
276
249 # this code looks a little flaky but seems to work for 277 # this code looks a little flaky but seems to work for
250 # everything we want ... 278 # everything we want ...
251 # for example, if CFLAGS="-march=i686": 279 # for example, if CFLAGS="-march=i686":
252 # `get-flags -march` == "-march=i686" 280 # `get-flag -march` == "-march=i686"
253 # `get-flags march` == "i686" 281 # `get-flag march` == "i686"
254 local findflag="$1"
255 for f in ${CFLAGS} ${CXXFLAGS} ; do 282 for f in ${CFLAGS} ${CXXFLAGS} ; do
256 if [ "${f/${findflag}}" != "${f}" ] ; then 283 if [ "${f/${findflag}}" != "${f}" ] ; then
257 echo "${f/-${findflag}=}" 284 printf "%s\n" "${f/-${findflag}=}"
258 return 0 285 return 0
259 fi 286 fi
260 done 287 done
261 return 1 288 return 1
262} 289}
263 290
291has_hardened() {
292 test_version_info Hardened
293 return $?
294}
295
296has_pic() {
297 [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
298 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
299 test_version_info pie && return 0
300 return 1
301}
302
303has_pie() {
304 [ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
305 [ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
306 test_version_info pie && return 0
307 return 1
308}
309
310has_ssp() {
311 [ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
312 test_version_info ssp && return 0
313 return 1
314}
315
316has_m64() {
317 test_flag -m64
318 return $?
319}
320
321has_m32() {
322 test_flag -m32
323 return $?
324}
325
264replace-sparc64-flags() { 326replace-sparc64-flags() {
265 local SPARC64_CPUS="ultrasparc v9" 327 local SPARC64_CPUS="ultrasparc v9"
266 328
267 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ] 329 if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
268 then
269 for x in ${SPARC64_CPUS} 330 for x in ${SPARC64_CPUS}; do
270 do
271 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" 331 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
272 done 332 done
273 else 333 else
274 for x in ${SPARC64_CPUS} 334 for x in ${SPARC64_CPUS}; do
275 do
276 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 335 CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
277 done 336 done
278 fi 337 fi
279 338
280 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ] 339 if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
281 then
282 for x in ${SPARC64_CPUS} 340 for x in ${SPARC64_CPUS}; do
283 do
284 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" 341 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
285 done 342 done
286 else 343 else
287 for x in ${SPARC64_CPUS} 344 for x in ${SPARC64_CPUS}; do
288 do
289 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" 345 CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
290 done 346 done
291 fi 347 fi
348
349 export CFLAGS CXXFLAGS
292} 350}
293 351
294append-ldflags() { 352append-ldflags() {
353 export LDFLAGS="${LDFLAGS} $*"
354 return 0
355}
356
357filter-ldflags() {
358 local x
359
360 # we do this fancy spacing stuff so as to not filter
361 # out part of a flag ... we want flag atoms ! :D
295 LDFLAGS="${LDFLAGS} $@" 362 LDFLAGS=" ${LDFLAGS} "
363 for x in "$@" ; do
364 LDFLAGS="${LDFLAGS// ${x} / }"
365 done
366 LDFLAGS="${LDFLAGS:1:${#LDFLAGS}-2}"
367 export LDFLAGS
296 return 0 368 return 0
297} 369}
298 370
299etexec-flags() { 371etexec-flags() {
300 has_version sys-devel/hardened-gcc 372 # if you're not using a hardened compiler you wont need this
301 if [ $? == 0 ] ; then 373 # PIC/no-pic kludge in the first place.
302 if [ "`is-flag -yet_exec`" != "true" ]; then 374 has_hardened || return 0
303 debug-print ">>> appending flags -yet_exec" 375
304 append-flags -yet_exec 376 if has_pie || has_pic; then
305 append-ldflags -yet_exec 377 [ -z "`is-flag -fno-pic`" ] &&
378 export CFLAGS="${CFLAGS} `test_flag -fno-pic`"
379 [ -z "`is-flag -nopie`" ] &&
380 export CFLAGS="${CFLAGS} `test_flag -nopie`"
306 fi 381 fi
307 fi 382 return 0
308} 383}
309 384
310fstack-flags() { 385fstack-flags() {
311 has_version sys-devel/hardened-gcc 386 if has_ssp; then
312 if [ $? == 0 ] ; then 387 [ -z "`is-flag -fno-stack-protector`" ] &&
313 if [ "`is-flag -yno_propolice`" != "true" ]; then 388 export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
314 debug-print ">>> appending flags -yno_propolice"
315 append-flags -yno_propolice
316 append-ldflags -yno_propolice
317 fi 389 fi
318 fi 390 return 0
319} 391}

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.61

  ViewVC Help
Powered by ViewVC 1.1.20