From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/3] Move architecture specific TARGET_OS mangling into tune files
Date: Fri, 22 Jul 2011 19:01:14 +0100 [thread overview]
Message-ID: <1311357674.2344.155.camel@rex> (raw)
In-Reply-To: <cover.1311345613.git.richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 61312bc..6e109ec 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 9fab4dc..8ef3ceb 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 0370dfa..823195c 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 7c06654..e0f50a0 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 e773d14..c517df6 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 5ab81d4..17ace32 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']]}"
next prev parent reply other threads:[~2011-07-22 18:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 14:49 [PATCH 0/3] First round of tune config file updates Richard Purdie
2011-07-22 14:49 ` [PATCH 1/3] bitbake.conf/cross.bbclass: Add ability to dynamically change library location Richard Purdie
2011-07-22 14:49 ` [PATCH 2/3] conf/machine/tune: Overhaul tune include file variables Richard Purdie
2011-07-22 15:03 ` Kumar Gala
2011-07-22 15:13 ` Richard Purdie
2011-07-22 14:49 ` [PATCH 3/3] conf/machine/include: Set TUNE_CCARGS instead of TARGET_CC_ARCH Richard Purdie
2011-07-22 14:54 ` Koen Kooi
2011-07-22 15:11 ` Richard Purdie
2011-07-22 15:15 ` Koen Kooi
2011-07-22 18:00 ` [PATCH 5/3] conf/machine/include: Start to fill out architecture specific tune include files and tune features Richard Purdie
2011-07-22 18:14 ` Tom Rini
2011-07-25 18:55 ` Mark Hatle
2011-07-25 19:34 ` Tom Rini
2011-07-25 19:39 ` Mark Hatle
2011-07-25 20:39 ` Phil Blundell
2011-07-25 20:43 ` Tom Rini
2011-07-22 18:00 ` [PATCH 4/3] bitbake.conf/classes: Variable cleanup Richard Purdie
2011-07-22 18:01 ` Richard Purdie [this message]
2011-07-25 13:42 ` [PATCH 6/3] Move architecture specific TARGET_OS mangling into tune files Richard Purdie
2011-07-25 16:23 ` Phil Blundell
2011-07-27 16:37 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311357674.2344.155.camel@rex \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.