summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/musl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/musl')
-rw-r--r--meta/recipes-core/musl/bsd-headers.bb2
-rw-r--r--meta/recipes-core/musl/gcompat_git.bb2
-rw-r--r--meta/recipes-core/musl/libc-test_git.bb4
-rw-r--r--meta/recipes-core/musl/libssp-nonshared.bb6
-rw-r--r--meta/recipes-core/musl/libucontext_1.3.2.bb (renamed from meta/recipes-core/musl/libucontext_1.2.bb)10
-rw-r--r--meta/recipes-core/musl/musl-legacy-error.bb2
-rw-r--r--meta/recipes-core/musl/musl-locales_git.bb19
-rw-r--r--meta/recipes-core/musl/musl-obstack.bb2
-rw-r--r--meta/recipes-core/musl/musl-utils.bb2
-rw-r--r--meta/recipes-core/musl/musl.inc11
-rw-r--r--meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch12
-rw-r--r--meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch70
-rw-r--r--meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch10
-rw-r--r--meta/recipes-core/musl/musl/0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch37
-rw-r--r--meta/recipes-core/musl/musl_git.bb16
15 files changed, 125 insertions, 80 deletions
diff --git a/meta/recipes-core/musl/bsd-headers.bb b/meta/recipes-core/musl/bsd-headers.bb
index 887a816031..ad9ba81e4f 100644
--- a/meta/recipes-core/musl/bsd-headers.bb
+++ b/meta/recipes-core/musl/bsd-headers.bb
@@ -15,7 +15,7 @@ do_compile[noexec] = "1"
15 15
16INHIBIT_DEFAULT_DEPS = "1" 16INHIBIT_DEFAULT_DEPS = "1"
17 17
18S = "${WORKDIR}" 18S = "${UNPACKDIR}"
19 19
20do_install() { 20do_install() {
21 install -Dm 0644 ${S}/sys-queue.h ${D}${includedir}/sys/queue.h 21 install -Dm 0644 ${S}/sys-queue.h ${D}${includedir}/sys/queue.h
diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index 40fe8c6a5f..6f9710e71a 100644
--- a/meta/recipes-core/musl/gcompat_git.bb
+++ b/meta/recipes-core/musl/gcompat_git.bb
@@ -16,8 +16,6 @@ SRC_URI:append:powerpc = "\
16PV = "1.1.0" 16PV = "1.1.0"
17SRCREV = "b7bfe0b08c52fdc72e0c1d9d4dcb2129f1642bd6" 17SRCREV = "b7bfe0b08c52fdc72e0c1d9d4dcb2129f1642bd6"
18 18
19S = "${WORKDIR}/git"
20
21inherit pkgconfig linuxloader siteinfo 19inherit pkgconfig linuxloader siteinfo
22 20
23DEPENDS += "musl-obstack" 21DEPENDS += "musl-obstack"
diff --git a/meta/recipes-core/musl/libc-test_git.bb b/meta/recipes-core/musl/libc-test_git.bb
index 619a959fd2..71a111cfa4 100644
--- a/meta/recipes-core/musl/libc-test_git.bb
+++ b/meta/recipes-core/musl/libc-test_git.bb
@@ -18,8 +18,6 @@ SRC_URI = " \
18 18
19PV = "0+git" 19PV = "0+git"
20 20
21S = "${WORKDIR}/git"
22
23# libc-test 'make' or 'make run' command is designed to build and run tests. It 21# libc-test 'make' or 'make run' command is designed to build and run tests. It
24# reports both build and test failures. The commands should be run on target. 22# reports both build and test failures. The commands should be run on target.
25do_compile() { 23do_compile() {
@@ -50,7 +48,7 @@ do_install () {
50} 48}
51 49
52do_install_ptest_base:append() { 50do_install_ptest_base:append() {
53 install -Dm 0755 ${WORKDIR}/run-libc-ptests ${D}${PTEST_PATH}/run-libc-ptests 51 install -Dm 0755 ${UNPACKDIR}/run-libc-ptests ${D}${PTEST_PATH}/run-libc-ptests
54} 52}
55 53
56COMPATIBLE_HOST = "null" 54COMPATIBLE_HOST = "null"
diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb
index 3faf8f00c3..4bcbaef7ea 100644
--- a/meta/recipes-core/musl/libssp-nonshared.bb
+++ b/meta/recipes-core/musl/libssp-nonshared.bb
@@ -11,13 +11,13 @@ SRC_URI = "file://stack_chk.c"
11 11
12INHIBIT_DEFAULT_DEPS = "1" 12INHIBIT_DEFAULT_DEPS = "1"
13 13
14DEPENDS = "virtual/${TARGET_PREFIX}binutils \ 14DEPENDS = "virtual/cross-binutils \
15 virtual/${TARGET_PREFIX}gcc \ 15 virtual/cross-cc \
16" 16"
17 17
18do_configure[noexec] = "1" 18do_configure[noexec] = "1"
19 19
20S = "${WORKDIR}" 20S = "${UNPACKDIR}"
21 21
22do_compile() { 22do_compile() {
23 ${CC} ${CPPFLAGS} ${CFLAGS} -fPIE -c stack_chk.c -o stack_chk.o 23 ${CC} ${CPPFLAGS} ${CFLAGS} -fPIE -c stack_chk.c -o stack_chk.o
diff --git a/meta/recipes-core/musl/libucontext_1.2.bb b/meta/recipes-core/musl/libucontext_1.3.2.bb
index 4e34df1439..c5b802207b 100644
--- a/meta/recipes-core/musl/libucontext_1.2.bb
+++ b/meta/recipes-core/musl/libucontext_1.3.2.bb
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ebea527af0602d509b7f4c49533fb1bd"
8SECTION = "libs" 8SECTION = "libs"
9DEPENDS = "" 9DEPENDS = ""
10 10
11SRCREV = "4dde3417b4bb4b1b1545bd913be337680b5e28c3" 11SRCREV = "a0323579ac50b9a9d4033754d089f1fed0f59a00"
12SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \ 12SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \
13 " 13 "
14 14
15S = "${WORKDIR}/git"
16
17COMPATIBLE_HOST = ".*-musl.*" 15COMPATIBLE_HOST = ".*-musl.*"
18 16
19valid_archs = " \ 17valid_archs = " \
@@ -50,3 +48,9 @@ def map_kernel_arch(a, d):
50 48
51EXTRA_OEMESON = "-Dcpu=${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}" 49EXTRA_OEMESON = "-Dcpu=${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}"
52inherit meson 50inherit meson
51
52ARM_TARGET_CPPFLAGS = ""
53ARM_TARGET_CPPFLAGS:append:arm = "${@bb.utils.contains('TARGET_FPU', 'hard', ' -DFORCE_HARD_FLOAT', '', d)}"
54ARM_TARGET_CPPFLAGS:append:arm = "${@bb.utils.contains('TARGET_FPU', 'soft', ' -DFORCE_SOFT_FLOAT', '', d)}"
55
56TARGET_CPPFLAGS .= "${ARM_TARGET_CPPFLAGS}"
diff --git a/meta/recipes-core/musl/musl-legacy-error.bb b/meta/recipes-core/musl/musl-legacy-error.bb
index 5ce5a233ab..b40075c0b6 100644
--- a/meta/recipes-core/musl/musl-legacy-error.bb
+++ b/meta/recipes-core/musl/musl-legacy-error.bb
@@ -13,7 +13,7 @@ do_compile[noexec] = "1"
13 13
14INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"
15 15
16S = "${WORKDIR}" 16S = "${UNPACKDIR}"
17 17
18do_install() { 18do_install() {
19 install -Dm 0644 ${S}/error.h -t ${D}${includedir} 19 install -Dm 0644 ${S}/error.h -t ${D}${includedir}
diff --git a/meta/recipes-core/musl/musl-locales_git.bb b/meta/recipes-core/musl/musl-locales_git.bb
index 1373c60daf..c8510596cf 100644
--- a/meta/recipes-core/musl/musl-locales_git.bb
+++ b/meta/recipes-core/musl/musl-locales_git.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://git.adelielinux.org/adelie/musl-locales;protocol=https;branch=m
12PV = "1.0+git" 12PV = "1.0+git"
13SRCREV = "5663f5bfd30bf9e1e0ba3fc5fe2da6725969f30e" 13SRCREV = "5663f5bfd30bf9e1e0ba3fc5fe2da6725969f30e"
14 14
15S = "${WORKDIR}/git"
16
17DEPENDS = "virtual/libintl gettext-native" 15DEPENDS = "virtual/libintl gettext-native"
18 16
19PROVIDES = "virtual/libc-locale" 17PROVIDES = "virtual/libc-locale"
@@ -82,4 +80,21 @@ FILES:locale-base-ru-ru += "${datadir}/i18n/locales/musl/ru_RU.UTF-8"
82FILES:locale-base-sr-rs += "${datadir}/i18n/locales/musl/sr_RS.UTF-8" 80FILES:locale-base-sr-rs += "${datadir}/i18n/locales/musl/sr_RS.UTF-8"
83FILES:locale-base-sv-se += "${datadir}/i18n/locales/musl/sv_SE.UTF-8" 81FILES:locale-base-sv-se += "${datadir}/i18n/locales/musl/sv_SE.UTF-8"
84 82
83RRECOMMENDS:locale-base-cs-cz += "${PN}"
84RRECOMMENDS:locale-base-de-ch += "${PN}"
85RRECOMMENDS:locale-base-de-de += "${PN}"
86RRECOMMENDS:locale-base-en-gb += "${PN}"
87RRECOMMENDS:locale-base-en-us += "${PN}"
88RRECOMMENDS:locale-base-es-es += "${PN}"
89RRECOMMENDS:locale-base-fi-fi += "${PN}"
90RRECOMMENDS:locale-base-fr-ca += "${PN}"
91RRECOMMENDS:locale-base-fr-fr += "${PN}"
92RRECOMMENDS:locale-base-it-it += "${PN}"
93RRECOMMENDS:locale-base-nb-no += "${PN}"
94RRECOMMENDS:locale-base-nl-nl += "${PN}"
95RRECOMMENDS:locale-base-pt-br += "${PN}"
96RRECOMMENDS:locale-base-ru-ru += "${PN}"
97RRECOMMENDS:locale-base-sr-sr += "${PN}"
98RRECOMMENDS:locale-base-sv-se += "${PN}"
99
85UPSTREAM_CHECK_COMMITS = "1" 100UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta/recipes-core/musl/musl-obstack.bb b/meta/recipes-core/musl/musl-obstack.bb
index 4c71a141b2..d8a5ae8d82 100644
--- a/meta/recipes-core/musl/musl-obstack.bb
+++ b/meta/recipes-core/musl/musl-obstack.bb
@@ -16,7 +16,5 @@ UPSTREAM_CHECK_COMMITS = "1"
16 16
17inherit autotools pkgconfig 17inherit autotools pkgconfig
18 18
19S = "${WORKDIR}/git"
20
21COMPATIBLE_HOST = ".*-musl.*" 19COMPATIBLE_HOST = ".*-musl.*"
22 20
diff --git a/meta/recipes-core/musl/musl-utils.bb b/meta/recipes-core/musl/musl-utils.bb
index 8280333daf..4b685640c8 100644
--- a/meta/recipes-core/musl/musl-utils.bb
+++ b/meta/recipes-core/musl/musl-utils.bb
@@ -17,8 +17,6 @@ UPSTREAM_CHECK_COMMITS = "1"
17 17
18inherit autotools 18inherit autotools
19 19
20S = "${WORKDIR}/git"
21
22PACKAGES =+ "${PN}-iconv" 20PACKAGES =+ "${PN}-iconv"
23 21
24FILES:${PN}-iconv = "${bindir}/iconv" 22FILES:${PN}-iconv = "${bindir}/iconv"
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index 6ca52b186a..ce45de2d23 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -9,7 +9,7 @@ standards-conformance and safety."
9HOMEPAGE = "http://www.musl-libc.org/" 9HOMEPAGE = "http://www.musl-libc.org/"
10LICENSE = "MIT" 10LICENSE = "MIT"
11SECTION = "libs" 11SECTION = "libs"
12LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" 12LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0c2904cdc34777fb4067732bae145506"
13 13
14INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"
15 15
@@ -25,10 +25,13 @@ MIPS_INSTRUCTION_SET = "mips"
25ARM_INSTRUCTION_SET:armv5 = "arm" 25ARM_INSTRUCTION_SET:armv5 = "arm"
26ARM_INSTRUCTION_SET:armv4 = "arm" 26ARM_INSTRUCTION_SET:armv4 = "arm"
27 27
28# 1.2.4 doesn't support riscv32
29COMPATIBLE_HOST:riscv32 = "null"
30
31# Enable out of tree build 28# Enable out of tree build
32B = "${WORKDIR}/build" 29B = "${WORKDIR}/build"
33 30
34do_configure[cleandirs] = "${B}" 31do_configure[cleandirs] = "${B}"
32
33python () {
34 multilibs = d.getVar("MULTILIBS")
35 if multilibs:
36 raise bb.parse.SkipRecipe("musl is not compatible with multilibs")
37}
diff --git a/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch b/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
index 8b097f3276..06ab27f0eb 100644
--- a/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
+++ b/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
@@ -1,4 +1,4 @@
1From f95b6fd0475a95c00e886219271cb5c93838e3c3 Mon Sep 17 00:00:00 2001 1From 665ecc610c261d5e98710aa0c6ccf6e4991eaf58 Mon Sep 17 00:00:00 2001
2From: Amarnath Valluri <amarnath.valluri@intel.com> 2From: Amarnath Valluri <amarnath.valluri@intel.com>
3Date: Wed, 18 Jan 2017 16:14:37 +0200 3Date: Wed, 18 Jan 2017 16:14:37 +0200
4Subject: [PATCH 1/2] Make dynamic linker a relative symlink to libc 4Subject: [PATCH 1/2] Make dynamic linker a relative symlink to libc
@@ -35,7 +35,7 @@ index e8cc4436..466d9afd 100644
35 install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) 35 install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
36 36
37diff --git a/tools/install.sh b/tools/install.sh 37diff --git a/tools/install.sh b/tools/install.sh
38index d913b60b..b6a7f797 100755 38index 855a8ca2..a2e6a5eb 100755
39--- a/tools/install.sh 39--- a/tools/install.sh
40+++ b/tools/install.sh 40+++ b/tools/install.sh
41@@ -6,18 +6,20 @@ 41@@ -6,18 +6,20 @@
@@ -61,15 +61,15 @@ index d913b60b..b6a7f797 100755
61 m) mode=$OPTARG ;; 61 m) mode=$OPTARG ;;
62 ?) usage ;; 62 ?) usage ;;
63 esac 63 esac
64@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP 64@@ -49,7 +51,7 @@ umask 077
65 umask 077
66 65
67 if test "$symlink" ; then 66 if test "$symlink" ; then
67 umask 000
68-ln -s "$1" "$tmp" 68-ln -s "$1" "$tmp"
69+ln $symlinkflags "$1" "$tmp" 69+ln $symlinkflags "$1" "$tmp"
70 umask 077
70 else 71 else
71 cat < "$1" > "$tmp" 72 cat < "$1" > "$tmp"
72 chmod "$mode" "$tmp"
73-- 73--
742.37.2 742.43.0
75 75
diff --git a/meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch b/meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch
new file mode 100644
index 0000000000..78ba903ca6
--- /dev/null
+++ b/meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch
@@ -0,0 +1,70 @@
1From 31dce8e958f5185e7fda653214da12bbc75f244e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Dec 2024 11:16:43 -0800
4Subject: [PATCH] Update syscalls for r32/rv64 from kernel 6.4 through 6.10
5
6Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2024/12/04/3]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 arch/riscv32/bits/syscall.h.in | 11 +++++++++++
10 arch/riscv64/bits/syscall.h.in | 11 +++++++++++
11 2 files changed, 22 insertions(+)
12
13diff --git a/arch/riscv32/bits/syscall.h.in b/arch/riscv32/bits/syscall.h.in
14index 9228d840..a54d9ffc 100644
15--- a/arch/riscv32/bits/syscall.h.in
16+++ b/arch/riscv32/bits/syscall.h.in
17@@ -216,6 +216,7 @@
18 #define __NR_perf_event_open 241
19 #define __NR_accept4 242
20 #define __NR_arch_specific_syscall 244
21+#define __NR_riscv_hwprobe 258
22 #define __NR_prlimit64 261
23 #define __NR_fanotify_init 262
24 #define __NR_fanotify_mark 263
25@@ -295,6 +296,16 @@
26 #define __NR_cachestat 451
27 #define __NR_fchmodat2 452
28 #define __NR_futex __NR_futex_time64
29+#define __NR_map_shadow_stack 453
30+#define __NR_futex_wake 454
31+#define __NR_futex_wait 455
32+#define __NR_futex_requeue 456
33+#define __NR_statmount 457
34+#define __NR_listmount 458
35+#define __NR_lsm_get_self_attr 459
36+#define __NR_lsm_list_modules 461
37+#define __NR_lsm_set_self_attr 460
38+#define __NR_mseal 462
39
40 #define __NR_sysriscv __NR_arch_specific_syscall
41 #define __NR_riscv_flush_icache (__NR_sysriscv + 15)
42diff --git a/arch/riscv64/bits/syscall.h.in b/arch/riscv64/bits/syscall.h.in
43index e362bd0e..6991a89c 100644
44--- a/arch/riscv64/bits/syscall.h.in
45+++ b/arch/riscv64/bits/syscall.h.in
46@@ -242,6 +242,7 @@
47 #define __NR_accept4 242
48 #define __NR_recvmmsg 243
49 #define __NR_arch_specific_syscall 244
50+#define __NR_riscv_hwprobe 258
51 #define __NR_wait4 260
52 #define __NR_prlimit64 261
53 #define __NR_fanotify_init 262
54@@ -304,6 +305,16 @@
55 #define __NR_set_mempolicy_home_node 450
56 #define __NR_cachestat 451
57 #define __NR_fchmodat2 452
58+#define __NR_map_shadow_stack 453
59+#define __NR_futex_wake 454
60+#define __NR_futex_wait 455
61+#define __NR_futex_requeue 456
62+#define __NR_statmount 457
63+#define __NR_listmount 458
64+#define __NR_lsm_get_self_attr 459
65+#define __NR_lsm_list_modules 461
66+#define __NR_lsm_set_self_attr 460
67+#define __NR_mseal 462
68
69 #define __NR_sysriscv __NR_arch_specific_syscall
70 #define __NR_riscv_flush_icache (__NR_sysriscv + 15)
diff --git a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch
index 59bfae5a27..04630b32ee 100644
--- a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch
+++ b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch
@@ -1,4 +1,4 @@
1From 3cce8716c6c3ae2e0c835caeac3780ec35090b2d Mon Sep 17 00:00:00 2001 1From e27de983ef70257ca1fd7f5096eea41613612ecf Mon Sep 17 00:00:00 2001
2From: Serhey Popovych <serhe.popovych@gmail.com> 2From: Serhey Popovych <serhe.popovych@gmail.com>
3Date: Tue, 11 Dec 2018 05:44:20 -0500 3Date: Tue, 11 Dec 2018 05:44:20 -0500
4Subject: [PATCH 2/2] ldso: Use syslibdir and libdir as default pathes to 4Subject: [PATCH 2/2] ldso: Use syslibdir and libdir as default pathes to
@@ -36,10 +36,10 @@ index 466d9afd..d2f458fa 100644
36 36
37 LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) 37 LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS)
38diff --git a/ldso/dynlink.c b/ldso/dynlink.c 38diff --git a/ldso/dynlink.c b/ldso/dynlink.c
39index cc677952..b0e8815b 100644 39index 324aa859..7d3ab44c 100644
40--- a/ldso/dynlink.c 40--- a/ldso/dynlink.c
41+++ b/ldso/dynlink.c 41+++ b/ldso/dynlink.c
42@@ -29,6 +29,8 @@ 42@@ -35,6 +35,8 @@ static size_t ldso_page_size;
43 #define realloc __libc_realloc 43 #define realloc __libc_realloc
44 #define free __libc_free 44 #define free __libc_free
45 45
@@ -48,7 +48,7 @@ index cc677952..b0e8815b 100644
48 static void error_impl(const char *, ...); 48 static void error_impl(const char *, ...);
49 static void error_noop(const char *, ...); 49 static void error_noop(const char *, ...);
50 static void (*error)(const char *, ...) = error_noop; 50 static void (*error)(const char *, ...) = error_noop;
51@@ -1097,7 +1099,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) 51@@ -1159,7 +1161,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by)
52 sys_path = ""; 52 sys_path = "";
53 } 53 }
54 } 54 }
@@ -58,5 +58,5 @@ index cc677952..b0e8815b 100644
58 } 58 }
59 pathname = buf; 59 pathname = buf;
60-- 60--
612.37.2 612.43.0
62 62
diff --git a/meta/recipes-core/musl/musl/0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch b/meta/recipes-core/musl/musl/0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch
deleted file mode 100644
index 45d40cd5b4..0000000000
--- a/meta/recipes-core/musl/musl/0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 65b0ac0d998bf0f36924a7c27ed9e702b2a5a453 Mon Sep 17 00:00:00 2001
2From: Violet Purcell <vimproved@inventati.org>
3Date: Sat, 4 Nov 2023 12:09:20 -0400
4Subject: [PATCH] elf.h: add typedefs for Elf64_Relr and Elf32_Relr
5
6These were overlooked when DT_RELR was added in commit
7d32dadd60efb9d3b255351a3b532f8e4c3dd0db1, potentially breaking
8software that treats presence of the DT_RELR macro as implying they
9exist.
10
11Upstream-Status: Backport [1.2.5]
12
13Signed-off-by: Zang Ruochen <zangruochen@loongson.cn>
14
15---
16 include/elf.h | 5 +++++
17 1 file changed, 5 insertions(+)
18
19diff --git a/include/elf.h b/include/elf.h
20index 23f2c4bc..72d17c3a 100644
21--- a/include/elf.h
22+++ b/include/elf.h
23@@ -558,6 +558,11 @@ typedef struct {
24
25
26
27+typedef Elf32_Word Elf32_Relr;
28+typedef Elf64_Xword Elf64_Relr;
29+
30+
31+
32 #define ELF32_R_SYM(val) ((val) >> 8)
33 #define ELF32_R_TYPE(val) ((val) & 0xff)
34 #define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff))
35--
362.25.1
37
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 324269a968..51e429b093 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,24 +4,22 @@
4require musl.inc 4require musl.inc
5inherit linuxloader 5inherit linuxloader
6 6
7SRCREV = "79bdacff83a6bd5b70ff5ae5eb8b6de82c2f7c30" 7SRCREV = "ae3a8c93a663b553e65f096498937083dad210d2"
8 8
9BASEVER = "1.2.4" 9BASEVER = "1.2.5"
10 10
11PV = "${BASEVER}+git" 11PV = "${BASEVER}+git"
12 12
13SRC_URI = "git://git.etalabs.net/git/musl;branch=master;protocol=https \ 13SRC_URI = "git://git.musl-libc.org/musl;branch=master \
14 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ 14 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
15 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ 15 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
16 file://0003-elf.h-add-typedefs-for-Elf64_Relr-and-Elf32_Relr.patch \ 16 file://0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch \
17 " 17 "
18 18
19S = "${WORKDIR}/git"
20
21PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt" 19PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"
22 20
23DEPENDS = "virtual/${TARGET_PREFIX}binutils \ 21DEPENDS = "virtual/cross-binutils \
24 virtual/${TARGET_PREFIX}gcc \ 22 virtual/cross-cc \
25 libgcc-initial \ 23 libgcc-initial \
26 linux-libc-headers \ 24 linux-libc-headers \
27 bsd-headers \ 25 bsd-headers \
@@ -30,7 +28,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
30GLIBC_LDSO = "${@get_glibc_loader(d)}" 28GLIBC_LDSO = "${@get_glibc_loader(d)}"
31MUSL_LDSO_ARCH = "${@get_musl_loader_arch(d)}" 29MUSL_LDSO_ARCH = "${@get_musl_loader_arch(d)}"
32 30
33export CROSS_COMPILE="${TARGET_PREFIX}" 31export CROSS_COMPILE = "${TARGET_PREFIX}"
34 32
35LDFLAGS += "-Wl,-soname,libc.so" 33LDFLAGS += "-Wl,-soname,libc.so"
36 34
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-07 03:51:32 +0000