diff options
| -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 | ||||
| -rw-r--r-- | meta/conf/machine/include/mips/arch-mips.inc | 1 |
4 files changed, 32 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(): "linux-gnux32" : { "x86_64": (62, 0, 0, True, 32), }, + "linux-gnun32" : { + "mips64": ( 8, 0, 0, False, 32), + "mipsel64": ( 8, 0, 0, True, 32), + }, } 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 @@ inherit siteinfo -# If applicable on the architecture, this routine will rename the header and add -# a unique identifier to the name for the ABI/bitsize that is being used. A wrapper will -# be generated for the architecture that knows how to call all of the ABI variants for that -# given architecture. -# -# TODO: mips64 n32 is not yet recognized in this code -# when that is identified the name of the wrapped item should be "n32" and appropriately -# determined int he if coding... +# If applicable on the architecture, this routine will rename the header and +# add a unique identifier to the name for the ABI/bitsize that is being used. +# A wrapper will be generated for the architecture that knows how to call +# all of the ABI variants for that given architecture. # oe_multilib_header() { - # Do nothing on ARM, only one ABI is supported at once + # We use + # For ARM: We don't support multilib builds. + # For MIPS: "n32" is a special case, which needs to be + # distinct from both 64-bit and 32-bit. + case ${TARGET_ARCH} in + arm*) return + ;; + mips*) case "${MIPSPKGSFX_ABI}" in + "-n32") + ident=n32 + ;; + *) + ident=${SITEINFO_BITS} + ;; + esac + ;; + *) ident=${SITEINFO_BITS} + esac if echo ${TARGET_ARCH} | grep -q arm; then return fi @@ -20,7 +33,6 @@ oe_multilib_header() { continue fi stem=$(echo $each_header | sed 's#\.h$##') - ident=${SITEINFO_BITS} # if mips64/n32 set ident to n32 mv ${D}/${includedir}/$each_header ${D}/${includedir}/${stem}-${ident}.h 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", diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc index 9f12920848..c390ff9206 100644 --- a/meta/conf/machine/include/mips/arch-mips.inc +++ b/meta/conf/machine/include/mips/arch-mips.inc @@ -17,6 +17,7 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "o32", "-mabi=32", "", d)} TUNEVALID[n32] = "MIPS64 n32 ABI" TUNECONFLICTS[n32] = "o32 n64" +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "n32", "n32", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n32", "-mabi=n32", "", d)}" TUNEVALID[n64] = "MIPS64 n64 ABI" |