From 8e6306e00417f7ae3de244fbb2d0f58bc74631f1 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Feb 11 2019 08:53:45 +0000
Subject: Remove LRA bug on POWER workaround, fixed in gcc-9.0.1-0.4.fc30 (#1673018)


---

diff --git a/glibc-rh1673018.patch b/glibc-rh1673018.patch
deleted file mode 100644
index 1ab4a09..0000000
--- a/glibc-rh1673018.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Work around an LRA bug on ppc64le:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1673018
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89225
-
-diff --git a/sysdeps/ieee754/ldbl-128ibm/Makefile b/sysdeps/ieee754/ldbl-128ibm/Makefile
-index bdba6cc6b57e763e..54d12559f491d004 100644
---- a/sysdeps/ieee754/ldbl-128ibm/Makefile
-+++ b/sysdeps/ieee754/ldbl-128ibm/Makefile
-@@ -13,4 +13,7 @@ ifeq ($(subdir),math)
- tests += test-fmodl-ldbl-128ibm test-remainderl-ldbl-128ibm \
- 	 test-remquol-ldbl-128ibm test-canonical-ldbl-128ibm \
- 	 test-totalorderl-ldbl-128ibm
-+
-+# Work around #1673018 (GCC PR 89225): LRA hang on ppc64le in GCC 9.0.
-+CFLAGS-e_sqrtl.c += -fno-stack-protector
- endif
diff --git a/glibc.spec b/glibc.spec
index 2764bd5..610a967 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -87,7 +87,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -158,7 +158,6 @@ Patch18: glibc-c-utf8-locale.patch
 Patch23: glibc-python3.patch
 Patch28: glibc-rh1615608.patch
 Patch29: glibc-rh1670028.patch
-Patch30: glibc-rh1673018.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -1890,6 +1889,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Mon Feb 11 2019 Florian Weimer <fweimer@redhat.com> - 2.29-6
+- Remove LRA bug on POWER workaround, fixed in gcc-9.0.1-0.4.fc30 (#1673018)
+
 * Mon Feb 11 2019 Florian Weimer <fweimer@redhat.com> - 2.29-5
 - Auto-sync with upstream branch release/2.29/master,
   commit c096b008d2671028c21ac8cf01f18a2083e73c44: