From c8e8e8ba22eaa335ac72f0e5b317f804035133e2 Mon Sep 17 00:00:00 2001 From: Peter Seebach Date: Tue, 23 Oct 2012 17:56:00 -0500 Subject: insane.bbclass and friends: Fix sanity checks and multlib headers for n32 The n32 architecture is odd, in that it's a mips64 ABI which happens to be 32-bit. To handle this, we need something in the environment which can be used to distinguish it. The obvious place to stash this is the ABI suffix, so we use "n32" as an ABI suffix. This allows a couple of improved checks: 1. In insane.bbclass, we can use "linux-gnun32" to discern that it's okay for a mips64 binary to be a 32-bit binary in some cases. 2. In multilib_header, we can check for the n32 ABI, and use a distinct value. 3. In siteinfo, add linux-gnun32 as a synonym for linux, similar to what's done for linux-gnux32, and tell the mips*-linux-gnun32 variants to pick up the corresponding mips-linux site configs. Note that the multilib header wrapper already has n32 hooks in it, there was just nothing creating -n32 header variants. Signed-off-by: Peter Seebach Signed-off-by: Saul Wold --- meta/classes/siteinfo.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/classes/siteinfo.bbclass') diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index aab08676e8..e09d16a0fd 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -51,6 +51,7 @@ def siteinfo_data(d): "linux": "common-linux common-glibc", "linux-gnu": "common-linux common-glibc", "linux-gnux32": "common-linux common-glibc", + "linux-gnun32": "common-linux common-glibc", "linux-gnueabi": "common-linux common-glibc", "linux-gnuspe": "common-linux common-glibc", "linux-uclibc": "common-linux common-uclibc", @@ -66,6 +67,10 @@ def siteinfo_data(d): "arm-linux-uclibceabi": "arm-linux-uclibc", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-uclibceabi": "armeb-linux-uclibc", + "mips-linux-gnun32": "mips-linux", + "mipsel-linux-gnun32": "mipsel-linux", + "mips64-linux-gnun32": "mips-linux", + "mips64el-linux-gnun32": "mipsel-linux", "powerpc-linux": "powerpc32-linux", "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", -- cgit 1.2.3-korg