diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-22 17:54:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-25 14:19:54 +0100 |
| commit | f10a3457cdfbb4a94978da998d178d4254632fa7 (patch) | |
| tree | 8bddbde48c3be73d945b59cacc5759010b484957 | |
| parent | 5f9d56bd64997b93ed7e46c117851002a0556654 (diff) | |
| download | openembedded-core-contrib-f10a3457cdfbb4a94978da998d178d4254632fa7.tar.gz | |
Move architecture specific TARGET_OS mangling into tune files
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-eglibc.inc | 5 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc | 5 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-uclibc.inc | 5 | ||||
| -rw-r--r-- | meta/conf/machine/include/arm/arch-arm.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/powerpc/arch-powerpc.inc | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 380da1c5bb..46a9a82198 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -85,9 +85,11 @@ TUNE_ARCH ??= "INVALID" TUNE_CCARGS ??= "" TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}" PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE} ??= "${TARGET_ARCH}" +LIBCEXTENSION ??= "" +ABIEXTENSION ??= "" TARGET_ARCH = "${TUNE_ARCH}" -TARGET_OS = "INVALID" +TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" TARGET_VENDOR = "-oe" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 9fab4dc678..8ef3cebb9a 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -2,10 +2,7 @@ # eglibc specific configuration # -TARGET_OS = "linux" -TARGET_OS_arm = "linux-gnueabi" -TARGET_OS_armeb = "linux-gnueabi" -TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}" +LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" # Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc" diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index 0370dfa822..823195c2ad 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -2,10 +2,7 @@ # glibc specific configuration # -TARGET_OS = "linux" -TARGET_OS_arm = "linux-gnueabi" -TARGET_OS_armeb = "linux-gnueabi" -TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}" +LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" # Add glibc to the overrides. OVERRIDES =. "libc-glibc:" diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 7c06654ba5..e0f50a0567 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -2,10 +2,7 @@ # uclibc specific configuration # -TARGET_OS = "linux-uclibc" -TARGET_OS_arm = "linux-uclibceabi" -TARGET_OS_armeb = "linux-uclibceabi" -TARGET_OS_powerpc = "linux-uclibc${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}" +LIBCEXTENSION = "-uclibc" # Add uclibc overrides to the overrides. OVERRIDES =. "libc-uclibc:" diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc index e773d14c2a..c517df6334 100644 --- a/meta/conf/machine/include/arm/arch-arm.inc +++ b/meta/conf/machine/include/arm/arch-arm.inc @@ -1 +1,3 @@ TUNE_ARCH = "arm" + +ABIEXTENSION = "eabi" diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index 5ab81d4156..17ace32a42 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -1 +1,3 @@ TUNE_ARCH = "powerpc" + +ABIEXTENSION = "${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}" |