diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/insane.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/multilib_header.bbclass | 32 | ||||
-rw-r--r-- | meta/classes/siteinfo.bbclass | 5 |
3 files changed, 31 insertions, 10 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 29b122e31d..2dc9ba31f7 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -105,6 +105,10 @@ def package_qa_get_machine_dict(): | |||
105 | "linux-gnux32" : { | 105 | "linux-gnux32" : { |
106 | "x86_64": (62, 0, 0, True, 32), | 106 | "x86_64": (62, 0, 0, True, 32), |
107 | }, | 107 | }, |
108 | "linux-gnun32" : { | ||
109 | "mips64": ( 8, 0, 0, False, 32), | ||
110 | "mipsel64": ( 8, 0, 0, True, 32), | ||
111 | }, | ||
108 | } | 112 | } |
109 | 113 | ||
110 | 114 | ||
diff --git a/meta/classes/multilib_header.bbclass b/meta/classes/multilib_header.bbclass index 867bce4134..639ed4ba53 100644 --- a/meta/classes/multilib_header.bbclass +++ b/meta/classes/multilib_header.bbclass | |||
@@ -1,16 +1,29 @@ | |||
1 | inherit siteinfo | 1 | inherit siteinfo |
2 | 2 | ||
3 | # If applicable on the architecture, this routine will rename the header and add | 3 | # If applicable on the architecture, this routine will rename the header and |
4 | # a unique identifier to the name for the ABI/bitsize that is being used. A wrapper will | 4 | # add a unique identifier to the name for the ABI/bitsize that is being used. |
5 | # be generated for the architecture that knows how to call all of the ABI variants for that | 5 | # A wrapper will be generated for the architecture that knows how to call |
6 | # given architecture. | 6 | # all of the ABI variants for that given architecture. |
7 | # | ||
8 | # TODO: mips64 n32 is not yet recognized in this code | ||
9 | # when that is identified the name of the wrapped item should be "n32" and appropriately | ||
10 | # determined int he if coding... | ||
11 | # | 7 | # |
12 | oe_multilib_header() { | 8 | oe_multilib_header() { |
13 | # Do nothing on ARM, only one ABI is supported at once | 9 | # We use |
10 | # For ARM: We don't support multilib builds. | ||
11 | # For MIPS: "n32" is a special case, which needs to be | ||
12 | # distinct from both 64-bit and 32-bit. | ||
13 | case ${TARGET_ARCH} in | ||
14 | arm*) return | ||
15 | ;; | ||
16 | mips*) case "${MIPSPKGSFX_ABI}" in | ||
17 | "-n32") | ||
18 | ident=n32 | ||
19 | ;; | ||
20 | *) | ||
21 | ident=${SITEINFO_BITS} | ||
22 | ;; | ||
23 | esac | ||
24 | ;; | ||
25 | *) ident=${SITEINFO_BITS} | ||
26 | esac | ||
14 | if echo ${TARGET_ARCH} | grep -q arm; then | 27 | if echo ${TARGET_ARCH} | grep -q arm; then |
15 | return | 28 | return |
16 | fi | 29 | fi |
@@ -20,7 +33,6 @@ oe_multilib_header() { | |||
20 | continue | 33 | continue |
21 | fi | 34 | fi |
22 | stem=$(echo $each_header | sed 's#\.h$##') | 35 | stem=$(echo $each_header | sed 's#\.h$##') |
23 | ident=${SITEINFO_BITS} | ||
24 | # if mips64/n32 set ident to n32 | 36 | # if mips64/n32 set ident to n32 |
25 | mv ${D}/${includedir}/$each_header ${D}/${includedir}/${stem}-${ident}.h | 37 | mv ${D}/${includedir}/$each_header ${D}/${includedir}/${stem}-${ident}.h |
26 | 38 | ||
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): | |||
51 | "linux": "common-linux common-glibc", | 51 | "linux": "common-linux common-glibc", |
52 | "linux-gnu": "common-linux common-glibc", | 52 | "linux-gnu": "common-linux common-glibc", |
53 | "linux-gnux32": "common-linux common-glibc", | 53 | "linux-gnux32": "common-linux common-glibc", |
54 | "linux-gnun32": "common-linux common-glibc", | ||
54 | "linux-gnueabi": "common-linux common-glibc", | 55 | "linux-gnueabi": "common-linux common-glibc", |
55 | "linux-gnuspe": "common-linux common-glibc", | 56 | "linux-gnuspe": "common-linux common-glibc", |
56 | "linux-uclibc": "common-linux common-uclibc", | 57 | "linux-uclibc": "common-linux common-uclibc", |
@@ -66,6 +67,10 @@ def siteinfo_data(d): | |||
66 | "arm-linux-uclibceabi": "arm-linux-uclibc", | 67 | "arm-linux-uclibceabi": "arm-linux-uclibc", |
67 | "armeb-linux-gnueabi": "armeb-linux", | 68 | "armeb-linux-gnueabi": "armeb-linux", |
68 | "armeb-linux-uclibceabi": "armeb-linux-uclibc", | 69 | "armeb-linux-uclibceabi": "armeb-linux-uclibc", |
70 | "mips-linux-gnun32": "mips-linux", | ||
71 | "mipsel-linux-gnun32": "mipsel-linux", | ||
72 | "mips64-linux-gnun32": "mips-linux", | ||
73 | "mips64el-linux-gnun32": "mipsel-linux", | ||
69 | "powerpc-linux": "powerpc32-linux", | 74 | "powerpc-linux": "powerpc32-linux", |
70 | "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", | 75 | "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", |
71 | "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", | 76 | "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", |