* [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates
@ 2019-10-21 1:32 voidlinux-github
2019-10-21 2:44 ` voidlinux-github
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 1:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 674 bytes --]
There is a new pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages musl1124
https://github.com/void-linux/void-packages/pull/15655
musl: update to 1.1.24 + matching crosstoolchain updates
Updating the crosstoolchains as there have been header changes.
This also adds two backports from current musl git master, which fix some compatibility issues with glibc headers on powerpc(64) which should allow us to greatly reduce the musl-specific patches we have in the tree.
TODO/ongoing:
- [ ] test crosstoolchain builds
A patch file from https://github.com/void-linux/void-packages/pull/15655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl1124-15655.patch --]
[-- Type: text/x-diff, Size: 31888 bytes --]
From 72e9b3518e5af139ec13007cc2671fc05baf57f2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 02:42:57 +0200
Subject: [PATCH 01/14] musl: update to 1.1.24
---
srcpkgs/musl/patches/powerpc-wchar-t.patch | 19 ----
srcpkgs/musl/patches/ppc-pt_regs.patch | 38 ++++++++
.../musl/patches/ppc-unaligned-relocs.patch | 86 -------------------
srcpkgs/musl/patches/ppc64-fpregset_t.patch | 31 +++++++
srcpkgs/musl/template | 6 +-
5 files changed, 72 insertions(+), 108 deletions(-)
delete mode 100644 srcpkgs/musl/patches/powerpc-wchar-t.patch
create mode 100644 srcpkgs/musl/patches/ppc-pt_regs.patch
delete mode 100644 srcpkgs/musl/patches/ppc-unaligned-relocs.patch
create mode 100644 srcpkgs/musl/patches/ppc64-fpregset_t.patch
diff --git a/srcpkgs/musl/patches/powerpc-wchar-t.patch b/srcpkgs/musl/patches/powerpc-wchar-t.patch
deleted file mode 100644
index fb45d26f029..00000000000
--- a/srcpkgs/musl/patches/powerpc-wchar-t.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Clang defines wchar_t as int, gcc as long on the target. They have the same
-size, but are different types. i386 already has this same change, do it for
-powerpc as well.
-
---- arch/powerpc/bits/alltypes.h.in
-+++ arch/powerpc/bits/alltypes.h.in
-@@ -6,8 +6,12 @@ TYPEDEF __builtin_va_list va_list;
- TYPEDEF __builtin_va_list __isoc_va_list;
-
- #ifndef __cplusplus
-+#ifdef __WCHAR_TYPE__
-+TYPEDEF __WCHAR_TYPE__ wchar_t;
-+#else
- TYPEDEF long wchar_t;
- #endif
-+#endif
-
- TYPEDEF float float_t;
- TYPEDEF double double_t;
diff --git a/srcpkgs/musl/patches/ppc-pt_regs.patch b/srcpkgs/musl/patches/ppc-pt_regs.patch
new file mode 100644
index 00000000000..93ab51e25c0
--- /dev/null
+++ b/srcpkgs/musl/patches/ppc-pt_regs.patch
@@ -0,0 +1,38 @@
+commit c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+Author: Rich Felker <dalias@aerifal.cx>
+Date: Sat Oct 19 15:53:43 2019 -0400
+
+ use struct pt_regs * rather than void * for powerpc[64] sigcontext regs
+
+ this is to match the kernel and glibc interfaces. here, struct pt_regs
+ is an incomplete type, but that's harmless, and if it's completed by
+ inclusion of another header then members of the struct pointed to by
+ the regs member can be accessed directly without going through a cast
+ or intermediate pointer object.
+
+diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
+index 06efb11c..c1bf3caf 100644
+--- arch/powerpc/bits/signal.h
++++ arch/powerpc/bits/signal.h
+@@ -28,7 +28,7 @@ struct sigcontext {
+ int signal;
+ unsigned long handler;
+ unsigned long oldmask;
+- void *regs;
++ struct pt_regs *regs;
+ };
+
+ typedef struct {
+diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
+index 4dec22a5..d5493b18 100644
+--- arch/powerpc64/bits/signal.h
++++ arch/powerpc64/bits/signal.h
+@@ -32,7 +32,7 @@ typedef struct sigcontext {
+ int _pad0;
+ unsigned long handler;
+ unsigned long oldmask;
+- void *regs;
++ struct pt_regs *regs;
+ gregset_t gp_regs;
+ fpregset_t fp_regs;
+ vrregset_t *v_regs;
diff --git a/srcpkgs/musl/patches/ppc-unaligned-relocs.patch b/srcpkgs/musl/patches/ppc-unaligned-relocs.patch
deleted file mode 100644
index c40b0197668..00000000000
--- a/srcpkgs/musl/patches/ppc-unaligned-relocs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Date: Sun, 30 Jun 2019 07:39:20 -0500
-From: Samuel Holland <samuel@...lland.org>
-To: musl@...ts.openwall.com
-Cc: Samuel Holland <samuel@...lland.org>
-Subject: [PATCH] add support for powerpc/powerpc64 unaligned relocations
-
-R_PPC_UADDR32 (R_PPC64_UADDR64) has the same meaning as R_PPC_ADDR32
-(R_PPC64_ADDR64), except that its address need not be aligned. For
-powerpc64, BFD ld(1) will automatically convert between ADDR<->UADDR
-relocations when the address is/isn't at its native alignment. This
-will happen if, for example, there is a pointer in a packed struct.
-
-gold and lld do not currently generate R_PPC64_UADDR64, but pass
-through misaligned R_PPC64_ADDR64 relocations from object files,
-possibly relaxing them to misaligned R_PPC64_RELATIVE. In both cases
-(relaxed or not) this violates the PSABI, which defines the relevant
-field type as "a 64-bit field occupying 8 bytes, the alignment of
-which is 8 bytes unless otherwise specified."
-
-All three linkers violate the PSABI on 32-bit powerpc, where the only
-difference is that the field is 32 bits wide, aligned to 4 bytes.
-
-Currently musl fails to load executables linked by BFD ld containing
-R_PPC64_UADDR64, with the error "unsupported relocation type 43".
-This change provides compatibility with BFD ld on powerpc64, and any
-static linker on either architecture that starts following the PSABI
-more closely.
----
- arch/powerpc/reloc.h | 1 +
- arch/powerpc64/reloc.h | 1 +
- ldso/dynlink.c | 3 +++
- src/internal/dynlink.h | 1 +
- 4 files changed, 6 insertions(+)
-
-diff --git a/arch/powerpc/reloc.h b/arch/powerpc/reloc.h
-index 1b4cab36..527b6b7c 100644
---- arch/powerpc/reloc.h
-+++ arch/powerpc/reloc.h
-@@ -9,6 +9,7 @@
- #define TPOFF_K (-0x7000)
-
- #define REL_SYMBOLIC R_PPC_ADDR32
-+#define REL_USYMBOLIC R_PPC_UADDR32
- #define REL_GOT R_PPC_GLOB_DAT
- #define REL_PLT R_PPC_JMP_SLOT
- #define REL_RELATIVE R_PPC_RELATIVE
-diff --git a/arch/powerpc64/reloc.h b/arch/powerpc64/reloc.h
-index faf70acd..5bdaeede 100644
---- arch/powerpc64/reloc.h
-+++ arch/powerpc64/reloc.h
-@@ -11,6 +11,7 @@
- #define TPOFF_K (-0x7000)
-
- #define REL_SYMBOLIC R_PPC64_ADDR64
-+#define REL_USYMBOLIC R_PPC64_UADDR64
- #define REL_GOT R_PPC64_GLOB_DAT
- #define REL_PLT R_PPC64_JMP_SLOT
- #define REL_RELATIVE R_PPC64_RELATIVE
-diff --git a/ldso/dynlink.c b/ldso/dynlink.c
-index db543c19..b5ef4bfc 100644
---- ldso/dynlink.c
-+++ ldso/dynlink.c
-@@ -407,6 +407,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
- case REL_PLT:
- *reloc_addr = sym_val + addend;
- break;
-+ case REL_USYMBOLIC:
-+ memcpy(reloc_addr, &(size_t){sym_val + addend}, sizeof(size_t));
-+ break;
- case REL_RELATIVE:
- *reloc_addr = (size_t)base + addend;
- break;
-diff --git a/src/internal/dynlink.h b/src/internal/dynlink.h
-index 165bbedb..ffd06b04 100644
---- src/internal/dynlink.h
-+++ src/internal/dynlink.h
-@@ -28,6 +28,7 @@ typedef Elf64_Sym Sym;
- enum {
- REL_NONE = 0,
- REL_SYMBOLIC = -100,
-+ REL_USYMBOLIC,
- REL_GOT,
- REL_PLT,
- REL_RELATIVE,
---
-2.21.0
diff --git a/srcpkgs/musl/patches/ppc64-fpregset_t.patch b/srcpkgs/musl/patches/ppc64-fpregset_t.patch
new file mode 100644
index 00000000000..40c2a066aca
--- /dev/null
+++ b/srcpkgs/musl/patches/ppc64-fpregset_t.patch
@@ -0,0 +1,31 @@
+commit c9f48cde0a22641ce3daf54596a9ecebdab91435
+Author: Rich Felker <dalias@aerifal.cx>
+Date: Sat Oct 19 15:39:45 2019 -0400
+
+ fix fpregset_t type on powerpc64
+
+ the userspace ucontext API has this as an array rather than a
+ structure.
+
+ commit 3c59a868956636bc8adafb1b168d090897692532 fixed the
+ corresponding mistake for vrregset_t, namely that the original
+ powerpc64 port used a mix of types from 32-bit powerpc and powerpc64
+ rather than matching the 64-bit types.
+
+diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
+index 2cc0604c..4dec22a5 100644
+--- arch/powerpc64/bits/signal.h
++++ arch/powerpc64/bits/signal.h
+@@ -9,11 +9,7 @@
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+ typedef unsigned long greg_t, gregset_t[48];
+-
+-typedef struct {
+- double fpregs[32];
+- double fpscr;
+-} fpregset_t;
++typedef double fpregset_t[33];
+
+ typedef struct {
+ #ifdef __GNUC__
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 09655e6170f..141cc5b73d1 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,7 +1,7 @@
# Template file for 'musl'
pkgname=musl
-version=1.1.23
-revision=2
+version=1.1.24
+revision=1
archs="*-musl"
build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
conflicts="glibc>=0"
nostrip_files="libc.so"
From 684241c117ec48ce12f87ab49086e8eed15f1dee Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:00:13 +0200
Subject: [PATCH 02/14] cross-aarch64-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-aarch64-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 7fc76c3d726..b3e30d73206 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARM64 LE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From f940a527b07d5b5bef9d183024fe958b0ca7145f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:01:20 +0200
Subject: [PATCH 03/14] cross-arm-linux-musleabi: update musl to 1.1.24
---
srcpkgs/cross-arm-linux-musleabi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 985af935aac..5143c4a2cc3 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv5 TE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 984c320d488adb52bb3b8137a9c724f06fcc2ef7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:01:52 +0200
Subject: [PATCH 04/14] cross-arm-linux-musleabihf: update musl to 1.1.24
---
srcpkgs/cross-arm-linux-musleabihf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index a5b5fc028c7..7cc4caba416 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 3d76598a4a8b15d7339e2aea81d5b4ec849eac1a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:02:17 +0200
Subject: [PATCH 05/14] cross-armv7l-linux-musleabihf: update musl to 1.1.24
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 5704eb067a9..8ff41974114 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From a277924693443c574df52a903f238d7380ba9de5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:02:48 +0200
Subject: [PATCH 06/14] cross-i686-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-i686-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 25d8042180a..e91747bcb2f 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _archflags="-march=i686"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for i686 target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 65b0c9ce79f77d7ba51bea96b11463cadccc54a4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:03:18 +0200
Subject: [PATCH 07/14] cross-mips-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-mips-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 213d288cafc..72af856de03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mips-linux-musl
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 8e3bcc1fb69b507ea4d005ddbcc2f15610bc695c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:03:45 +0200
Subject: [PATCH 08/14] cross-mips-linux-muslhf: update musl to 1.1.24
---
srcpkgs/cross-mips-linux-muslhf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 84892aa48ba..6160998dcbf 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mips-linux-muslhf
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
maintainer="hipperson0 <hipperson0@gmail.com>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 377089920df0933cafadbc1f86560c7f25fa070d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:04:09 +0200
Subject: [PATCH 09/14] cross-mipsel-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-mipsel-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 20cbe0fed03..9e22097097c 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mipsel-linux-musl
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 4e497983271e98ddd306814efc949b19c198acef Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:04:32 +0200
Subject: [PATCH 10/14] cross-mipsel-linux-muslhf: update musl to 1.1.24
---
srcpkgs/cross-mipsel-linux-muslhf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index d2a692b48fe..cb2e4c9d6ba 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mipsel-linux-muslhf
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 8447d385f5f6bd305d364b5640fcc1e020d71567 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:05:09 +0200
Subject: [PATCH 11/14] cross-x86_64-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-x86_64-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 349eacf973c..0c83ff555d5 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
archs="i686* x86_64 ppc64le"
short_desc="Cross toolchain for x86_64 with musl"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 9be570d570112914f332433a6319d3b97356cd1e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:08:27 +0200
Subject: [PATCH 12/14] cross-powerpc-linux-musl: update musl to 1.1.24
---
.../cross-powerpc-linux-musl/files/powerpc-wchar-t.patch | 1 -
srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch | 1 +
srcpkgs/cross-powerpc-linux-musl/template | 8 ++++----
3 files changed, 5 insertions(+), 5 deletions(-)
delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
create mode 120000 srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch b/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
deleted file mode 120000
index db9f7d1419d..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../musl/patches/powerpc-wchar-t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9d61d406ace..a1f630f0ca5 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for PowerPC (musl)"
maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -154,7 +154,7 @@ _musl_build() {
cd ${wrksrc}/musl-${_musl_version}
- _apply_patch -p0 ${FILESDIR}/powerpc-wchar-t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
msg_normal "Building cross musl libc\n"
From af65350440c17a94e7d424d8e706afed3e693967 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:09:16 +0200
Subject: [PATCH 13/14] cross-powerpc64le-linux-musl: update musl to 1.1.24
---
.../files/ppc-pt_regs.patch | 1 +
.../files/ppc64-fpregset_t.patch | 1 +
srcpkgs/cross-powerpc64le-linux-musl/template | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
new file mode 120000
index 00000000000..0691c1fe49d
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc64-fpregset_t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 475f2f725ca..ab9d72c4174 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc64le-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for powerpc64le with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -152,6 +152,10 @@ _musl_build() {
[ -f ${wrksrc}/.musl_build_done ] && return 0
cd ${wrksrc}/musl-${_musl_version}
+
+ _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
+
msg_normal "Building cross musl libc\n"
CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \
From 019e3bcf46b654c36e2850ab665f1e1929b8d025 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:09:48 +0200
Subject: [PATCH 14/14] cross-powerpc64-linux-musl: update musl to 1.1.24
[ci skip]
---
.../cross-powerpc64-linux-musl/files/ppc-pt_regs.patch | 1 +
.../files/ppc64-fpregset_t.patch | 1 +
srcpkgs/cross-powerpc64-linux-musl/template | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
new file mode 120000
index 00000000000..0691c1fe49d
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc64-fpregset_t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index ea2800df634..7fb01606f0c 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc64-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for powerpc64 with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -152,6 +152,10 @@ _musl_build() {
[ -f ${wrksrc}/.musl_build_done ] && return 0
cd ${wrksrc}/musl-${_musl_version}
+
+ _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
+
msg_normal "Building cross musl libc\n"
CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
@ 2019-10-21 2:44 ` voidlinux-github
2019-10-21 10:38 ` voidlinux-github
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544327506
Comment:
Tested building crosstoolchains. Everything seems to be alright
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
2019-10-21 2:44 ` voidlinux-github
@ 2019-10-21 10:38 ` voidlinux-github
2019-10-21 10:47 ` voidlinux-github
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544456341
Comment:
Should musl-bootstrap be updated? It is currently orphaned.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
2019-10-21 2:44 ` voidlinux-github
2019-10-21 10:38 ` voidlinux-github
@ 2019-10-21 10:47 ` voidlinux-github
2019-10-21 10:51 ` [PR PATCH] [Updated] " voidlinux-github
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 10:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544459496
Comment:
I guess it should. It's likely been broken since the last update (patches dir symlinks to musl patches but version was already mismatched)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (3 preceding siblings ...)
2019-10-21 10:51 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-21 10:51 ` voidlinux-github
2019-10-21 10:51 ` voidlinux-github
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
There is an updated pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages musl1124
https://github.com/void-linux/void-packages/pull/15655
musl: update to 1.1.24 + matching crosstoolchain updates
Updating the crosstoolchains as there have been header changes.
This also adds two backports from current musl git master, which fix some compatibility issues with glibc headers on powerpc(64) which should allow us to greatly reduce the musl-specific patches we have in the tree.
TODO/ongoing:
- [x] test crosstoolchain builds
A patch file from https://github.com/void-linux/void-packages/pull/15655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl1124-15655.patch --]
[-- Type: text/x-diff, Size: 32943 bytes --]
From 72e9b3518e5af139ec13007cc2671fc05baf57f2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 02:42:57 +0200
Subject: [PATCH 01/15] musl: update to 1.1.24
---
srcpkgs/musl/patches/powerpc-wchar-t.patch | 19 ----
srcpkgs/musl/patches/ppc-pt_regs.patch | 38 ++++++++
.../musl/patches/ppc-unaligned-relocs.patch | 86 -------------------
srcpkgs/musl/patches/ppc64-fpregset_t.patch | 31 +++++++
srcpkgs/musl/template | 6 +-
5 files changed, 72 insertions(+), 108 deletions(-)
delete mode 100644 srcpkgs/musl/patches/powerpc-wchar-t.patch
create mode 100644 srcpkgs/musl/patches/ppc-pt_regs.patch
delete mode 100644 srcpkgs/musl/patches/ppc-unaligned-relocs.patch
create mode 100644 srcpkgs/musl/patches/ppc64-fpregset_t.patch
diff --git a/srcpkgs/musl/patches/powerpc-wchar-t.patch b/srcpkgs/musl/patches/powerpc-wchar-t.patch
deleted file mode 100644
index fb45d26f029..00000000000
--- a/srcpkgs/musl/patches/powerpc-wchar-t.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Clang defines wchar_t as int, gcc as long on the target. They have the same
-size, but are different types. i386 already has this same change, do it for
-powerpc as well.
-
---- arch/powerpc/bits/alltypes.h.in
-+++ arch/powerpc/bits/alltypes.h.in
-@@ -6,8 +6,12 @@ TYPEDEF __builtin_va_list va_list;
- TYPEDEF __builtin_va_list __isoc_va_list;
-
- #ifndef __cplusplus
-+#ifdef __WCHAR_TYPE__
-+TYPEDEF __WCHAR_TYPE__ wchar_t;
-+#else
- TYPEDEF long wchar_t;
- #endif
-+#endif
-
- TYPEDEF float float_t;
- TYPEDEF double double_t;
diff --git a/srcpkgs/musl/patches/ppc-pt_regs.patch b/srcpkgs/musl/patches/ppc-pt_regs.patch
new file mode 100644
index 00000000000..93ab51e25c0
--- /dev/null
+++ b/srcpkgs/musl/patches/ppc-pt_regs.patch
@@ -0,0 +1,38 @@
+commit c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+Author: Rich Felker <dalias@aerifal.cx>
+Date: Sat Oct 19 15:53:43 2019 -0400
+
+ use struct pt_regs * rather than void * for powerpc[64] sigcontext regs
+
+ this is to match the kernel and glibc interfaces. here, struct pt_regs
+ is an incomplete type, but that's harmless, and if it's completed by
+ inclusion of another header then members of the struct pointed to by
+ the regs member can be accessed directly without going through a cast
+ or intermediate pointer object.
+
+diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
+index 06efb11c..c1bf3caf 100644
+--- arch/powerpc/bits/signal.h
++++ arch/powerpc/bits/signal.h
+@@ -28,7 +28,7 @@ struct sigcontext {
+ int signal;
+ unsigned long handler;
+ unsigned long oldmask;
+- void *regs;
++ struct pt_regs *regs;
+ };
+
+ typedef struct {
+diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
+index 4dec22a5..d5493b18 100644
+--- arch/powerpc64/bits/signal.h
++++ arch/powerpc64/bits/signal.h
+@@ -32,7 +32,7 @@ typedef struct sigcontext {
+ int _pad0;
+ unsigned long handler;
+ unsigned long oldmask;
+- void *regs;
++ struct pt_regs *regs;
+ gregset_t gp_regs;
+ fpregset_t fp_regs;
+ vrregset_t *v_regs;
diff --git a/srcpkgs/musl/patches/ppc-unaligned-relocs.patch b/srcpkgs/musl/patches/ppc-unaligned-relocs.patch
deleted file mode 100644
index c40b0197668..00000000000
--- a/srcpkgs/musl/patches/ppc-unaligned-relocs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Date: Sun, 30 Jun 2019 07:39:20 -0500
-From: Samuel Holland <samuel@...lland.org>
-To: musl@...ts.openwall.com
-Cc: Samuel Holland <samuel@...lland.org>
-Subject: [PATCH] add support for powerpc/powerpc64 unaligned relocations
-
-R_PPC_UADDR32 (R_PPC64_UADDR64) has the same meaning as R_PPC_ADDR32
-(R_PPC64_ADDR64), except that its address need not be aligned. For
-powerpc64, BFD ld(1) will automatically convert between ADDR<->UADDR
-relocations when the address is/isn't at its native alignment. This
-will happen if, for example, there is a pointer in a packed struct.
-
-gold and lld do not currently generate R_PPC64_UADDR64, but pass
-through misaligned R_PPC64_ADDR64 relocations from object files,
-possibly relaxing them to misaligned R_PPC64_RELATIVE. In both cases
-(relaxed or not) this violates the PSABI, which defines the relevant
-field type as "a 64-bit field occupying 8 bytes, the alignment of
-which is 8 bytes unless otherwise specified."
-
-All three linkers violate the PSABI on 32-bit powerpc, where the only
-difference is that the field is 32 bits wide, aligned to 4 bytes.
-
-Currently musl fails to load executables linked by BFD ld containing
-R_PPC64_UADDR64, with the error "unsupported relocation type 43".
-This change provides compatibility with BFD ld on powerpc64, and any
-static linker on either architecture that starts following the PSABI
-more closely.
----
- arch/powerpc/reloc.h | 1 +
- arch/powerpc64/reloc.h | 1 +
- ldso/dynlink.c | 3 +++
- src/internal/dynlink.h | 1 +
- 4 files changed, 6 insertions(+)
-
-diff --git a/arch/powerpc/reloc.h b/arch/powerpc/reloc.h
-index 1b4cab36..527b6b7c 100644
---- arch/powerpc/reloc.h
-+++ arch/powerpc/reloc.h
-@@ -9,6 +9,7 @@
- #define TPOFF_K (-0x7000)
-
- #define REL_SYMBOLIC R_PPC_ADDR32
-+#define REL_USYMBOLIC R_PPC_UADDR32
- #define REL_GOT R_PPC_GLOB_DAT
- #define REL_PLT R_PPC_JMP_SLOT
- #define REL_RELATIVE R_PPC_RELATIVE
-diff --git a/arch/powerpc64/reloc.h b/arch/powerpc64/reloc.h
-index faf70acd..5bdaeede 100644
---- arch/powerpc64/reloc.h
-+++ arch/powerpc64/reloc.h
-@@ -11,6 +11,7 @@
- #define TPOFF_K (-0x7000)
-
- #define REL_SYMBOLIC R_PPC64_ADDR64
-+#define REL_USYMBOLIC R_PPC64_UADDR64
- #define REL_GOT R_PPC64_GLOB_DAT
- #define REL_PLT R_PPC64_JMP_SLOT
- #define REL_RELATIVE R_PPC64_RELATIVE
-diff --git a/ldso/dynlink.c b/ldso/dynlink.c
-index db543c19..b5ef4bfc 100644
---- ldso/dynlink.c
-+++ ldso/dynlink.c
-@@ -407,6 +407,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
- case REL_PLT:
- *reloc_addr = sym_val + addend;
- break;
-+ case REL_USYMBOLIC:
-+ memcpy(reloc_addr, &(size_t){sym_val + addend}, sizeof(size_t));
-+ break;
- case REL_RELATIVE:
- *reloc_addr = (size_t)base + addend;
- break;
-diff --git a/src/internal/dynlink.h b/src/internal/dynlink.h
-index 165bbedb..ffd06b04 100644
---- src/internal/dynlink.h
-+++ src/internal/dynlink.h
-@@ -28,6 +28,7 @@ typedef Elf64_Sym Sym;
- enum {
- REL_NONE = 0,
- REL_SYMBOLIC = -100,
-+ REL_USYMBOLIC,
- REL_GOT,
- REL_PLT,
- REL_RELATIVE,
---
-2.21.0
diff --git a/srcpkgs/musl/patches/ppc64-fpregset_t.patch b/srcpkgs/musl/patches/ppc64-fpregset_t.patch
new file mode 100644
index 00000000000..40c2a066aca
--- /dev/null
+++ b/srcpkgs/musl/patches/ppc64-fpregset_t.patch
@@ -0,0 +1,31 @@
+commit c9f48cde0a22641ce3daf54596a9ecebdab91435
+Author: Rich Felker <dalias@aerifal.cx>
+Date: Sat Oct 19 15:39:45 2019 -0400
+
+ fix fpregset_t type on powerpc64
+
+ the userspace ucontext API has this as an array rather than a
+ structure.
+
+ commit 3c59a868956636bc8adafb1b168d090897692532 fixed the
+ corresponding mistake for vrregset_t, namely that the original
+ powerpc64 port used a mix of types from 32-bit powerpc and powerpc64
+ rather than matching the 64-bit types.
+
+diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
+index 2cc0604c..4dec22a5 100644
+--- arch/powerpc64/bits/signal.h
++++ arch/powerpc64/bits/signal.h
+@@ -9,11 +9,7 @@
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+ typedef unsigned long greg_t, gregset_t[48];
+-
+-typedef struct {
+- double fpregs[32];
+- double fpscr;
+-} fpregset_t;
++typedef double fpregset_t[33];
+
+ typedef struct {
+ #ifdef __GNUC__
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 09655e6170f..141cc5b73d1 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,7 +1,7 @@
# Template file for 'musl'
pkgname=musl
-version=1.1.23
-revision=2
+version=1.1.24
+revision=1
archs="*-musl"
build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
conflicts="glibc>=0"
nostrip_files="libc.so"
From c682145af5d8c56a8bef7a5f3d38084e8a6060a4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 12:50:40 +0200
Subject: [PATCH 02/15] musl-bootstrap: update to 1.1.24
---
srcpkgs/musl-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index a583e181dd6..9e0f4054ec5 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'musl-bootstrap'.
pkgname=musl-bootstrap
-version=1.1.22
+version=1.1.24
revision=1
lib32disabled=yes
wrksrc="musl-${version}"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
+checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
post_install() {
mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/
From 8fbbb1a4d420864fa7eac42b4f6ba99814c6d5c9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:00:13 +0200
Subject: [PATCH 03/15] cross-aarch64-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-aarch64-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 7fc76c3d726..b3e30d73206 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARM64 LE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From f04acf73244d76570aefdef8d9527f5a9a43afd6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:01:20 +0200
Subject: [PATCH 04/15] cross-arm-linux-musleabi: update musl to 1.1.24
---
srcpkgs/cross-arm-linux-musleabi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 985af935aac..5143c4a2cc3 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv5 TE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 1204c27e4e3abbb0217368bf91a70642e3814fc9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:01:52 +0200
Subject: [PATCH 05/15] cross-arm-linux-musleabihf: update musl to 1.1.24
---
srcpkgs/cross-arm-linux-musleabihf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index a5b5fc028c7..7cc4caba416 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From aef96b5431e0e3c305914f73ae57e4d46f2c7b4a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:02:17 +0200
Subject: [PATCH 06/15] cross-armv7l-linux-musleabihf: update musl to 1.1.24
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 5704eb067a9..8ff41974114 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 209394f0a8c23e6c4214553eb723342850b5d1b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:02:48 +0200
Subject: [PATCH 07/15] cross-i686-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-i686-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 25d8042180a..e91747bcb2f 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _archflags="-march=i686"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for i686 target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From fe6d502450aee8b9de7aa29fac2d763b95adc5d1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:03:18 +0200
Subject: [PATCH 08/15] cross-mips-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-mips-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 213d288cafc..72af856de03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mips-linux-musl
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 6a22da0238d1cbac632f14e5f49d13d8cee87905 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:03:45 +0200
Subject: [PATCH 09/15] cross-mips-linux-muslhf: update musl to 1.1.24
---
srcpkgs/cross-mips-linux-muslhf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 84892aa48ba..6160998dcbf 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mips-linux-muslhf
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
maintainer="hipperson0 <hipperson0@gmail.com>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From fd7a60e4e737b00be6010528045ec12ea2ebd346 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:04:09 +0200
Subject: [PATCH 10/15] cross-mipsel-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-mipsel-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 20cbe0fed03..9e22097097c 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mipsel-linux-musl
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 3ebc7f3c8666a9b98a72c6c437311a0335a130b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:04:32 +0200
Subject: [PATCH 11/15] cross-mipsel-linux-muslhf: update musl to 1.1.24
---
srcpkgs/cross-mipsel-linux-muslhf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index d2a692b48fe..cb2e4c9d6ba 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mipsel-linux-muslhf
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From ac56f1910cdf550950a2e0b3144ea36f380e79c7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:05:09 +0200
Subject: [PATCH 12/15] cross-x86_64-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-x86_64-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 349eacf973c..0c83ff555d5 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
archs="i686* x86_64 ppc64le"
short_desc="Cross toolchain for x86_64 with musl"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 09e0d6a549d897b1d62b7b66ad6bf596c6099c20 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:08:27 +0200
Subject: [PATCH 13/15] cross-powerpc-linux-musl: update musl to 1.1.24
---
.../cross-powerpc-linux-musl/files/powerpc-wchar-t.patch | 1 -
srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch | 1 +
srcpkgs/cross-powerpc-linux-musl/template | 8 ++++----
3 files changed, 5 insertions(+), 5 deletions(-)
delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
create mode 120000 srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch b/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
deleted file mode 120000
index db9f7d1419d..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../musl/patches/powerpc-wchar-t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9d61d406ace..a1f630f0ca5 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for PowerPC (musl)"
maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -154,7 +154,7 @@ _musl_build() {
cd ${wrksrc}/musl-${_musl_version}
- _apply_patch -p0 ${FILESDIR}/powerpc-wchar-t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
msg_normal "Building cross musl libc\n"
From 9ad4a6bd86e29f22f9d3cdb9377e44386c6694e1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:09:16 +0200
Subject: [PATCH 14/15] cross-powerpc64le-linux-musl: update musl to 1.1.24
---
.../files/ppc-pt_regs.patch | 1 +
.../files/ppc64-fpregset_t.patch | 1 +
srcpkgs/cross-powerpc64le-linux-musl/template | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
new file mode 120000
index 00000000000..0691c1fe49d
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc64-fpregset_t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 475f2f725ca..ab9d72c4174 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc64le-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for powerpc64le with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -152,6 +152,10 @@ _musl_build() {
[ -f ${wrksrc}/.musl_build_done ] && return 0
cd ${wrksrc}/musl-${_musl_version}
+
+ _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
+
msg_normal "Building cross musl libc\n"
CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \
From 2035bca2e308e471d4fc66b7cd2ca6b0f94ecfe3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:09:48 +0200
Subject: [PATCH 15/15] cross-powerpc64-linux-musl: update musl to 1.1.24
[ci skip]
---
.../cross-powerpc64-linux-musl/files/ppc-pt_regs.patch | 1 +
.../files/ppc64-fpregset_t.patch | 1 +
srcpkgs/cross-powerpc64-linux-musl/template | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
new file mode 120000
index 00000000000..0691c1fe49d
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc64-fpregset_t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index ea2800df634..7fb01606f0c 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc64-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for powerpc64 with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -152,6 +152,10 @@ _musl_build() {
[ -f ${wrksrc}/.musl_build_done ] && return 0
cd ${wrksrc}/musl-${_musl_version}
+
+ _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
+
msg_normal "Building cross musl libc\n"
CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (2 preceding siblings ...)
2019-10-21 10:47 ` voidlinux-github
@ 2019-10-21 10:51 ` voidlinux-github
2019-10-21 10:51 ` voidlinux-github
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
There is an updated pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages musl1124
https://github.com/void-linux/void-packages/pull/15655
musl: update to 1.1.24 + matching crosstoolchain updates
Updating the crosstoolchains as there have been header changes.
This also adds two backports from current musl git master, which fix some compatibility issues with glibc headers on powerpc(64) which should allow us to greatly reduce the musl-specific patches we have in the tree.
TODO/ongoing:
- [x] test crosstoolchain builds
A patch file from https://github.com/void-linux/void-packages/pull/15655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl1124-15655.patch --]
[-- Type: text/x-diff, Size: 32943 bytes --]
From 72e9b3518e5af139ec13007cc2671fc05baf57f2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 02:42:57 +0200
Subject: [PATCH 01/15] musl: update to 1.1.24
---
srcpkgs/musl/patches/powerpc-wchar-t.patch | 19 ----
srcpkgs/musl/patches/ppc-pt_regs.patch | 38 ++++++++
.../musl/patches/ppc-unaligned-relocs.patch | 86 -------------------
srcpkgs/musl/patches/ppc64-fpregset_t.patch | 31 +++++++
srcpkgs/musl/template | 6 +-
5 files changed, 72 insertions(+), 108 deletions(-)
delete mode 100644 srcpkgs/musl/patches/powerpc-wchar-t.patch
create mode 100644 srcpkgs/musl/patches/ppc-pt_regs.patch
delete mode 100644 srcpkgs/musl/patches/ppc-unaligned-relocs.patch
create mode 100644 srcpkgs/musl/patches/ppc64-fpregset_t.patch
diff --git a/srcpkgs/musl/patches/powerpc-wchar-t.patch b/srcpkgs/musl/patches/powerpc-wchar-t.patch
deleted file mode 100644
index fb45d26f029..00000000000
--- a/srcpkgs/musl/patches/powerpc-wchar-t.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Clang defines wchar_t as int, gcc as long on the target. They have the same
-size, but are different types. i386 already has this same change, do it for
-powerpc as well.
-
---- arch/powerpc/bits/alltypes.h.in
-+++ arch/powerpc/bits/alltypes.h.in
-@@ -6,8 +6,12 @@ TYPEDEF __builtin_va_list va_list;
- TYPEDEF __builtin_va_list __isoc_va_list;
-
- #ifndef __cplusplus
-+#ifdef __WCHAR_TYPE__
-+TYPEDEF __WCHAR_TYPE__ wchar_t;
-+#else
- TYPEDEF long wchar_t;
- #endif
-+#endif
-
- TYPEDEF float float_t;
- TYPEDEF double double_t;
diff --git a/srcpkgs/musl/patches/ppc-pt_regs.patch b/srcpkgs/musl/patches/ppc-pt_regs.patch
new file mode 100644
index 00000000000..93ab51e25c0
--- /dev/null
+++ b/srcpkgs/musl/patches/ppc-pt_regs.patch
@@ -0,0 +1,38 @@
+commit c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+Author: Rich Felker <dalias@aerifal.cx>
+Date: Sat Oct 19 15:53:43 2019 -0400
+
+ use struct pt_regs * rather than void * for powerpc[64] sigcontext regs
+
+ this is to match the kernel and glibc interfaces. here, struct pt_regs
+ is an incomplete type, but that's harmless, and if it's completed by
+ inclusion of another header then members of the struct pointed to by
+ the regs member can be accessed directly without going through a cast
+ or intermediate pointer object.
+
+diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
+index 06efb11c..c1bf3caf 100644
+--- arch/powerpc/bits/signal.h
++++ arch/powerpc/bits/signal.h
+@@ -28,7 +28,7 @@ struct sigcontext {
+ int signal;
+ unsigned long handler;
+ unsigned long oldmask;
+- void *regs;
++ struct pt_regs *regs;
+ };
+
+ typedef struct {
+diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
+index 4dec22a5..d5493b18 100644
+--- arch/powerpc64/bits/signal.h
++++ arch/powerpc64/bits/signal.h
+@@ -32,7 +32,7 @@ typedef struct sigcontext {
+ int _pad0;
+ unsigned long handler;
+ unsigned long oldmask;
+- void *regs;
++ struct pt_regs *regs;
+ gregset_t gp_regs;
+ fpregset_t fp_regs;
+ vrregset_t *v_regs;
diff --git a/srcpkgs/musl/patches/ppc-unaligned-relocs.patch b/srcpkgs/musl/patches/ppc-unaligned-relocs.patch
deleted file mode 100644
index c40b0197668..00000000000
--- a/srcpkgs/musl/patches/ppc-unaligned-relocs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Date: Sun, 30 Jun 2019 07:39:20 -0500
-From: Samuel Holland <samuel@...lland.org>
-To: musl@...ts.openwall.com
-Cc: Samuel Holland <samuel@...lland.org>
-Subject: [PATCH] add support for powerpc/powerpc64 unaligned relocations
-
-R_PPC_UADDR32 (R_PPC64_UADDR64) has the same meaning as R_PPC_ADDR32
-(R_PPC64_ADDR64), except that its address need not be aligned. For
-powerpc64, BFD ld(1) will automatically convert between ADDR<->UADDR
-relocations when the address is/isn't at its native alignment. This
-will happen if, for example, there is a pointer in a packed struct.
-
-gold and lld do not currently generate R_PPC64_UADDR64, but pass
-through misaligned R_PPC64_ADDR64 relocations from object files,
-possibly relaxing them to misaligned R_PPC64_RELATIVE. In both cases
-(relaxed or not) this violates the PSABI, which defines the relevant
-field type as "a 64-bit field occupying 8 bytes, the alignment of
-which is 8 bytes unless otherwise specified."
-
-All three linkers violate the PSABI on 32-bit powerpc, where the only
-difference is that the field is 32 bits wide, aligned to 4 bytes.
-
-Currently musl fails to load executables linked by BFD ld containing
-R_PPC64_UADDR64, with the error "unsupported relocation type 43".
-This change provides compatibility with BFD ld on powerpc64, and any
-static linker on either architecture that starts following the PSABI
-more closely.
----
- arch/powerpc/reloc.h | 1 +
- arch/powerpc64/reloc.h | 1 +
- ldso/dynlink.c | 3 +++
- src/internal/dynlink.h | 1 +
- 4 files changed, 6 insertions(+)
-
-diff --git a/arch/powerpc/reloc.h b/arch/powerpc/reloc.h
-index 1b4cab36..527b6b7c 100644
---- arch/powerpc/reloc.h
-+++ arch/powerpc/reloc.h
-@@ -9,6 +9,7 @@
- #define TPOFF_K (-0x7000)
-
- #define REL_SYMBOLIC R_PPC_ADDR32
-+#define REL_USYMBOLIC R_PPC_UADDR32
- #define REL_GOT R_PPC_GLOB_DAT
- #define REL_PLT R_PPC_JMP_SLOT
- #define REL_RELATIVE R_PPC_RELATIVE
-diff --git a/arch/powerpc64/reloc.h b/arch/powerpc64/reloc.h
-index faf70acd..5bdaeede 100644
---- arch/powerpc64/reloc.h
-+++ arch/powerpc64/reloc.h
-@@ -11,6 +11,7 @@
- #define TPOFF_K (-0x7000)
-
- #define REL_SYMBOLIC R_PPC64_ADDR64
-+#define REL_USYMBOLIC R_PPC64_UADDR64
- #define REL_GOT R_PPC64_GLOB_DAT
- #define REL_PLT R_PPC64_JMP_SLOT
- #define REL_RELATIVE R_PPC64_RELATIVE
-diff --git a/ldso/dynlink.c b/ldso/dynlink.c
-index db543c19..b5ef4bfc 100644
---- ldso/dynlink.c
-+++ ldso/dynlink.c
-@@ -407,6 +407,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
- case REL_PLT:
- *reloc_addr = sym_val + addend;
- break;
-+ case REL_USYMBOLIC:
-+ memcpy(reloc_addr, &(size_t){sym_val + addend}, sizeof(size_t));
-+ break;
- case REL_RELATIVE:
- *reloc_addr = (size_t)base + addend;
- break;
-diff --git a/src/internal/dynlink.h b/src/internal/dynlink.h
-index 165bbedb..ffd06b04 100644
---- src/internal/dynlink.h
-+++ src/internal/dynlink.h
-@@ -28,6 +28,7 @@ typedef Elf64_Sym Sym;
- enum {
- REL_NONE = 0,
- REL_SYMBOLIC = -100,
-+ REL_USYMBOLIC,
- REL_GOT,
- REL_PLT,
- REL_RELATIVE,
---
-2.21.0
diff --git a/srcpkgs/musl/patches/ppc64-fpregset_t.patch b/srcpkgs/musl/patches/ppc64-fpregset_t.patch
new file mode 100644
index 00000000000..40c2a066aca
--- /dev/null
+++ b/srcpkgs/musl/patches/ppc64-fpregset_t.patch
@@ -0,0 +1,31 @@
+commit c9f48cde0a22641ce3daf54596a9ecebdab91435
+Author: Rich Felker <dalias@aerifal.cx>
+Date: Sat Oct 19 15:39:45 2019 -0400
+
+ fix fpregset_t type on powerpc64
+
+ the userspace ucontext API has this as an array rather than a
+ structure.
+
+ commit 3c59a868956636bc8adafb1b168d090897692532 fixed the
+ corresponding mistake for vrregset_t, namely that the original
+ powerpc64 port used a mix of types from 32-bit powerpc and powerpc64
+ rather than matching the 64-bit types.
+
+diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
+index 2cc0604c..4dec22a5 100644
+--- arch/powerpc64/bits/signal.h
++++ arch/powerpc64/bits/signal.h
+@@ -9,11 +9,7 @@
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+ typedef unsigned long greg_t, gregset_t[48];
+-
+-typedef struct {
+- double fpregs[32];
+- double fpscr;
+-} fpregset_t;
++typedef double fpregset_t[33];
+
+ typedef struct {
+ #ifdef __GNUC__
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 09655e6170f..141cc5b73d1 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,7 +1,7 @@
# Template file for 'musl'
pkgname=musl
-version=1.1.23
-revision=2
+version=1.1.24
+revision=1
archs="*-musl"
build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
conflicts="glibc>=0"
nostrip_files="libc.so"
From c682145af5d8c56a8bef7a5f3d38084e8a6060a4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 12:50:40 +0200
Subject: [PATCH 02/15] musl-bootstrap: update to 1.1.24
---
srcpkgs/musl-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index a583e181dd6..9e0f4054ec5 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'musl-bootstrap'.
pkgname=musl-bootstrap
-version=1.1.22
+version=1.1.24
revision=1
lib32disabled=yes
wrksrc="musl-${version}"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
+checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
post_install() {
mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/
From 8fbbb1a4d420864fa7eac42b4f6ba99814c6d5c9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:00:13 +0200
Subject: [PATCH 03/15] cross-aarch64-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-aarch64-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 7fc76c3d726..b3e30d73206 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARM64 LE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From f04acf73244d76570aefdef8d9527f5a9a43afd6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:01:20 +0200
Subject: [PATCH 04/15] cross-arm-linux-musleabi: update musl to 1.1.24
---
srcpkgs/cross-arm-linux-musleabi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 985af935aac..5143c4a2cc3 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv5 TE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 1204c27e4e3abbb0217368bf91a70642e3814fc9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:01:52 +0200
Subject: [PATCH 05/15] cross-arm-linux-musleabihf: update musl to 1.1.24
---
srcpkgs/cross-arm-linux-musleabihf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index a5b5fc028c7..7cc4caba416 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From aef96b5431e0e3c305914f73ae57e4d46f2c7b4a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:02:17 +0200
Subject: [PATCH 06/15] cross-armv7l-linux-musleabihf: update musl to 1.1.24
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 5704eb067a9..8ff41974114 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 209394f0a8c23e6c4214553eb723342850b5d1b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:02:48 +0200
Subject: [PATCH 07/15] cross-i686-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-i686-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 25d8042180a..e91747bcb2f 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _archflags="-march=i686"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for i686 target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From fe6d502450aee8b9de7aa29fac2d763b95adc5d1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:03:18 +0200
Subject: [PATCH 08/15] cross-mips-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-mips-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 213d288cafc..72af856de03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mips-linux-musl
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 6a22da0238d1cbac632f14e5f49d13d8cee87905 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:03:45 +0200
Subject: [PATCH 09/15] cross-mips-linux-muslhf: update musl to 1.1.24
---
srcpkgs/cross-mips-linux-muslhf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 84892aa48ba..6160998dcbf 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mips-linux-muslhf
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
maintainer="hipperson0 <hipperson0@gmail.com>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From fd7a60e4e737b00be6010528045ec12ea2ebd346 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:04:09 +0200
Subject: [PATCH 10/15] cross-mipsel-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-mipsel-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 20cbe0fed03..9e22097097c 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mipsel-linux-musl
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From 3ebc7f3c8666a9b98a72c6c437311a0335a130b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:04:32 +0200
Subject: [PATCH 11/15] cross-mipsel-linux-muslhf: update musl to 1.1.24
---
srcpkgs/cross-mipsel-linux-muslhf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index d2a692b48fe..cb2e4c9d6ba 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_triplet=mipsel-linux-muslhf
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
@@ -24,7 +24,7 @@ distfiles="
${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
lib32disabled=yes
From ac56f1910cdf550950a2e0b3144ea36f380e79c7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:05:09 +0200
Subject: [PATCH 12/15] cross-x86_64-linux-musl: update musl to 1.1.24
---
srcpkgs/cross-x86_64-linux-musl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 349eacf973c..0c83ff555d5 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -2,7 +2,7 @@
#
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
archs="i686* x86_64 ppc64le"
short_desc="Cross toolchain for x86_64 with musl"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -25,7 +25,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
From 09e0d6a549d897b1d62b7b66ad6bf596c6099c20 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:08:27 +0200
Subject: [PATCH 13/15] cross-powerpc-linux-musl: update musl to 1.1.24
---
.../cross-powerpc-linux-musl/files/powerpc-wchar-t.patch | 1 -
srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch | 1 +
srcpkgs/cross-powerpc-linux-musl/template | 8 ++++----
3 files changed, 5 insertions(+), 5 deletions(-)
delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
create mode 120000 srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch b/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
deleted file mode 120000
index db9f7d1419d..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/powerpc-wchar-t.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../musl/patches/powerpc-wchar-t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9d61d406ace..a1f630f0ca5 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for PowerPC (musl)"
maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -26,7 +26,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -154,7 +154,7 @@ _musl_build() {
cd ${wrksrc}/musl-${_musl_version}
- _apply_patch -p0 ${FILESDIR}/powerpc-wchar-t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
msg_normal "Building cross musl libc\n"
From 9ad4a6bd86e29f22f9d3cdb9377e44386c6694e1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:09:16 +0200
Subject: [PATCH 14/15] cross-powerpc64le-linux-musl: update musl to 1.1.24
---
.../files/ppc-pt_regs.patch | 1 +
.../files/ppc64-fpregset_t.patch | 1 +
srcpkgs/cross-powerpc64le-linux-musl/template | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
new file mode 120000
index 00000000000..0691c1fe49d
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc64-fpregset_t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 475f2f725ca..ab9d72c4174 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc64le-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for powerpc64le with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -152,6 +152,10 @@ _musl_build() {
[ -f ${wrksrc}/.musl_build_done ] && return 0
cd ${wrksrc}/musl-${_musl_version}
+
+ _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
+
msg_normal "Building cross musl libc\n"
CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \
From 2035bca2e308e471d4fc66b7cd2ca6b0f94ecfe3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 03:09:48 +0200
Subject: [PATCH 15/15] cross-powerpc64-linux-musl: update musl to 1.1.24
[ci skip]
---
.../cross-powerpc64-linux-musl/files/ppc-pt_regs.patch | 1 +
.../files/ppc64-fpregset_t.patch | 1 +
srcpkgs/cross-powerpc64-linux-musl/template | 10 +++++++---
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
new file mode 120000
index 00000000000..983d54dc1d9
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc-pt_regs.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc-pt_regs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
new file mode 120000
index 00000000000..0691c1fe49d
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-fpregset_t.patch
@@ -0,0 +1 @@
+../../musl/patches/ppc64-fpregset_t.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index ea2800df634..7fb01606f0c 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,7 +1,7 @@
# Template file for 'cross-powerpc64-linux-musl'
_binutils_version=2.32
_gcc_version=9.2.0
-_musl_version=1.1.23
+_musl_version=1.1.24
_linux_version=4.19
_libucontext_version=0.9.0
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.32
-revision=1
+revision=2
short_desc="Cross toolchain for powerpc64 with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
+ 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
@@ -152,6 +152,10 @@ _musl_build() {
[ -f ${wrksrc}/.musl_build_done ] && return 0
cd ${wrksrc}/musl-${_musl_version}
+
+ _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch
+ _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch
+
msg_normal "Building cross musl libc\n"
CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (4 preceding siblings ...)
2019-10-21 10:51 ` voidlinux-github
@ 2019-10-21 10:51 ` voidlinux-github
2019-10-21 15:44 ` voidlinux-github
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 142 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544460673
Comment:
Done.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (5 preceding siblings ...)
2019-10-21 10:51 ` voidlinux-github
@ 2019-10-21 15:44 ` voidlinux-github
2019-10-21 15:45 ` voidlinux-github
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544576156
Comment:
Is this ready?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (6 preceding siblings ...)
2019-10-21 15:44 ` voidlinux-github
@ 2019-10-21 15:45 ` voidlinux-github
2019-10-21 15:46 ` [PR PATCH] [Merged]: " voidlinux-github
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 15:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 141 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544576566
Comment:
yeah
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (7 preceding siblings ...)
2019-10-21 15:45 ` voidlinux-github
@ 2019-10-21 15:46 ` voidlinux-github
2019-10-21 15:46 ` voidlinux-github
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
There's a merged pull request on the void-packages repository
musl: update to 1.1.24 + matching crosstoolchain updates
https://github.com/void-linux/void-packages/pull/15655
Description:
Updating the crosstoolchains as there have been header changes.
This also adds two backports from current musl git master, which fix some compatibility issues with glibc headers on powerpc(64) which should allow us to greatly reduce the musl-specific patches we have in the tree.
TODO/ongoing:
- [x] test crosstoolchain builds
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (8 preceding siblings ...)
2019-10-21 15:46 ` [PR PATCH] [Merged]: " voidlinux-github
@ 2019-10-21 15:46 ` voidlinux-github
2019-10-21 15:48 ` voidlinux-github
2019-10-21 15:48 ` voidlinux-github
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544576566
Comment:
yeah (well, as long as it works on x86_64, haven't tested on that)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (9 preceding siblings ...)
2019-10-21 15:46 ` voidlinux-github
@ 2019-10-21 15:48 ` voidlinux-github
2019-10-21 15:48 ` voidlinux-github
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544577712
Comment:
> yeah (well, as long as it works on x86_64, haven't tested on that)
At least I didn't run into anything so far.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: musl: update to 1.1.24 + matching crosstoolchain updates
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
` (10 preceding siblings ...)
2019-10-21 15:48 ` voidlinux-github
@ 2019-10-21 15:48 ` voidlinux-github
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-10-21 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/15655#issuecomment-544577965
Comment:
Yeah, wouldn't expect to. It's a fairly incremental release, and plenty of people are running it on x86_64 systems elsewhere.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-10-21 15:48 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-21 1:32 [PR PATCH] musl: update to 1.1.24 + matching crosstoolchain updates voidlinux-github
2019-10-21 2:44 ` voidlinux-github
2019-10-21 10:38 ` voidlinux-github
2019-10-21 10:47 ` voidlinux-github
2019-10-21 10:51 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-21 10:51 ` voidlinux-github
2019-10-21 10:51 ` voidlinux-github
2019-10-21 15:44 ` voidlinux-github
2019-10-21 15:45 ` voidlinux-github
2019-10-21 15:46 ` [PR PATCH] [Merged]: " voidlinux-github
2019-10-21 15:46 ` voidlinux-github
2019-10-21 15:48 ` voidlinux-github
2019-10-21 15:48 ` voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).