From 9c9874e99cf692f7a5ebf7888f69e36bea49c3be Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Fri, 6 Nov 2020 13:59:20 -0600 Subject: [PATCH] elfutils: update to 0.182 --- .../elfutils/patches/fix-aarch64_fregs.patch | 26 ++++++--- .../elfutils/patches/fix-uninitialized.patch | 11 ---- .../elfutils/patches/musl-asm_ptrace_h.patch | 10 ---- srcpkgs/elfutils/patches/musl-cdefs.patch | 58 ++++++++++++------- srcpkgs/elfutils/template | 4 +- 5 files changed, 58 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/elfutils/patches/fix-uninitialized.patch delete mode 100644 srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch diff --git a/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch b/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch index e9641542144..d3d9a603729 100644 --- a/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch +++ b/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch @@ -1,14 +1,26 @@ -It looks like fregs.vregs[] is an array of double? -Casting to Dwarf_Word instead of & 0xFFFFFFF should do. +From cb5f396d2360991c3c333f52f005cb32c48b73a1 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Fri, 6 Nov 2020 13:55:34 -0600 +Subject: [PATCH] fix-aarch64_fregs ---- backends/aarch64_initreg.c 2015-11-27 14:36:29.000000000 +0100 -+++ backends/aarch64_initreg.c 2016-08-09 03:47:25.428560159 +0200 -@@ -82,7 +83,7 @@ +--- + backends/aarch64_initreg.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git backends/aarch64_initreg.c backends/aarch64_initreg.c +index daf6f37..8a09904 100644 +--- backends/aarch64_initreg.c ++++ backends/aarch64_initreg.c +@@ -82,8 +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] = (Dwarf_Word)fregs.vregs[r]; - +- ++ dwarf_fregs[r] = (Dwarf_Word)fregs.vregs[r]; if (! setfunc (64, 32, dwarf_fregs, arg)) return false; + +-- +2.29.2 + diff --git a/srcpkgs/elfutils/patches/fix-uninitialized.patch b/srcpkgs/elfutils/patches/fix-uninitialized.patch deleted file mode 100644 index 6ab15e50e2b..00000000000 --- a/srcpkgs/elfutils/patches/fix-uninitialized.patch +++ /dev/null @@ -1,11 +0,0 @@ - ---- libcpu/i386_disasm.c 2015-08-21 14:22:37.000000000 +0200 -+++ libcpu/i386_disasm.c 2015-11-20 06:30:59.250629957 +0100 -@@ -710,6 +710,7 @@ - - case 'm': - /* Mnemonic. */ -+ str = mnebuf; - - if (unlikely (instrtab[cnt].mnemonic == MNE_INVALID)) - { diff --git a/srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch b/srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch deleted file mode 100644 index d4ebf315549..00000000000 --- a/srcpkgs/elfutils/patches/musl-asm_ptrace_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- backends/ppc_initreg.c 2019-11-26 23:48:42.000000000 +0100 -+++ backends/ppc_initreg.c 2019-12-08 16:57:58.334872602 +0100 -@@ -32,6 +32,7 @@ - - #include - #if defined(__powerpc__) && defined(__linux__) -+# include - # include - # include - #endif diff --git a/srcpkgs/elfutils/patches/musl-cdefs.patch b/srcpkgs/elfutils/patches/musl-cdefs.patch index 65ef9f4d23c..c0e218ddf5c 100644 --- a/srcpkgs/elfutils/patches/musl-cdefs.patch +++ b/srcpkgs/elfutils/patches/musl-cdefs.patch @@ -1,24 +1,16 @@ ---- libelf/elf.h 2015-08-21 14:22:37.000000000 +0200 -+++ libelf/elf.h 2015-11-20 04:54:33.948081321 +0100 -@@ -21,6 +21,17 @@ - - #include - -+#if !defined(__BEGIN_DECLS) -+/* C++ needs to know that types and declarations are C, not C++. */ -+#ifdef __cplusplus -+# define __BEGIN_DECLS extern "C" { -+# define __END_DECLS } -+#else -+# define __BEGIN_DECLS -+# define __END_DECLS -+#endif -+#endif -+ - __BEGIN_DECLS - - /* Standard ELF types. */ ---- lib/fixedsizehash.h.orig +From 4a6602ae33489bc74da76bb374cb2c22a2a35d88 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Fri, 6 Nov 2020 09:58:19 -0600 +Subject: [PATCH] musl-cdefs + +--- + lib/fixedsizehash.h | 1 - + libelf/elf.h | 10 ++++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git lib/fixedsizehash.h lib/fixedsizehash.h +index dac2a5f..43016fc 100644 +--- lib/fixedsizehash.h +++ lib/fixedsizehash.h @@ -30,7 +30,6 @@ #include @@ -28,3 +20,27 @@ #include +diff --git libelf/elf.h libelf/elf.h +index 6439c1a..b9c80ba 100644 +--- libelf/elf.h ++++ libelf/elf.h +@@ -22,6 +22,16 @@ + /* Standard ELF types. */ + + #include ++#if !defined(__BEGIN_DECLS) ++ /* C++ needs to know that types and declarations are C, not C++. */ ++ #ifdef __cplusplus ++ # define __BEGIN_DECLS extern "C" { ++ # define __END_DECLS } ++ #else ++ # define __BEGIN_DECLS ++ # define __END_DECLS ++ #endif ++ #endif + + /* Type for a 16-bit quantity. */ + typedef uint16_t Elf32_Half; +-- +2.29.2 + diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 02e6e20c64b..210cdcf51ca 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.181 +version=0.182 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu- --disable-debuginfod --disable-libdebuginfod" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3 +checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858 CFLAGS="-Wno-error"