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

Legend:
Removed from v.1.50  
changed lines
  Added in v.1.62

  ViewVC Help
Powered by ViewVC 1.1.20