/[gentoo-x86]/eclass/multilib.eclass
Gentoo

Diff of /eclass/multilib.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.86 Revision 1.97
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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/multilib.eclass,v 1.86 2011/03/18 19:12:08 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.97 2011/12/14 18:15:09 slyfox Exp $
4 4
5# @ECLASS: multilib.eclass 5# @ECLASS: multilib.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# amd64@gentoo.org 7# amd64@gentoo.org
8# toolchain@gentoo.org 8# toolchain@gentoo.org
9# @BLURB: This eclass is for all functions pertaining to handling multilib configurations. 9# @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
10# @DESCRIPTION: 10# @DESCRIPTION:
11# This eclass is for all functions pertaining to handling multilib configurations. 11# This eclass is for all functions pertaining to handling multilib configurations.
12 12
13___ECLASS_RECUR_MULTILIB="yes" 13if [[ ${___ECLASS_ONCE_MULTILIB} != "recur -_+^+_- spank" ]] ; then
14[[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs 14___ECLASS_ONCE_MULTILIB="recur -_+^+_- spank"
15
16inherit toolchain-funcs
15 17
16# Defaults: 18# Defaults:
17export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} 19export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
18export DEFAULT_ABI=${DEFAULT_ABI:-"default"} 20export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
19export CFLAGS_default 21export CFLAGS_default
20export LDFLAGS_default 22export LDFLAGS_default
21export CHOST_default=${CHOST_default:-${CHOST}} 23export CHOST_default=${CHOST_default:-${CHOST}}
22export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}} 24export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
23export LIBDIR_default=${CONF_LIBDIR:-"lib"} 25export LIBDIR_default=${CONF_LIBDIR:-"lib"}
24export CDEFINE_default="__unix__"
25export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}} 26export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
26 27
27# @FUNCTION: has_multilib_profile 28# @FUNCTION: has_multilib_profile
28# @DESCRIPTION: 29# @DESCRIPTION:
29# Return true if the current profile is a multilib profile and lists more than 30# Return true if the current profile is a multilib profile and lists more than
56 else 57 else
57 get_abi_LIBDIR 58 get_abi_LIBDIR
58 fi 59 fi
59} 60}
60 61
61# @FUNCTION: get_multilibdir
62# @RETURN: Returns the multilibdir
63get_multilibdir() {
64 if has_multilib_profile; then
65 eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
66 exit 1
67 fi
68 echo ${CONF_MULTILIBDIR:=lib32}
69}
70
71# @FUNCTION: get_libdir_override
72# @DESCRIPTION:
73# Sometimes you need to override the value returned by get_libdir. A good
74# example of this is xorg-x11, where lib32 isnt a supported configuration,
75# and where lib64 -must- be used on amd64 (for applications that need lib
76# to be 32bit, such as adobe acrobat). Note that this override also bypasses
77# portage version sanity checking.
78# get_libdir_override expects one argument, the result get_libdir should
79# return:
80#
81# get_libdir_override lib64
82get_libdir_override() {
83 if has_multilib_profile; then
84 eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
85 exit 1
86 fi
87 CONF_LIBDIR="$1"
88 CONF_LIBDIR_OVERRIDE="$1"
89 LIBDIR_default="$1"
90}
91
92# @FUNCTION: get_abi_var 62# @FUNCTION: get_abi_var
93# @USAGE: <VAR> [ABI] 63# @USAGE: <VAR> [ABI]
94# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 64# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
65# @INTERNAL
95# @DESCRIPTION: 66# @DESCRIPTION:
96# ex: 67# ex:
97# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 68# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
98# 69#
99# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 70# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
102# If <ABI> is not specified, ${ABI} is used. 73# If <ABI> is not specified, ${ABI} is used.
103# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 74# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
104# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 75# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
105get_abi_var() { 76get_abi_var() {
106 local flag=$1 77 local flag=$1
107 local abi 78 local abi=${2:-${ABI:-${DEFAULT_ABI:-default}}}
108 if [ $# -gt 1 ]; then
109 abi=${2}
110 elif [ -n "${ABI}" ]; then
111 abi=${ABI}
112 elif [ -n "${DEFAULT_ABI}" ]; then
113 abi=${DEFAULT_ABI}
114 else
115 abi="default"
116 fi
117
118 local var="${flag}_${abi}" 79 local var="${flag}_${abi}"
119 echo ${!var} 80 echo ${!var}
120} 81}
121 82
122# @FUNCTION: get_abi_CFLAGS 83# @FUNCTION: get_abi_CFLAGS
123# @USAGE: [ABI] 84# @USAGE: [ABI]
124# @DESCRIPTION: 85# @DESCRIPTION:
125# Alias for 'get_abi_var CFLAGS' 86# Alias for 'get_abi_var CFLAGS'
126get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 87get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
127 88
128# @FUNCTION: get_abi_ASFLAGS
129# @USAGE: [ABI]
130# @DESCRIPTION:
131# Alias for 'get_abi_var ASFLAGS'
132get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; }
133
134# @FUNCTION: get_abi_LDFLAGS 89# @FUNCTION: get_abi_LDFLAGS
135# @USAGE: [ABI] 90# @USAGE: [ABI]
136# @DESCRIPTION: 91# @DESCRIPTION:
137# Alias for 'get_abi_var LDFLAGS' 92# Alias for 'get_abi_var LDFLAGS'
138get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; } 93get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
152# @FUNCTION: get_abi_FAKE_TARGETS 107# @FUNCTION: get_abi_FAKE_TARGETS
153# @USAGE: [ABI] 108# @USAGE: [ABI]
154# @DESCRIPTION: 109# @DESCRIPTION:
155# Alias for 'get_abi_var FAKE_TARGETS' 110# Alias for 'get_abi_var FAKE_TARGETS'
156get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; } 111get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
157
158# @FUNCTION: get_abi_CDEFINE
159# @USAGE: [ABI]
160# @DESCRIPTION:
161# Alias for 'get_abi_var CDEFINE'
162get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
163 112
164# @FUNCTION: get_abi_LIBDIR 113# @FUNCTION: get_abi_LIBDIR
165# @USAGE: [ABI] 114# @USAGE: [ABI]
166# @DESCRIPTION: 115# @DESCRIPTION:
167# Alias for 'get_abi_var LIBDIR' 116# Alias for 'get_abi_var LIBDIR'
180 fi 129 fi
181 130
182 if [[ ${EMULTILIB_PKG} == "true" ]] ; then 131 if [[ ${EMULTILIB_PKG} == "true" ]] ; then
183 for x in ${MULTILIB_ABIS} ; do 132 for x in ${MULTILIB_ABIS} ; do
184 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then 133 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
185 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 134 has ${x} ${ABI_DENY} || order="${order} ${x}"
186 fi 135 fi
187 done 136 done
188 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 137 has ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}"
189 138
190 if [[ -n ${ABI_ALLOW} ]] ; then 139 if [[ -n ${ABI_ALLOW} ]] ; then
191 local ordera="" 140 local ordera=""
192 for x in ${order} ; do 141 for x in ${order} ; do
193 if hasq ${x} ${ABI_ALLOW} ; then 142 if has ${x} ${ABI_ALLOW} ; then
194 ordera="${ordera} ${x}" 143 ordera="${ordera} ${x}"
195 fi 144 fi
196 done 145 done
197 order=${ordera} 146 order=${ordera}
198 fi 147 fi
207 echo ${order} 156 echo ${order}
208 return 0 157 return 0
209} 158}
210 159
211# @FUNCTION: get_all_abis 160# @FUNCTION: get_all_abis
212# @DESCRIPTION: 161# @DESCRIPTION:
213# Return a list of the ABIs supported by this profile. 162# Return a list of the ABIs supported by this profile.
214# the last one in the list being the default. 163# the last one in the list being the default.
215get_all_abis() { 164get_all_abis() {
216 local order="" 165 local order=""
217 166
263 212
264# @FUNCTION: number_abis 213# @FUNCTION: number_abis
265# @DESCRIPTION: 214# @DESCRIPTION:
266# echo the number of ABIs we will be installing for 215# echo the number of ABIs we will be installing for
267number_abis() { 216number_abis() {
268 get_install_abis | wc -w 217 set -- `get_install_abis`
269} 218 echo $#
270
271# @FUNCTION: get_ml_incdir
272# @USAGE: [include_dir] [ABI]
273# @DESCRIPTION:
274# include dir defaults to /usr/include
275# ABI defaults to ${ABI} or ${DEFAULT_ABI}
276#
277# If a multilib include dir is associated with the passed include dir, then
278# we return it, otherwise, we just echo back the include dir. This is
279# neccessary when a built script greps header files rather than testing them
280# via #include (like perl) to figure out features.
281get_ml_incdir() {
282 local dir=/usr/include
283
284 if [[ $# -gt 0 ]]; then
285 incdir=$1
286 shift
287 fi
288
289 if [[ -z "${MULTILIB_ABIS}" ]]; then
290 echo ${incdir}
291 return 0
292 fi
293
294 local abi=${ABI-${DEFAULT_ABI}}
295 if [[ $# -gt 0 ]]; then
296 abi=$1
297 shift
298 fi
299
300 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
301 echo ${dir}/gentoo-multilib/${abi}
302 else
303 echo ${dir}
304 fi
305}
306
307# @FUNCTION: prep_ml_includes
308# @DESCRIPTION:
309# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
310# We can install them in different locations for each ABI and create a common
311# header which includes the right one based on CDEFINE_${ABI}. If your
312# package installs ABI-specific headers, just add 'prep_ml_includes' to the
313# end of your src_install(). It takes a list of directories that include
314# files are installed in (default is /usr/include if none are passed).
315#
316# Example:
317# src_install() {
318# ...
319# prep_ml_includes /usr/qt/3/include
320# }
321prep_ml_includes() {
322 if [[ $(number_abis) -gt 1 ]] ; then
323 local dir
324 local dirs
325 local base
326
327 if [[ $# -eq 0 ]] ; then
328 dirs=/usr/include
329 else
330 dirs="$@"
331 fi
332
333 for dir in ${dirs} ; do
334 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
335 mkdir -p "${base}"
336 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
337 mv "${D}/${dir}" "${base}/${ABI}"
338 done
339
340 if is_final_abi; then
341 base=${T}/gentoo-multilib
342 pushd "${base}"
343 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C "${D}"
344 popd
345
346 # This 'set' stuff is required by mips profiles to properly pass
347 # CDEFINE's (which have spaces) to sub-functions
348 set --
349 for dir in ${dirs} ; do
350 set -- "$@" "${dir}"
351 local abi
352 for abi in $(get_install_abis); do
353 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
354 done
355 create_ml_includes "$@"
356 done
357 fi
358 fi
359}
360
361# @FUNCTION: create_ml_includes
362# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
363# @DESCRIPTION:
364# If you need more control than prep_ml_includes can offer (like linux-headers
365# for the asm-* dirs, then use create_ml_includes. The firs argument is the
366# common dir. The remaining args are of the form <symbol>:<dir> where
367# <symbol> is what is put in the #ifdef for choosing that dir.
368#
369# Ideas for this code came from debian's sparc-linux headers package.
370#
371# Example:
372# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
373# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
374#
375# Warning: Be careful with the ordering here. The default ABI has to be the
376# last, because it is always defined (by GCC)
377create_ml_includes() {
378 local dest=$1
379 shift
380 local basedirs=$(create_ml_includes-listdirs "$@")
381
382 create_ml_includes-makedestdirs ${dest} ${basedirs}
383
384 local file
385 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
386 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
387 (
388 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
389
390 local dir
391 for dir in ${basedirs}; do
392 if [[ -f ${D}/${dir}/${file} ]] ; then
393 echo ""
394 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
395 if [[ ${sym/=} != "${sym}" ]] ; then
396 echo "#if ${sym}"
397 elif [[ ${sym::1} == "!" ]] ; then
398 echo "#ifndef ${sym:1}"
399 else
400 echo "#ifdef ${sym}"
401 fi
402 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
403 echo "#endif /* ${sym} */"
404 fi
405 done
406
407 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
408 ) > "${D}/${dest}/${file}"
409 done
410}
411
412# Helper function for create_ml_includes
413create_ml_includes-absolute() {
414 local dst="$(create_ml_includes-tidy_path $1)"
415
416 dst=(${dst//\// })
417
418 local i
419 for ((i=0; i<${#dst[*]}; i++)); do
420 [ "${dst[i]}" == "include" ] && break
421 done
422
423 local strip_upto=$i
424
425 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
426 echo -n ${dst[i]}/
427 done
428
429 echo -n ${dst[i]}
430}
431
432# Helper function for create_ml_includes
433create_ml_includes-tidy_path() {
434 local removed=$1
435
436 if [ -n "${removed}" ]; then
437 # Remove multiple slashes
438 while [ "${removed}" != "${removed/\/\//\/}" ]; do
439 removed=${removed/\/\//\/}
440 done
441
442 # Remove . directories
443 while [ "${removed}" != "${removed//\/.\//\/}" ]; do
444 removed=${removed//\/.\//\/}
445 done
446 [ "${removed##*/}" = "." ] && removed=${removed%/*}
447
448 # Removed .. directories
449 while [ "${removed}" != "${removed//\/..\/}" ]; do
450 local p1="${removed%%\/..\/*}"
451 local p2="${removed#*\/..\/}"
452
453 removed="${p1%\/*}/${p2}"
454 done
455
456 # Remove trailing ..
457 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
458
459 # Remove trailing /
460 [ "${removed##*/}" = "" ] && removed=${removed%/*}
461
462 echo ${removed}
463 fi
464}
465
466# Helper function for create_ml_includes
467create_ml_includes-listdirs() {
468 local dirs
469 local data
470 for data in "$@"; do
471 dirs="${dirs} ${data/*:/}"
472 done
473 echo ${dirs:1}
474}
475
476# Helper function for create_ml_includes
477create_ml_includes-makedestdirs() {
478 local dest=$1
479 shift
480 local basedirs=$@
481 [[ -z ${ED} ]] && local ED=${D}
482
483 dodir ${dest}
484
485 local basedir
486 for basedir in ${basedirs}; do
487 local dir
488 for dir in $(find "${ED}"/${basedir} -type d); do
489 dodir ${dest}/${dir/${ED}\/${basedir}/}
490 done
491 done
492}
493
494# Helper function for create_ml_includes
495create_ml_includes-allfiles() {
496 [[ -z ${ED} ]] && local ED=${D}
497 local basedir file
498 for basedir in "$@" ; do
499 for file in $(find "${ED}"/${basedir} -type f); do
500 echo ${file/${ED}\/${basedir}\//}
501 done
502 done | sort | uniq
503}
504
505# Helper function for create_ml_includes
506create_ml_includes-sym_for_dir() {
507 local dir=$1
508 shift
509 local data
510 for data in "$@"; do
511 if [[ ${data} == *:${dir} ]] ; then
512 echo ${data/:*/}
513 return 0
514 fi
515 done
516 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
517 # exit because we'll likely be called from a subshell
518 exit 1
519} 219}
520 220
521# @FUNCTION: get_libname 221# @FUNCTION: get_libname
522# @USAGE: [version] 222# @USAGE: [version]
523# @DESCRIPTION: 223# @DESCRIPTION:
579 case ${CTARGET} in 279 case ${CTARGET} in
580 x86_64*) 280 x86_64*)
581 export CFLAGS_x86=${CFLAGS_x86--m32} 281 export CFLAGS_x86=${CFLAGS_x86--m32}
582 export CHOST_x86=${CTARGET/x86_64/i686} 282 export CHOST_x86=${CTARGET/x86_64/i686}
583 export CTARGET_x86=${CHOST_x86} 283 export CTARGET_x86=${CHOST_x86}
584 export CDEFINE_x86="__i386__"
585 if [[ ${SYMLINK_LIBDIR} == "yes" ]] ; then 284 if [[ ${SYMLINK_LIB} == "yes" ]] ; then
586 export LIBDIR_x86="lib32" 285 export LIBDIR_x86="lib32"
587 else 286 else
588 export LIBDIR_x86="lib" 287 export LIBDIR_x86="lib"
589 fi 288 fi
590 289
591 export CFLAGS_amd64=${CFLAGS_amd64--m64} 290 export CFLAGS_amd64=${CFLAGS_amd64--m64}
592 export CHOST_amd64=${CTARGET} 291 export CHOST_amd64=${CTARGET}
593 export CTARGET_amd64=${CHOST_amd64} 292 export CTARGET_amd64=${CHOST_amd64}
594 export CDEFINE_amd64="__x86_64__"
595 export LIBDIR_amd64="lib64" 293 export LIBDIR_amd64="lib64"
596 294
597 export CFLAGS_x32=${CFLAGS_x32--mx32} 295 export CFLAGS_x32=${CFLAGS_x32--mx32}
598 export CHOST_x32=${CTARGET} 296 export CHOST_x32=${CTARGET}
599 export CTARGET_x32=${CHOST_x32} 297 export CTARGET_x32=${CHOST_x32}
600 export CDEFINE_x32="__i386__"
601 export LIBDIR_x32="libx32" 298 export LIBDIR_x32="libx32"
602 299
603 : ${MULTILIB_ABIS=amd64 x86} 300 : ${MULTILIB_ABIS=amd64 x86}
604 : ${DEFAULT_ABI=amd64} 301 : ${DEFAULT_ABI=amd64}
605 ;; 302 ;;
606 mips64*) 303 mips64*)
607 export CFLAGS_o32=${CFLAGS_o32--mabi=32} 304 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
608 export CHOST_o32=${CTARGET/mips64/mips} 305 export CHOST_o32=${CTARGET/mips64/mips}
609 export CTARGET_o32=${CHOST_o32} 306 export CTARGET_o32=${CHOST_o32}
610 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
611 export LIBDIR_o32="lib" 307 export LIBDIR_o32="lib"
612 308
613 export CFLAGS_n32=${CFLAGS_n32--mabi=n32} 309 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
614 export CHOST_n32=${CTARGET} 310 export CHOST_n32=${CTARGET}
615 export CTARGET_n32=${CHOST_n32} 311 export CTARGET_n32=${CHOST_n32}
616 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
617 export LIBDIR_n32="lib32" 312 export LIBDIR_n32="lib32"
618 313
619 export CFLAGS_n64=${CFLAGS_n64--mabi=64} 314 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
620 export CHOST_n64=${CTARGET} 315 export CHOST_n64=${CTARGET}
621 export CTARGET_n64=${CHOST_n64} 316 export CTARGET_n64=${CHOST_n64}
622 export CDEFINE_n64="_MIPS_SIM == _ABI64"
623 export LIBDIR_n64="lib64" 317 export LIBDIR_n64="lib64"
624 318
625 : ${MULTILIB_ABIS=n64 n32 o32} 319 : ${MULTILIB_ABIS=n64 n32 o32}
626 : ${DEFAULT_ABI=n32} 320 : ${DEFAULT_ABI=n32}
627 ;; 321 ;;
628 powerpc64*) 322 powerpc64*)
629 export CFLAGS_ppc=${CFLAGS_ppc--m32} 323 export CFLAGS_ppc=${CFLAGS_ppc--m32}
630 export CHOST_ppc=${CTARGET/powerpc64/powerpc} 324 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
631 export CTARGET_ppc=${CHOST_ppc} 325 export CTARGET_ppc=${CHOST_ppc}
632 export CDEFINE_ppc="!__powerpc64__"
633 export LIBDIR_ppc="lib" 326 export LIBDIR_ppc="lib"
634 327
635 export CFLAGS_ppc64=${CFLAGS_ppc64--m64} 328 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
636 export CHOST_ppc64=${CTARGET} 329 export CHOST_ppc64=${CTARGET}
637 export CTARGET_ppc64=${CHOST_ppc64} 330 export CTARGET_ppc64=${CHOST_ppc64}
638 export CDEFINE_ppc64="__powerpc64__"
639 export LIBDIR_ppc64="lib64" 331 export LIBDIR_ppc64="lib64"
640 332
641 : ${MULTILIB_ABIS=ppc64 ppc} 333 : ${MULTILIB_ABIS=ppc64 ppc}
642 : ${DEFAULT_ABI=ppc64} 334 : ${DEFAULT_ABI=ppc64}
643 ;; 335 ;;
644 s390x*) 336 s390x*)
645 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo 337 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
646 export CHOST_s390=${CTARGET/s390x/s390} 338 export CHOST_s390=${CTARGET/s390x/s390}
647 export CTARGET_s390=${CHOST_s390} 339 export CTARGET_s390=${CHOST_s390}
648 export CDEFINE_s390="!__s390x__"
649 export LIBDIR_s390="lib" 340 export LIBDIR_s390="lib"
650 341
651 export CFLAGS_s390x=${CFLAGS_s390x--m64} 342 export CFLAGS_s390x=${CFLAGS_s390x--m64}
652 export CHOST_s390x=${CTARGET} 343 export CHOST_s390x=${CTARGET}
653 export CTARGET_s390x=${CHOST_s390x} 344 export CTARGET_s390x=${CHOST_s390x}
654 export CDEFINE_s390x="__s390x__"
655 export LIBDIR_s390x="lib64" 345 export LIBDIR_s390x="lib64"
656 346
657 : ${MULTILIB_ABIS=s390x s390} 347 : ${MULTILIB_ABIS=s390x s390}
658 : ${DEFAULT_ABI=s390x} 348 : ${DEFAULT_ABI=s390x}
659 ;; 349 ;;
660 sparc*) 350 sparc*)
661 export CFLAGS_sparc32=${CFLAGS_sparc32} 351 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
662 export CHOST_sparc32=${CTARGET/sparc64/sparc} 352 export CHOST_sparc32=${CTARGET/sparc64/sparc}
663 export CTARGET_sparc32=${CHOST_sparc32} 353 export CTARGET_sparc32=${CHOST_sparc32}
664 export CDEFINE_sparc32="!__arch64__"
665 export LIBDIR_sparc32="lib" 354 export LIBDIR_sparc32="lib"
666 355
667 export CFLAGS_sparc64=${CFLAGS_sparc64--m64} 356 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
668 export CHOST_sparc64=${CTARGET} 357 export CHOST_sparc64=${CTARGET}
669 export CTARGET_sparc64=${CHOST_sparc64} 358 export CTARGET_sparc64=${CHOST_sparc64}
670 export CDEFINE_sparc64="__arch64__"
671 export LIBDIR_sparc64="lib64" 359 export LIBDIR_sparc64="lib64"
672 360
673 : ${MULTILIB_ABIS=sparc64 sparc32} 361 : ${MULTILIB_ABIS=sparc64 sparc32}
674 : ${DEFAULT_ABI=sparc64} 362 : ${DEFAULT_ABI=sparc64}
675 ;; 363 ;;
711 export __DEFAULT_ABI_SAVED="true" 399 export __DEFAULT_ABI_SAVED="true"
712 400
713 # Set the CHOST native first so that we pick up the native 401 # Set the CHOST native first so that we pick up the native
714 # toolchain and not a cross-compiler by accident #202811. 402 # toolchain and not a cross-compiler by accident #202811.
715 export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) 403 export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
716 export AS="$(tc-getAS) $(get_abi_ASFLAGS)"
717 export CC="$(tc-getCC) $(get_abi_CFLAGS)" 404 export CC="$(tc-getCC) $(get_abi_CFLAGS)"
718 export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" 405 export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
719 export LD="$(tc-getLD) $(get_abi_LDFLAGS)" 406 export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
720 export CHOST=$(get_abi_CHOST $1) 407 export CHOST=$(get_abi_CHOST $1)
721 export CBUILD=$(get_abi_CHOST $1) 408 export CBUILD=$(get_abi_CHOST $1)
722 fi 409 fi
723} 410}
411
412fi

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20