[PATCH 0/7] Support combination of MUSL and x32 build

[PATCH 0/7] Support combination of MUSL and x32 build

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

Modified infrastructure (bbclass) and fixed bugs on multiple recipes to 
enable combination of MUSL and x32 build.

The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe:

  bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib sweeaun/musl_x32_support
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sweeaun/musl_x32_support

sweeaun (7):
  insane.bbclass: Support musl-x32
  siteinfo.bbclass: Support musl-x32
  gnu-efi: Support musl-x32 build
  grub-efi: Support musl-x32
  openssl: Support musl-x32 build
  perl: Support musl-x32 build
  libffi: Support musl-x32 build

 meta/classes/insane.bbclass                        |  5 +++-
 meta/classes/siteinfo.bbclass                      |  2 ++
 meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb          |  1 +
 meta/recipes-bsp/grub/grub-efi_2.02.bb             |  2 ++
 meta/recipes-connectivity/openssl/openssl.inc      |  6 +++--
 meta/recipes-devtools/perl/perl_5.24.1.bb          |  2 +-
 .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
 8 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch

-- 
2.7.4

[PATCH 1/7] insane.bbclass: Support musl-x32

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

Added musl-x32 elf header into dictionary.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/classes/insane.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 0e974b5..259d820 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -147,6 +147,9 @@ def package_qa_get_machine_dict(d):
             "linux-gnux32" :       {
                         "x86_64":     (62,     0,    0,          True,          32),
                       },
+            "linux-muslx32" :       {
+                        "x86_64":     (62,     0,    0,          True,          32),
+                      },
             "linux-gnun32" :       {
                         "mips64":       ( 8,     0,    0,          False,         32),
                         "mips64el":     ( 8,     0,    0,          True,          32),
@@ -485,7 +488,7 @@ def package_qa_check_arch(path,name,d, elf, messages):
 
     # Check the architecture and endiannes of the binary
     is_32 = (("virtual/kernel" in provides) or bb.data.inherits_class("module", d)) and \
-            (target_os == "linux-gnux32" or re.match('mips64.*32', d.getVar('DEFAULTTUNE')))
+            (target_os == "linux-gnux32" or target_os == "linux-muslx32"  or re.match('mips64.*32', d.getVar('DEFAULTTUNE')))
     if not ((machine == elf.machine()) or is_32):
         package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) on %s" % \
                  (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path,d)))
-- 
2.7.4

[PATCH 2/7] siteinfo.bbclass: Support musl-x32

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

Modified targetinfo and osinfo to support musl-x32.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/classes/siteinfo.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 90ea5ba..20b4704 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -63,6 +63,7 @@ def siteinfo_data(d):
         "linux-gnueabi": "common-linux common-glibc",
         "linux-gnuspe": "common-linux common-glibc",
         "linux-musl": "common-linux common-musl",
+        "linux-muslx32": "common-linux common-musl",
         "linux-musleabi": "common-linux common-musl",
         "linux-muslspe": "common-linux common-musl",
         "uclinux-uclibc": "common-uclibc",
@@ -99,6 +100,7 @@ def siteinfo_data(d):
         "x86_64-darwin9": "bit-64",
         "x86_64-linux": "bit-64",
         "x86_64-linux-musl": "x86_64-linux bit-64",
+        "x86_64-linux-muslx32": "bit-32 ix86-common x32-linux",
         "x86_64-elf": "bit-64",
         "x86_64-linux-gnu": "bit-64 x86_64-linux",
         "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux",
-- 
2.7.4

[PATCH 3/7] gnu-efi: Support musl-x32 build

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

To build 64-bit binaries for musl-x32.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
index d6f9f53..7346737 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
@@ -53,6 +53,7 @@ FILES_${PN} += "${libdir}/*.lds"
 
 # 64-bit binaries are expected for EFI when targeting X32
 INSANE_SKIP_${PN}-dev_append_linux-gnux32 = " arch"
+INSANE_SKIP_${PN}-dev_append_linux-muslx32 = " arch"
 
 BBCLASSEXTEND = "native"
 
-- 
2.7.4

[PATCH 4/7] grub-efi: Support musl-x32

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

To build 64-bit binaries for musl-x32.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/recipes-bsp/grub/grub-efi_2.02.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index 9d494d5..b949beb 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -65,5 +65,7 @@ FILES_${PN} += "${libdir}/grub/${GRUB_TARGET}-efi \
 # 64-bit binaries are expected for the bootloader with an x32 userland
 INSANE_SKIP_${PN}_append_linux-gnux32 = " arch"
 INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch"
+INSANE_SKIP_${PN}_append_linux-muslx32 = " arch"
+INSANE_SKIP_${PN}-dbg_append_linux-muslx32 = " arch"
 
 BBCLASSEXTEND = "native"
-- 
2.7.4

[PATCH 5/7] openssl: Support musl-x32 build

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

Support musl-x32 build which to build openssl with 32 bits.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/recipes-connectivity/openssl/openssl.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 3980ec2..bcbbe06 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -65,8 +65,7 @@ do_configure () {
 	os=${HOST_OS}
 	case $os in
 	linux-gnueabi |\
-	linux-gnuspe |\
-	linux-musl*)
+	linux-gnuspe)
 		os=linux
 		;;
 		*)
@@ -101,6 +100,9 @@ do_configure () {
 	linux-gnux32-x86_64)
 		target=linux-x32
 		;;
+        linux-muslx32-x86_64)
+                target=linux-x32
+                ;;
 	linux-gnu64-x86_64)
 		target=linux-x86_64
 		;;
-- 
2.7.4

[PATCH 6/7] perl: Support musl-x32 build

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

Existing musl fixups in perl recipe doesn't cover linux-muslx32.
This is fixed to support musl-x32 build.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/recipes-devtools/perl/perl_5.24.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index b0ceb84..95d9694 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -125,7 +125,7 @@ do_configure() {
         done
 
         # Fixups for musl
-        if [ "${TARGET_OS}" = "linux-musl" -o "${TARGET_OS}" = "linux-musleabi" ]; then
+        if [ "${TARGET_OS}" = "linux-musl" -o "${TARGET_OS}" = "linux-musleabi" -o "${TARGET_OS}" = "linux-muslx32" ]; then
                 sed -i -e "s,\(d_libm_lib_version=\)'define',\1'undef',g" \
                        -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
                        -e "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
-- 
2.7.4

[PATCH 7/7] libffi: Support musl-x32 build

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

Upstream-Status: Pending.
Added target musl-x32 in configure.ac to support musl-x32 build in libffi.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch

diff --git a/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
new file mode 100644
index 0000000..971a543
--- /dev/null
+++ b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
@@ -0,0 +1,29 @@
+From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00 2001
+From: sweeaun <swee.aun.khor@intel.com>
+Date: Mon, 3 Jul 2017 13:23:31 -0700
+Subject: [PATCH] libffi: Support musl x32 build
+
+Support libffi build with target musl-x32.
+
+Signed-off-by: sweeaun <swee.aun.khor@intel.com>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index a7bf5ee..f4e101d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,9 @@ case "$host" in
+ 	    *-gnux32)
+ 	      TARGET=X86_64
+ 	      ;;
++            *-muslx32)
++              TARGET=X86_64
++              ;;
+ 	    *)
+ 	      TARGET=X86
+ 	      ;;
+-- 
+2.7.4
+
diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb b/meta/recipes-support/libffi/libffi_3.2.1.bb
index 43eee8e..2a3f4b7 100644
--- a/meta/recipes-support/libffi/libffi_3.2.1.bb
+++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
@@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \
            file://not-win32.patch \
 	   file://0001-mips-Use-compiler-internal-define-for-linux.patch \
            file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
+           file://0001-libffi-Support-musl-x32-build.patch \
 	   "
 
 SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
-- 
2.7.4

Re: [PATCH 7/7] libffi: Support musl-x32 build

[Khem Raj]

[-- Attachment #1.1: Type: text/plain, Size: 2394 bytes --]



On 7/5/17 4:56 PM, swee.aun.khor@intel.com wrote:
> From: sweeaun <swee.aun.khor@intel.com>
> 
> Upstream-Status: Pending.
> Added target musl-x32 in configure.ac to support musl-x32 build in libffi.
> 
> Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> ---
>  .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
>  meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
> 
> diff --git a/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
> new file mode 100644
> index 0000000..971a543
> --- /dev/null
> +++ b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
> @@ -0,0 +1,29 @@
> +From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00 2001
> +From: sweeaun <swee.aun.khor@intel.com>
> +Date: Mon, 3 Jul 2017 13:23:31 -0700
> +Subject: [PATCH] libffi: Support musl x32 build
> +
> +Support libffi build with target musl-x32.
> +
> +Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> +---
> + configure.ac | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/configure.ac b/configure.ac
> +index a7bf5ee..f4e101d 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -180,6 +180,9 @@ case "$host" in
> + 	    *-gnux32)
> + 	      TARGET=X86_64
> + 	      ;;
> ++            *-muslx32)
> ++              TARGET=X86_64
> ++              ;;

just OR it with case just above it.
*-gnux32 | *-muslx32

> + 	    *)
> + 	      TARGET=X86
> + 	      ;;
> +-- 
> +2.7.4
> +
> diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb b/meta/recipes-support/libffi/libffi_3.2.1.bb
> index 43eee8e..2a3f4b7 100644
> --- a/meta/recipes-support/libffi/libffi_3.2.1.bb
> +++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
> @@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \
>             file://not-win32.patch \
>  	   file://0001-mips-Use-compiler-internal-define-for-linux.patch \
>             file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
> +           file://0001-libffi-Support-musl-x32-build.patch \
>  	   "
>  
>  SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

Re: [PATCH 5/7] openssl: Support musl-x32 build

[Khem Raj]

[-- Attachment #1.1: Type: text/plain, Size: 1147 bytes --]



On 7/5/17 4:56 PM, swee.aun.khor@intel.com wrote:
> From: sweeaun <swee.aun.khor@intel.com>
> 
> Support musl-x32 build which to build openssl with 32 bits.
> 
> Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> ---
>  meta/recipes-connectivity/openssl/openssl.inc | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index 3980ec2..bcbbe06 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -65,8 +65,7 @@ do_configure () {
>  	os=${HOST_OS}
>  	case $os in
>  	linux-gnueabi |\
> -	linux-gnuspe |\
> -	linux-musl*)

removing this will break other musl arches.

> +	linux-gnuspe)
>  		os=linux
>  		;;
>  		*)
> @@ -101,6 +100,9 @@ do_configure () {
>  	linux-gnux32-x86_64)
>  		target=linux-x32
>  		;;
> +        linux-muslx32-x86_64)
> +                target=linux-x32
> +                ;;

you can move it above the generic check above

>  	linux-gnu64-x86_64)
>  		target=linux-x86_64
>  		;;
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

✗ patchtest: failure for Support combination of MUSL and x32 build

[Patchwork]

== Series Details ==

Series: Support combination of MUSL and x32 build
Revision: 1
URL   : https://patchwork.openembedded.org/series/7591/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence] 
  Suggested fix    Add Upstream-Status: <status> to the header of meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch (possible values: Pending, Submitted, Accepted, Backport, Denied, Inappropriate)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH 7/7] libffi: Support musl-x32 build

[Khor, Swee Aun]

Will do that. 

-----Original Message-----
From: Khem Raj [mailto:raj.khem@gmail.com] 
Sent: Thursday, July 6, 2017 3:22 PM
To: Khor, Swee Aun <swee.aun.khor@intel.com>; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 7/7] libffi: Support musl-x32 build



On 7/5/17 4:56 PM, swee.aun.khor@intel.com wrote:
> From: sweeaun <swee.aun.khor@intel.com>
> 
> Upstream-Status: Pending.
> Added target musl-x32 in configure.ac to support musl-x32 build in libffi.
> 
> Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> ---
>  .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
>  meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 
> meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.
> patch
> 
> diff --git 
> a/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-buil
> d.patch 
> b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-buil
> d.patch
> new file mode 100644
> index 0000000..971a543
> --- /dev/null
> +++ b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-
> +++ build.patch
> @@ -0,0 +1,29 @@
> +From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00 
> +2001
> +From: sweeaun <swee.aun.khor@intel.com>
> +Date: Mon, 3 Jul 2017 13:23:31 -0700
> +Subject: [PATCH] libffi: Support musl x32 build
> +
> +Support libffi build with target musl-x32.
> +
> +Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> +---
> + configure.ac | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/configure.ac b/configure.ac index a7bf5ee..f4e101d 
> +100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -180,6 +180,9 @@ case "$host" in
> + 	    *-gnux32)
> + 	      TARGET=X86_64
> + 	      ;;
> ++            *-muslx32)
> ++              TARGET=X86_64
> ++              ;;

just OR it with case just above it.
*-gnux32 | *-muslx32

> + 	    *)
> + 	      TARGET=X86
> + 	      ;;
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb 
> b/meta/recipes-support/libffi/libffi_3.2.1.bb
> index 43eee8e..2a3f4b7 100644
> --- a/meta/recipes-support/libffi/libffi_3.2.1.bb
> +++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
> @@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \
>             file://not-win32.patch \
>  	   file://0001-mips-Use-compiler-internal-define-for-linux.patch \
>             file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
> +           file://0001-libffi-Support-musl-x32-build.patch \
>  	   "
>  
>  SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
> 

Re: [PATCH 5/7] openssl: Support musl-x32 build

[Khor, Swee Aun]

You are right, the linux-musl* removing is breaking other musl arches. I will change to this. 

@@ -65,8 +65,7 @@ do_configure () {
 	os=${HOST_OS}
 	case $os in
 	linux-gnueabi |\
	linux-gnuspe |\
-	linux-musl*)
+	linux-musleabi |\
+	linux-muslspe)
		os=linux
 		;;
 		*)

I will combine the linux-gnux32-x86_64 and linux-muslx32-x86_64. 

@@ -101,6 +100,9 @@ do_configure () {
-	linux-gnux32-x86_64
+	linux-gnux32-x86_64| linux-muslx32-x86_64)
 		target=linux-x32
 		;;
	linux-gnu64-x86_64)
 		target=linux-x86_64
 		;;
-- 
2.7.4


-----Original Message-----
From: Khem Raj [mailto:raj.khem@gmail.com] 
Sent: Thursday, July 6, 2017 3:24 PM
To: Khor, Swee Aun <swee.aun.khor@intel.com>; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 5/7] openssl: Support musl-x32 build



On 7/5/17 4:56 PM, swee.aun.khor@intel.com wrote:
> From: sweeaun <swee.aun.khor@intel.com>
> 
> Support musl-x32 build which to build openssl with 32 bits.
> 
> Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> ---
>  meta/recipes-connectivity/openssl/openssl.inc | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index 3980ec2..bcbbe06 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -65,8 +65,7 @@ do_configure () {
>  	os=${HOST_OS}
>  	case $os in
>  	linux-gnueabi |\
> -	linux-gnuspe |\
> -	linux-musl*)

removing this will break other musl arches.

> +	linux-gnuspe)
>  		os=linux
>  		;;
>  		*)
> @@ -101,6 +100,9 @@ do_configure () {
>  	linux-gnux32-x86_64)
>  		target=linux-x32
>  		;;
> +        linux-muslx32-x86_64)
> +                target=linux-x32
> +                ;;

you can move it above the generic check above

>  	linux-gnu64-x86_64)
>  		target=linux-x86_64
>  		;;
> 

Re: [PATCH 7/7] libffi: Support musl-x32 build

[Wold, Saul]

On Wed, 2017-07-05 at 16:56 -0700, swee.aun.khor@intel.com wrote:
> From: sweeaun <swee.aun.khor@intel.com>
> 
> Upstream-Status: Pending.
The Upstream-Status needs to be in the .patch file, not in the main
patch commit.

See below

> Added target musl-x32 in configure.ac to support musl-x32 build in
> libffi.
> 
> Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> ---
>  .../0001-libffi-Support-musl-x32-build.patch       | 29
> ++++++++++++++++++++++
>  meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-
> Support-musl-x32-build.patch
> 
> diff --git a/meta/recipes-support/libffi/libffi/0001-libffi-Support-
> musl-x32-build.patch b/meta/recipes-support/libffi/libffi/0001-
> libffi-Support-musl-x32-build.patch
> new file mode 100644
> index 0000000..971a543
> --- /dev/null
> +++ b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-
> x32-build.patch
> @@ -0,0 +1,29 @@
> +From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00
> 2001
> +From: sweeaun <swee.aun.khor@intel.com>
> +Date: Mon, 3 Jul 2017 13:23:31 -0700
> +Subject: [PATCH] libffi: Support musl x32 build
> +
> +Support libffi build with target musl-x32.
> +
Upstream-Status goes here

Sau!

> +Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> +---
> + configure.ac | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/configure.ac b/configure.ac
> +index a7bf5ee..f4e101d 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -180,6 +180,9 @@ case "$host" in
> + 	    *-gnux32)
> + 	      TARGET=X86_64
> + 	      ;;
> ++            *-muslx32)
> ++              TARGET=X86_64
> ++              ;;
> + 	    *)
> + 	      TARGET=X86
> + 	      ;;
> +-- 
> +2.7.4
> +
> diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb
> b/meta/recipes-support/libffi/libffi_3.2.1.bb
> index 43eee8e..2a3f4b7 100644
> --- a/meta/recipes-support/libffi/libffi_3.2.1.bb
> +++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
> @@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.ta
> r.gz \
>             file://not-win32.patch \
>  	   file://0001-mips-Use-compiler-internal-define-for-
> linux.patch \
>             file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
> +           file://0001-libffi-Support-musl-x32-build.patch \
>  	   "
>  
>  SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
> -- 
> 2.7.4
> 

Re: [PATCH 7/7] libffi: Support musl-x32 build

[Khor, Swee Aun]

Got it. Will update that. 

-----Original Message-----
From: Wold, Saul 
Sent: Thursday, July 6, 2017 10:51 PM
To: Khor, Swee Aun <swee.aun.khor@intel.com>; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 7/7] libffi: Support musl-x32 build

On Wed, 2017-07-05 at 16:56 -0700, swee.aun.khor@intel.com wrote:
> From: sweeaun <swee.aun.khor@intel.com>
> 
> Upstream-Status: Pending.
The Upstream-Status needs to be in the .patch file, not in the main patch commit.

See below

> Added target musl-x32 in configure.ac to support musl-x32 build in 
> libffi.
> 
> Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> ---
>  .../0001-libffi-Support-musl-x32-build.patch       | 29
> ++++++++++++++++++++++
>  meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-
> Support-musl-x32-build.patch
> 
> diff --git a/meta/recipes-support/libffi/libffi/0001-libffi-Support-
> musl-x32-build.patch b/meta/recipes-support/libffi/libffi/0001-
> libffi-Support-musl-x32-build.patch
> new file mode 100644
> index 0000000..971a543
> --- /dev/null
> +++ b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-
> x32-build.patch
> @@ -0,0 +1,29 @@
> +From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00
> 2001
> +From: sweeaun <swee.aun.khor@intel.com>
> +Date: Mon, 3 Jul 2017 13:23:31 -0700
> +Subject: [PATCH] libffi: Support musl x32 build
> +
> +Support libffi build with target musl-x32.
> +
Upstream-Status goes here

Sau!

> +Signed-off-by: sweeaun <swee.aun.khor@intel.com>
> +---
> + configure.ac | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/configure.ac b/configure.ac index a7bf5ee..f4e101d 
> +100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -180,6 +180,9 @@ case "$host" in
> + 	    *-gnux32)
> + 	      TARGET=X86_64
> + 	      ;;
> ++            *-muslx32)
> ++              TARGET=X86_64
> ++              ;;
> + 	    *)
> + 	      TARGET=X86
> + 	      ;;
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb
> b/meta/recipes-support/libffi/libffi_3.2.1.bb
> index 43eee8e..2a3f4b7 100644
> --- a/meta/recipes-support/libffi/libffi_3.2.1.bb
> +++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
> @@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.ta
> r.gz \
>             file://not-win32.patch \
>  	   file://0001-mips-Use-compiler-internal-define-for-
> linux.patch \
>             file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
> +           file://0001-libffi-Support-musl-x32-build.patch \
>  	   "
>  
>  SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
> --
> 2.7.4
> 

[PATCH 3/7] gnu-efi: Support musl-x32 build

[swee.aun.khor]

From: sweeaun <swee.aun.khor@intel.com>

To build 64-bit binaries for musl-x32.

Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
 meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
index d6f9f53..7346737 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
@@ -53,6 +53,7 @@ FILES_${PN} += "${libdir}/*.lds"
 
 # 64-bit binaries are expected for EFI when targeting X32
 INSANE_SKIP_${PN}-dev_append_linux-gnux32 = " arch"
+INSANE_SKIP_${PN}-dev_append_linux-muslx32 = " arch"
 
 BBCLASSEXTEND = "native"
 
-- 
2.7.4