From a6be8b37f86eaa6c6bd1a79f6caeec582b8dce3e Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Oct 30 2018 07:46:32 +0000
Subject: Modify to build on armhfp


---

diff --git a/SOURCES/glibc-rh1256317-armhfp-build-issue.patch b/SOURCES/glibc-rh1256317-armhfp-build-issue.patch
new file mode 100644
index 0000000..7d2d223
--- /dev/null
+++ b/SOURCES/glibc-rh1256317-armhfp-build-issue.patch
@@ -0,0 +1,11 @@
+--- a/ports/sysdeps/unix/arm/sysdep.S  2016-11-05 11:44:45.561945344 +0100
++++ b/ports/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 5a388ae..afe21e4 100644
--- a/SPECS/glibc.spec
+++ b/SPECS/glibc.spec
@@ -258,6 +258,11 @@ Patch0068: glibc-rh1349982.patch
 
 # These changes were brought forward from RHEL 6 for compatibility
 Patch0069: glibc-rh1448107.patch
+
+# Armhfp build issue
+
+Patch0070: glibc-rh1256317-armhfp-build-issue.patch
+
 ##############################################################################
 #
 # Patches from upstream
@@ -2605,6 +2610,11 @@ package or when debugging this package.
 %patch2542 -p1
 %patch2543 -p1
 %patch0069 -p1
+
+%ifarch %{arm}
+%patch0070 -p1
+%endif
+
 %patch2544 -p1
 %patch2545 -p1
 %patch2546 -p1
@@ -3979,6 +3989,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Oct 30 2018 Johnny Hughes <johnny@centos.org> - 2.17-260
+- Added patch for armhfp build issue (jacco@redsleeve.org)
+
 * Wed Jun 27 2018 Patsy Franklin <pfrankli@redhat.com> - 2.17-260
 - Update glibc-rh1560641.patch to initialize pad outside
   the conditional eliminating an uninitialized byte warning from