klibc: Upgrade to 2.0.13 release

Drop backported patch and refresh others as needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-10-07 17:38:00 -07:00
parent 350fd96f1e
commit 04ed4f1383
8 changed files with 6 additions and 41 deletions

View File

@ -1,34 +0,0 @@
From a33c262f828f803fffdad8e1f44d524dc9c75856 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 3 Aug 2022 01:10:01 +0200
Subject: [PATCH] fcntl: Fix build failure for some architectures with Linux
5.19
Starting from Linux 5.19, the kernel UAPI headers now only define
__ARCH_FLOCK64_PAD if the architecture actually needs padding in
struct flock64. Wrap its use with #ifdef,
Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=bb2fde5ddbc18a2e7795ca4d24759230c2aae9d0]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
usr/include/fcntl.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/usr/include/fcntl.h b/usr/include/fcntl.h
index ed703a6..cb2e4e5 100644
--- a/usr/include/fcntl.h
+++ b/usr/include/fcntl.h
@@ -33,7 +33,9 @@ struct flock {
__kernel_loff_t l_start;
__kernel_loff_t l_len;
__kernel_pid_t l_pid;
+#ifdef __ARCH_FLOCK64_PAD
__ARCH_FLOCK64_PAD
+#endif
};
#ifdef F_GETLK64
--
2.37.2

View File

@ -14,8 +14,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/usr/klibc/Kbuild
+++ b/usr/klibc/Kbuild
@@ -183,7 +183,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash
targets += interp.o
@@ -190,7 +190,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash
targets += shared-stub.o
quiet_cmd_interp = BUILD $@
- cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \
@ -23,4 +23,4 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
+ -D__ASSEMBLY__ \
-DLIBDIR=\"$(SHLIBDIR)\" \
-DSOHASH=\"$(SOLIBHASH)\" \
$(KLIBCSTACKFLAGS) \
-c -o $@ $<

View File

@ -16,8 +16,8 @@ Upstream-Status: Pending
--- a/usr/klibc/arch/arm/MCONFIG
+++ b/usr/klibc/arch/arm/MCONFIG
@@ -27,6 +27,7 @@ else
KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x01800000
@@ -23,6 +23,7 @@ else
# Extra linkflags when building the shared version of the library
ifeq ($(CONFIG_AEABI),y)
KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork
+KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX)

View File

@ -20,7 +20,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \
file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \
file://cross-clang.patch \
file://0001-workaround-for-overlapping-sections-in-binary.patch \
file://0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch \
"
ARMPATCHES ?= ""
@ -28,7 +27,7 @@ ARMPATCHES ?= ""
ARMPATCHES:arm = " \
file://armv4-fix-v4bx.patch \
"
SRC_URI[sha256sum] = "662753da8889e744dfc0db6eb4021c3377ee7ef8ed66d7d57765f8c9e25939cd"
SRC_URI[sha256sum] = "d673a294f742d59368222ff5c38462d81098c55063799de6fb8a7ba3d4af0436"
S = "${WORKDIR}/klibc-${PV}"