[PATCH 0/3] Upgrade musl to 1.1.24+

[PATCH 0/3] Upgrade musl to 1.1.24+

[Khem Raj]

Build it out of tree
Enable 64bit time_t on 32bit arches

The following changes since commit 3e108b70176dee3495f3afcea1c0c87cccf2a379:

  bitbake: cache: Lower debug level for wold build messages (2020-01-02 16:43:01 +0000)

are available in the Git repository at:

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

Khem Raj (3):
  musl: Upgrade beyond 1.24
  musl: Build outside of source tree
  tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags

 meta/conf/distro/include/tclibc-musl.inc      |  1 +
 meta/recipes-core/musl/musl.inc               |  4 +-
 .../0001-riscv-Define-sigcontext-again.patch  | 48 -------------------
 meta/recipes-core/musl/musl_git.bb            |  5 +-
 4 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch

-- 
2.24.1

[PATCH 1/3] musl: Upgrade beyond 1.24

[Khem Raj]

License-Change: Added ARM to copyright files [1] [2] [3]

Detailed changes are here [4]

[1] https://git.musl-libc.org/cgit/musl/commit/COPYRIGHT?id=db3cc9a319c788cf5241ea68d3fa86b43f35733e
[2] https://git.musl-libc.org/cgit/musl/commit/?id=daa29e894c74d61296fe19d9b7c4be2f04037639
[3] https://git.musl-libc.org/cgit/musl/commit/?id=d3f7df235904439d48db041c7796e5b44be5b8e6
[4] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=2c2477da9a553c0b9b2fa18073a5dcdbe6d395af..70d80609558153a996833392999c69cdb74e1119

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/musl/musl.inc               |  2 +-
 .../0001-riscv-Define-sigcontext-again.patch  | 48 -------------------
 meta/recipes-core/musl/musl_git.bb            |  5 +-
 3 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch

diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index 0683bf85ed..9aea2c39c8 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -9,7 +9,7 @@ standards-conformance and safety."
 HOMEPAGE = "http://www.musl-libc.org/"
 LICENSE = "MIT"
 SECTION = "libs"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d0fe2be17bc45ff4a42ade1c13ed6340"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f95ee848a08ad253c04723da00cedb01"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch b/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
deleted file mode 100644
index fcb324e15f..0000000000
--- a/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit a0993f8f0f161423ecdcb754f282ffd2fe47a7b5
-Author: Rich Felker <dalias@aerifal.cx>
-Date:   Wed Oct 2 09:28:03 2019 -0400
-
-    reintroduce riscv64 struct sigcontext
-    
-    commit ab3eb89a8b83353cdaab12ed017a67a7730f90e9 removed it as part of
-    correcting the mcontext_t definition, but there is still code using
-    struct sigcontext and expecting the member names present in it, most
-    notably libgcc_eh. almost all such usage is incorrect, but bring back
-    struct sigcontext at least for now so as not to introduce regressions.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h
-index 03fe48c1..2ff4be30 100644
---- a/arch/riscv64/bits/signal.h
-+++ b/arch/riscv64/bits/signal.h
-@@ -6,12 +6,6 @@
- # define SIGSTKSZ 8192
- #endif
- 
--#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
--typedef unsigned long greg_t;
--typedef unsigned long gregset_t[32];
--typedef union __riscv_mc_fp_state fpregset_t;
--#endif
--
- typedef unsigned long __riscv_mc_gp_state[32];
- 
- struct __riscv_mc_f_ext_state {
-@@ -41,6 +35,16 @@ typedef struct mcontext_t {
- 	union __riscv_mc_fp_state __fpregs;
- } mcontext_t;
- 
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+typedef unsigned long greg_t;
-+typedef unsigned long gregset_t[32];
-+typedef union __riscv_mc_fp_state fpregset_t;
-+struct sigcontext {
-+	gregset_t gregs;
-+	fpregset_t fpregs;
-+};
-+#endif
-+
- struct sigaltstack {
- 	void *ss_sp;
- 	int ss_flags;
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index aacff79f7c..92149b5632 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,9 +4,9 @@
 require musl.inc
 inherit linuxloader
 
-SRCREV = "2c2477da9a553c0b9b2fa18073a5dcdbe6d395af"
+SRCREV = "70d80609558153a996833392999c69cdb74e1119"
 
-BASEVER = "1.1.23"
+BASEVER = "1.1.24"
 
 PV = "${BASEVER}+git${SRCPV}"
 
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}"
 SRC_URI = "git://git.musl-libc.org/musl \
            file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
            file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
-           file://0001-riscv-Define-sigcontext-again.patch \
           "
 
 S = "${WORKDIR}/git"
-- 
2.24.1

[PATCH 2/3] musl: Build outside of source tree

[Khem Raj]

musl does not use cmake/autotools etc. but plane old makefile basded
build system, which means it does not get B defined to be outside S
therefore define B explicitly to be outside S

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/musl/musl.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index 9aea2c39c8..e5cc869cb9 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -25,3 +25,5 @@ MIPS_INSTRUCTION_SET = "mips"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 ARM_INSTRUCTION_SET_armv4 = "arm"
 
+# Enable out of tree build
+B = "${WORKDIR}/build"
-- 
2.24.1

Re: [PATCH 2/3] musl: Build outside of source tree

[Ross Burton]

On 03/01/2020 07:21, Khem Raj wrote:
> musl does not use cmake/autotools etc. but plane old makefile basded
> build system, which means it does not get B defined to be outside S
> therefore define B explicitly to be outside S
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   meta/recipes-core/musl/musl.inc | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
> index 9aea2c39c8..e5cc869cb9 100644
> --- a/meta/recipes-core/musl/musl.inc
> +++ b/meta/recipes-core/musl/musl.inc
> @@ -25,3 +25,5 @@ MIPS_INSTRUCTION_SET = "mips"
>   ARM_INSTRUCTION_SET_armv5 = "arm"
>   ARM_INSTRUCTION_SET_armv4 = "arm"
>   
> +# Enable out of tree build
> +B = "${WORKDIR}/build"

That directory won't get cleaned unless you also set [cleandirs].

Ross

[PATCH 3/3] tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags

[Khem Raj]

This is needed for 64bit time_t support on 32bit architectures
see [1]

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/distro/include/tclibc-musl.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
index 8badbbb40a..22f8214ba3 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/meta/conf/distro/include/tclibc-musl.inc
@@ -18,6 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig"
 #USE_NLS ?= "no"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
+TARGET_CC_ARCH += "-D__USE_TIME_BITS64"
 
 IMAGE_LINGUAS = ""
 
-- 
2.24.1

Re: [PATCH 3/3] tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags

[André Draszik]

On Thu, 2020-01-02 at 23:21 -0800, Khem Raj wrote:
> This is needed for 64bit time_t support on 32bit architectures
> see [1]
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f

As per the above, __USE_TIME_BITS64 is a glibc-internal macro, to be defined (by glibc),
when the application requestion 64 bit time_t via #define _TIME_BITS 64

Is the behaviour different on musl? Should this patch instead set _TIME_BITS?

Cheers,
Andre'


> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/conf/distro/include/tclibc-musl.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
> index 8badbbb40a..22f8214ba3 100644
> --- a/meta/conf/distro/include/tclibc-musl.inc
> +++ b/meta/conf/distro/include/tclibc-musl.inc
> @@ -18,6 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig"
>  #USE_NLS ?= "no"
>  
>  CXXFLAGS += "-fvisibility-inlines-hidden"
> +TARGET_CC_ARCH += "-D__USE_TIME_BITS64"
>  
>  IMAGE_LINGUAS = ""
>  
> -- 
> 2.24.1
> 

Re: [PATCH 3/3] tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags

[Khem Raj]

On Mon, Jan 6, 2020 at 9:08 AM André Draszik <git@andred.net> wrote:
>
> On Thu, 2020-01-02 at 23:21 -0800, Khem Raj wrote:
> > This is needed for 64bit time_t support on 32bit architectures
> > see [1]
> >
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
>
> As per the above, __USE_TIME_BITS64 is a glibc-internal macro, to be defined (by glibc),
> when the application requestion 64 bit time_t via #define _TIME_BITS 64
>
> Is the behaviour different on musl? Should this patch instead set _TIME_BITS?
>
For musl we wont need it since it is now the default.
this has now been defined in musl itself lately [1], so we don't need
to add this define externally anymore This was not the case when the
patchset was done.

I will test out a patch to remove it with latest musl and see if it
all works ok.

[1] https://git.musl-libc.org/cgit/musl/commit/?id=f12bd8e05c8bb2c3e2b91d635887ec424ef8fbd9

> Cheers,
> Andre'
>
>
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/conf/distro/include/tclibc-musl.inc | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
> > index 8badbbb40a..22f8214ba3 100644
> > --- a/meta/conf/distro/include/tclibc-musl.inc
> > +++ b/meta/conf/distro/include/tclibc-musl.inc
> > @@ -18,6 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig"
> >  #USE_NLS ?= "no"
> >
> >  CXXFLAGS += "-fvisibility-inlines-hidden"
> > +TARGET_CC_ARCH += "-D__USE_TIME_BITS64"
> >
> >  IMAGE_LINGUAS = ""
> >
> > --
> > 2.24.1
> >
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core