[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[Sam James]

commit:     b53bb3b14ff55d4f733cf1d68fa999bbd1a781f8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 06:47:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 06:47:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53bb3b1

dev-libs/elfutils: add more metadata/information to musl patches

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/musl/elfutils-0.185-error-h.patch         | 21 +++------------------
 .../elfutils/files/musl/elfutils-0.185-macros.patch |  2 ++
 .../files/musl/elfutils-0.185-strndupa.patch        |  2 ++
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch b/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch
index b9ee9b6e35a..2be63fca48d 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch
@@ -1,20 +1,11 @@
+Should be obsolete with the next release (0.186?).
+
 https://raw.githubusercontent.com/gentoo/musl/master/dev-libs/elfutils/files/0.178/musl-error_h.patch
+https://sourceware.org/bugzilla/show_bug.cgi?id=21008
 
-From 9cb8fad40329cc6445233af0b6ac3f2adde19c65 Mon Sep 17 00:00:00 2001
-From: 
 Date: Thu, 12 Dec 2019 22:00:47 -0600
 Subject: [PATCH 9/9] Add hacked up error header for non GLIBC machines
 
----
- lib/error.h | 27 +++++++++++++++++++++++++++
- src/error.h | 27 +++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
- create mode 100644 lib/error.h
- create mode 100644 src/error.h
-
-diff --git a/lib/error.h b/lib/error.h
-new file mode 100644
-index 0000000..ef06827
 --- /dev/null
 +++ b/lib/error.h
 @@ -0,0 +1,27 @@
@@ -45,9 +36,6 @@ index 0000000..ef06827
 +}
 +
 +#endif	/* _ERROR_H_ */
-diff --git a/src/error.h b/src/error.h
-new file mode 100644
-index 0000000..ef06827
 --- /dev/null
 +++ b/src/error.h
 @@ -0,0 +1,27 @@
@@ -78,6 +66,3 @@ index 0000000..ef06827
 +}
 +
 +#endif	/* _ERROR_H_ */
--- 
-2.24.1
-

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch b/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch
index 3dbfdb6f7b3..6ab2e96548b 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch
@@ -1,3 +1,5 @@
+May not be required (or at least some hunks) with next release (0.186?)
+
 https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch
 --- a/src/arlib.h
 +++ b/src/arlib.h

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch b/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch
index 4175e28fd62..030bc779c61 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch
@@ -1,3 +1,5 @@
+Should be fixed in next release (0.186?).
+
 https://sourceware.org/git/?p=elfutils.git;a=commit;h=e7e4c92650892cf67210be5ea89ffba967427cbf
 https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch
 --- a/src/unstrip.c

[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[Sam James]

commit:     b33b10eb76f88a2d41f66ddc7184cb0e783e3d45
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 02:50:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 02:51:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33b10eb

dev-libs/elfutils: add arm64 patch for musl

Alpine, OE are applying this too, although would prefer
to see some action upstream for this.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/musl/elfutils-0.185-aarch64-regs.patch   | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
new file mode 100644
index 00000000000..99409540c1e
--- /dev/null
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
@@ -0,0 +1,54 @@
+https://www.sourceware.org/bugzilla/show_bug.cgi?id=25832
+https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+https://git.alpinelinux.org/aports/tree/main/elfutils/fix-aarch64_fregs.patch
+https://github.com/gentoo/musl/blob/6450482b9b4463b57ac249c63b7ed796e9874c40/dev-libs/elfutils/files/0.178/fix-aarch64_fregs.patch
+
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:27:30 +0800
+Subject: [PATCH] Fix build on aarch64/musl
+
+Errors
+
+invalid operands to binary & (have 'long double' and 'unsigned int')
+
+error: redefinition
+ of 'struct iovec'
+ struct iovec { void *iov_base; size_t iov_len; };
+        ^
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to 0.170
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+--- a/backends/aarch64_initreg.c
++++ b/backends/aarch64_initreg.c
+@@ -33,7 +33,7 @@
+ #include "system.h"
+ #include <assert.h>
+ #if defined(__aarch64__) && defined(__linux__)
+-# include <linux/uio.h>
++# include <sys/uio.h>
+ # include <sys/user.h>
+ # include <sys/ptrace.h>
+ /* Deal with old glibc defining user_pt_regs instead of user_regs_struct.  */
+@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)),
+ 
+   Dwarf_Word dwarf_fregs[32];
+   for (int r = 0; r < 32; r++)
+-    dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF;
++    dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF;
+ 
+   if (! setfunc (64, 32, dwarf_fregs, arg))
+     return false;
+--- a/backends/arm_initreg.c
++++ b/backends/arm_initreg.c
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ #ifdef __aarch64__
+-# include <linux/uio.h>
++# include <sys/uio.h>
+ # include <sys/user.h>
+ # include <sys/ptrace.h>
+ /* Deal with old glibc defining user_pt_regs instead of user_regs_struct.  */

[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[Sam James]

commit:     71828c9b2b7e1c8c5c90085694fe2a50b6fac602
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 02:55:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 02:55:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71828c9b

dev-libs/elfutils: add bug link to arm64 musl patch

Bug: https://bugs.gentoo.org/693772
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
index 99409540c1e..222c0527b68 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
@@ -1,5 +1,8 @@
 https://www.sourceware.org/bugzilla/show_bug.cgi?id=25832
 https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+https://bugs.gentoo.org/693772
+
+Other variants/links:
 https://git.alpinelinux.org/aports/tree/main/elfutils/fix-aarch64_fregs.patch
 https://github.com/gentoo/musl/blob/6450482b9b4463b57ac249c63b7ed796e9874c40/dev-libs/elfutils/files/0.178/fix-aarch64_fregs.patch