From af8ab5394511aeadb99d6c924ad2f40e4ecb35fd Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Oct 13 2021 17:42:57 +0000
Subject: Build on armhfp


---

diff --git a/SOURCES/centos-arm32-NO_LONG_DOUBLE_MATH.patch b/SOURCES/centos-arm32-NO_LONG_DOUBLE_MATH.patch
new file mode 100644
index 0000000..790c74a
--- /dev/null
+++ b/SOURCES/centos-arm32-NO_LONG_DOUBLE_MATH.patch
@@ -0,0 +1,19 @@
+diff -Naurp a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
+--- a/stdio-common/printf_fp.c	2021-02-03 16:46:26.887807279 +0000
++++ b/stdio-common/printf_fp.c	2021-02-03 16:50:16.604469900 +0000
+@@ -151,6 +151,7 @@ static wchar_t *group_number (wchar_t *b
+ 			      wchar_t thousands_sep, int ngroups)
+      internal_function;
+ 
++#ifndef __NO_LONG_DOUBLE_MATH
+ static __always_inline int
+ isnanl_or_pseudo (long double in)
+ {
+@@ -172,6 +173,7 @@ isnanl_or_pseudo (long double in)
+   return __isnanl (in);
+ #endif
+ }
++#endif
+ 
+ 
+ int
diff --git a/SOURCES/glibc-armhfp-ELF_MACHINE_NO_REL-undefined.patch b/SOURCES/glibc-armhfp-ELF_MACHINE_NO_REL-undefined.patch
new file mode 100644
index 0000000..78d7c4b
--- /dev/null
+++ b/SOURCES/glibc-armhfp-ELF_MACHINE_NO_REL-undefined.patch
@@ -0,0 +1,36 @@
+From patchwork Thu Jul  3 13:26:40 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: ARM: Define ELF_MACHINE_NO_REL
+X-Patchwork-Submitter: Will Newton <will.newton@linaro.org>
+X-Patchwork-Id: 366862
+Message-Id: <1404394000-13429-1-git-send-email-will.newton@linaro.org>
+To: libc-alpha@sourceware.org
+Date: Thu,  3 Jul 2014 14:26:40 +0100
+From: Will Newton <will.newton@linaro.org>
+List-Id: <libc-alpha.sourceware.org>
+
+Fix a -Wundef warning on ARM.
+
+ChangeLog:
+
+2014-07-03  Will Newton  <will.newton@linaro.org>
+
+	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_REL): Define.
+---
+ sysdeps/arm/dl-machine.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
+index c5ffc93..d6b0c52 100644
+--- a/sysdeps/arm/dl-machine.h
++++ b/sysdeps/arm/dl-machine.h
+@@ -296,6 +296,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
+ /* ARM never uses Elf32_Rela relocations for the dynamic linker.
+    Prelinked libraries may use Elf32_Rela though.  */
+ #define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
++#define ELF_MACHINE_NO_REL 0
+ 
+ /* Names of the architecture-specific auditing callback functions.  */
+ #define ARCH_LA_PLTENTER arm_gnu_pltenter
diff --git a/SOURCES/glibc-rh1256317-armhfp-build-issue.patch b/SOURCES/glibc-rh1256317-armhfp-build-issue.patch
new file mode 100644
index 0000000..aa6e7fe
--- /dev/null
+++ b/SOURCES/glibc-rh1256317-armhfp-build-issue.patch
@@ -0,0 +1,11 @@
+--- a/sysdeps/unix/arm/sysdep.S	2016-11-05 11:44:45.561945344 +0100
++++ b/sysdeps/unix/arm/sysdep.S	2016-11-05 11:44:19.542069815 +0100
+@@ -37,7 +37,7 @@
+ 	moveq r0, $EAGAIN	/* Yes; translate it to EAGAIN.  */
+ #endif
+ 
+-#ifndef IS_IN_rtld
++#if !IS_IN (rtld)
+ 	mov ip, lr
+ 	cfi_register (lr, ip)
+ 	mov r1, r0
diff --git a/SPECS/glibc.spec b/SPECS/glibc.spec
index 33fc4f9..8594015 100644
--- a/SPECS/glibc.spec
+++ b/SPECS/glibc.spec
@@ -1642,6 +1642,10 @@ Patch2859: glibc-rh1925204-1.patch
 Patch2860: glibc-rh1925204-2.patch
 Patch2861: glibc-rh1927536.patch
 Patch2862: glibc-rh1993930.patch
+# Armhfp build issue
+Patch9997: centos-arm32-NO_LONG_DOUBLE_MATH.patch
+Patch9998: glibc-armhfp-ELF_MACHINE_NO_REL-undefined.patch
+Patch9999: glibc-rh1256317-armhfp-build-issue.patch
 
 ##############################################################################
 # End of glibc patches.
@@ -3015,6 +3019,12 @@ package or when debugging this package.
 %patch2861 -p1
 %patch2862 -p1
 
+%ifarch %{arm}
+%patch9998 -p1
+%patch9999 -p1
+%patch9997 -p1
+%endif
+
 ##############################################################################
 # %%prep - Additional prep required...
 ##############################################################################