From b332a9b7669d0161c8e8e8152068698584b8abf7 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 29 Aug 2018 13:06:17 +0200
Subject: [PATCH] Remove workaround for valgrind bug (#1600034)

---
 glibc-ldflags.patch | 32 --------------------------------
 glibc.spec          | 17 +++++------------
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 glibc-ldflags.patch

diff --git a/glibc-ldflags.patch b/glibc-ldflags.patch
deleted file mode 100644
index 16c0b87..0000000
--- a/glibc-ldflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch is similar to glibc-asflags.patch and is needed to change
-the ld.so linker flags.  It is needed to work around this valgrind
-bug: https://bugzilla.redhat.com/show_bug.cgi?id=1600034
-
-diff --git a/Makeconfig b/Makeconfig
-index 92e76d6200bbcd5b..376181c8ff06dea7 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -363,12 +363,12 @@ endif
- ifeq (yesyes,$(build-shared)$(have-z-combreloc))
- combreloc-LDFLAGS = -Wl,-z,combreloc
- LDFLAGS.so += $(combreloc-LDFLAGS)
--LDFLAGS-rtld += $(combreloc-LDFLAGS)
-+override LDFLAGS-rtld += $(combreloc-LDFLAGS)
- endif
- 
- relro-LDFLAGS = -Wl,-z,relro
- LDFLAGS.so += $(relro-LDFLAGS)
--LDFLAGS-rtld += $(relro-LDFLAGS)
-+override LDFLAGS-rtld += $(relro-LDFLAGS)
- 
- ifeq (yes,$(have-hash-style))
- # For the time being we unconditionally use 'both'.  At some time we
-@@ -376,7 +376,7 @@ ifeq (yes,$(have-hash-style))
- # with --hash-style=gnu only.
- hashstyle-LDFLAGS = -Wl,--hash-style=both
- LDFLAGS.so += $(hashstyle-LDFLAGS)
--LDFLAGS-rtld += $(hashstyle-LDFLAGS)
-+override LDFLAGS-rtld += $(hashstyle-LDFLAGS)
- endif
- 
- ifeq (yes,$(enable-static-pie))
diff --git a/glibc.spec b/glibc.spec
index 466441e..b054630 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.28
 %define glibcversion 2.28
-%define glibcrelease 8%{?dist}
+%define glibcrelease 9%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -159,7 +159,6 @@ Patch18: glibc-c-utf8-locale.patch
 Patch23: glibc-python3.patch
 Patch24: glibc-with-nonshared-cflags.patch
 Patch25: glibc-asflags.patch
-Patch26: glibc-ldflags.patch
 Patch27: glibc-rh1614705.patch
 Patch28: glibc-rh1615608.patch
 Patch29: glibc-error-va_end.patch
@@ -788,16 +787,7 @@ rpm_inherit_flags \
 # assembler code.  Needs to be passed to make; not preserved by
 # configure.
 %define glibc_make_flags_as ASFLAGS="-g -Wa,--generate-missing-build-notes=yes"
-%define glibc_make_flags %{glibc_make_flags_as} %{glibc_make_flags_ld}
-
-# valgrind reports false positives if ld.so is linked with -z
-# separate-code (the default) on i686, so we work around that here.
-# See <https://bugzilla.redhat.com/show_bug.cgi?id=1600034>.
-%ifarch %{ix86}
-%define glibc_make_flags_ld LDFLAGS-rtld="-Wl,-z,noseparate-code"
-%else
-%define glibc_make_flags_ld %{nil}
-%endif
+%define glibc_make_flags %{glibc_make_flags_as}
 
 ##############################################################################
 # %%build - Generic options.
@@ -1883,6 +1873,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 29 2018 Florian Weimer <fweimer@redhat.com> - 2.28-9
+- Remove workaround for valgrind bug (#1600034)
+
 * Wed Aug 29 2018 Florian Weimer <fweimer@redhat.com> - 2.28-8
 - regex: Fix memory overread when pattern contains NUL byte (#1622674)