From 711d6257aac9745247fd1c8a710f031e79f9f06e Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Nov 16 2015 20:37:03 +0000
Subject: Revert "Apply temporary fix for armhfp build issue"


This reverts commit bf5e09bbb8cbd0786fd3105e6bec439584752af6.

---

diff --git a/glibc-fedora-armhfp-long-double-hotfix.patch b/glibc-fedora-armhfp-long-double-hotfix.patch
deleted file mode 100644
index c33571d..0000000
--- a/glibc-fedora-armhfp-long-double-hotfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This is based on the suggestion here:
-
-  <https://sourceware.org/ml/libc-alpha/2015-11/msg00174.html>
-
-diff -up glibc-2.22-517-g2eecc8a/math/test-signgam-finite-c99.c.armhfp glibc-2.22-517-g2eecc8a/math/test-signgam-finite-c99.c
---- glibc-2.22-517-g2eecc8a/math/test-signgam-finite-c99.c.armhfp	2015-11-09 17:30:15.873258439 +0100
-+++ glibc-2.22-517-g2eecc8a/math/test-signgam-finite-c99.c	2015-11-09 17:31:04.806517973 +0100
-@@ -18,6 +18,7 @@
- 
- #undef _LIBC
- #undef _GNU_SOURCE
-+#undef _Mlong_double_
- #define _ISOMAC
- 
- #include <math.h>
diff --git a/glibc.spec b/glibc.spec
index 8250a60..c31817f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.22-517-g2eecc8a
 %define glibcversion 2.22.90
-%define glibcrelease 16%{?dist}
+%define glibcrelease 17%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -230,9 +230,6 @@ Patch0058: glibc-bug-regex-gcc5.patch
 # Add C.UTF-8 locale into /usr/lib/locale/
 Patch0059: glibc-c-utf8-locale.patch
 
-# Temporary workaround for armhfp build problem.
-Patch0060: glibc-fedora-armhfp-long-double-hotfix.patch
-
 ##############################################################################
 #
 # Patches from upstream
@@ -660,7 +657,6 @@ cat /proc/meminfo
 %patch0057 -p1
 %patch0058 -p1
 %patch0059 -p1
-%patch0060 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1859,6 +1855,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Nov 16 2015 Florian Weimer <fweimer@redhat.com> - 2.22.90-17
+- Revert temporary armhfp build fix.
+
 * Mon Nov  9 2015 Florian Weimer <fweimer@redhat.com> - 2.22.90-16
 - Apply temporary fix for armhfp build issue.