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 f848b48..7803f02 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
+Patch9998: glibc-armhfp-ELF_MACHINE_NO_REL-undefined.patch
+Patch9999: glibc-rh1256317-armhfp-build-issue.patch
+
##############################################################################
#
# Patches from upstream
@@ -2828,6 +2833,11 @@ package or when debugging this package.
%patch2755 -p1
%patch2756 -p1
+%ifarch %{arm}
+%patch9998 -p1
+%patch9999 -p1
+%endif
+
##############################################################################
# %%prep - Additional prep required...
##############################################################################