From 1e7b59d82e2f25b0b7a35a316fc91b89be31e3c8 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Oct 26 2021 13:49:38 +0000
Subject: build on armhfp try 2


---

diff --git a/SOURCES/elfutils-dts10-armhfp.patch b/SOURCES/elfutils-dts10-armhfp.patch
new file mode 100644
index 0000000..d963004
--- /dev/null
+++ b/SOURCES/elfutils-dts10-armhfp.patch
@@ -0,0 +1,32 @@
+diff -Naurp a/backends/Makefile.am b/backends/Makefile.am
+--- a/backends/Makefile.am	2019-06-13 12:19:49.078487313 +0000
++++ b/backends/Makefile.am	2019-06-13 12:21:44.137496575 +0000
+@@ -99,7 +99,7 @@ csky_SRCS = csky_attrs.c csky_init.c csk
+ 	    csky_regs.c csky_initreg.c csky_corenote.c
+ 
+ libebl_backends_a_CFLAGS = -fPIC $(AM_CFLAGS)
+-libebl_backends_a_SOURCES = $(i386_SRCS) $(x86_64_SRCS) \
++libebl_backends_a_SOURCES = $(i386_SRCS) $(x86_64_SRCS) $(arm_SRCS) \
+ 			    $(ia64_SRCS) $(aarch64_SRCS) $(ppc_SRCS) \
+ 			    $(ppc64_SRCS) $(s390_SRCS) \
+ 			    $(bpf_SRCS)
+diff -Naurp a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
+--- a/libebl/eblopenbackend.c	2019-06-13 12:19:49.083487139 +0000
++++ b/libebl/eblopenbackend.c	2019-06-13 12:24:04.382632274 +0000
+@@ -48,6 +48,7 @@ Ebl *aarch64_init (Elf *, GElf_Half, Ebl
+ Ebl *ppc_init (Elf *, GElf_Half, Ebl *);
+ Ebl *ppc64_init (Elf *, GElf_Half, Ebl *);
+ Ebl *s390_init (Elf *, GElf_Half, Ebl *);
++Ebl *arm_init (Elf *, GElf_Half, Ebl *);
+ Ebl *bpf_init (Elf *, GElf_Half, Ebl *);
+ 
+ /* This table should contain the complete list of architectures as far
+@@ -73,7 +74,7 @@ static const struct
+   { ppc64_init, "elf_ppc64", "ppc64", 5, EM_PPC64, ELFCLASS64, ELFDATA2MSB },
+   // XXX class and machine fields need to be filled in for all archs.
+   { NULL, "elf_sh", "sh", 2, EM_SH, 0, 0 },
+-  { NULL, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
++  { arm_init, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
+   { NULL, "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },
+   { NULL, "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
+   { NULL, "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
diff --git a/SOURCES/elfutils-dts9-armhfp.patch b/SOURCES/elfutils-dts9-armhfp.patch
deleted file mode 100644
index 9e797cb..0000000
--- a/SOURCES/elfutils-dts9-armhfp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naurp a/backends/Makefile.am b/backends/Makefile.am
---- a/backends/Makefile.am	2019-06-13 12:19:49.078487313 +0000
-+++ b/backends/Makefile.am	2019-06-13 12:21:44.137496575 +0000
-@@ -99,7 +99,7 @@ csky_SRCS = csky_attrs.c csky_init.c csk
- 	    csky_regs.c csky_initreg.c csky_corenote.c
- 
- libebl_backends_a_CFLAGS = -fPIC $(AM_CFLAGS)
--libebl_backends_a_SOURCES = $(i386_SRCS) $(x86_64_SRCS) \
-+libebl_backends_a_SOURCES = $(i386_SRCS) $(x86_64_SRCS) $(arm_SRCS) \
- 			    $(ia64_SRCS) $(aarch64_SRCS) $(ppc_SRCS) \
- 			    $(ppc64_SRCS) $(s390_SRCS) \
- 			    $(bpf_SRCS)
-diff -Naurp a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
---- a/libebl/eblopenbackend.c	2019-06-13 12:19:49.083487139 +0000
-+++ b/libebl/eblopenbackend.c	2019-06-13 12:24:04.382632274 +0000
-@@ -48,6 +48,7 @@ Ebl *aarch64_init (Elf *, GElf_Half, Ebl
- Ebl *ppc_init (Elf *, GElf_Half, Ebl *);
- Ebl *ppc64_init (Elf *, GElf_Half, Ebl *);
- Ebl *s390_init (Elf *, GElf_Half, Ebl *);
-+Ebl *arm_init (Elf *, GElf_Half, Ebl *);
- Ebl *bpf_init (Elf *, GElf_Half, Ebl *);
- 
- /* This table should contain the complete list of architectures as far
-@@ -74,7 +75,7 @@ static const struct
-   { NULL, "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },
-   // XXX class and machine fields need to be filled in for all archs.
-   { NULL, "elf_sh", "sh", 2, EM_SH, 0, 0 },
--  { NULL, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
-+  { arm_init, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
-   { NULL, "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },
-   { NULL, "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
-   { NULL, "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
diff --git a/SPECS/elfutils.spec b/SPECS/elfutils.spec
index e21cf03..ad320a3 100644
--- a/SPECS/elfutils.spec
+++ b/SPECS/elfutils.spec
@@ -17,8 +17,6 @@ Group: Development/Tools
 # Needed for isa specific Provides and Requires.
 %global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
 
-Patch1001: elfutils-dts9-armhfp.patch
-
 Requires: %{?scl_prefix}elfutils-libelf%{depsuffix} = %{version}-%{release}
 Requires: %{?scl_prefix}elfutils-libs%{depsuffix} = %{version}-%{release}
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
@@ -84,6 +82,8 @@ Patch100: elfutils-0.182-dts.patch
 Patch101: elfutils-dts-libs-version.patch
 Patch102: elfutils-dts-curl-signal-state.patch
 
+Patch1001: elfutils-dts10-armhfp.patch
+
 %description
 Elfutils is a collection of utilities, including stack (to show
 backtraces), nm (for listing symbols from object files), size