The package rpms/glibc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=6a43999c13d2....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit 6404b258962769f7c4d1108c52aece4b314ee27f
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Jul 11 11:47:17 2018 +0200
Auto-sync with upstream branch master
Upstream commit: 93304f5f7a32f73b551266c5a181db51d97a71e4
- Install <bits/statx.h> header
- Put the correct Unicode version number 11.0.0 into the generated files
diff --git a/glibc.spec b/glibc.spec
index 4e5be9e..b10ac7e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.27.9000-566-gfd70af4552
+%define glibcsrcdir glibc-2.27.9000-568-g93304f5f7a
%define glibcversion 2.27.9000
-%define glibcrelease 37%{?dist}
+%define glibcrelease 38%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -1757,6 +1757,12 @@ fi
%endif
%changelog
+* Wed Jul 11 2018 Florian Weimer <fweimer(a)redhat.com> - 2.27.9000-38
+- Auto-sync with upstream branch master,
+ commit 93304f5f7a32f73b551266c5a181db51d97a71e4:
+- Install <bits/statx.h> header
+- Put the correct Unicode version number 11.0.0 into the generated files
+
* Wed Jul 11 2018 Florian Weimer <fweimer(a)redhat.com> - 2.27.9000-37
- Work around valgrind issue on i686 (#1600034)
diff --git a/sources b/sources
index 3393542..7b7e663 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.27.9000-566-gfd70af4552.tar.gz) =
2b662cf86fc9d27df241b6e29b4856382f93d3d3b89a68dfafc6145f1e9d40eed4687b81b31d4fc3f866fc2787f8172136e32416d66aa1feaf42ab162a3ef4da
+SHA512 (glibc-2.27.9000-568-g93304f5f7a.tar.gz) =
1328793e9161845c63a4fac81a19b7d167790da5163ea8c1eea476a7c350016f7fc00cd0d15982f70363a35b4f52ef5e734ae4f955e6566d022181fe4c03fec9
commit 6a43999c13d2a78861904904870434f9734abd58
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Jul 11 11:50:02 2018 +0200
Work around valgrind issue on i686 (#1600034)
diff --git a/glibc-ldflags.patch b/glibc-ldflags.patch
new file mode 100644
index 0000000..16c0b87
--- /dev/null
+++ b/glibc-ldflags.patch
@@ -0,0 +1,32 @@
+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 1710e23..4e5be9e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.27.9000-566-gfd70af4552
%define glibcversion 2.27.9000
-%define glibcrelease 36%{?dist}
+%define glibcrelease 37%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -148,6 +148,7 @@ Patch0018: glibc-c-utf8-locale.patch
Patch23: glibc-python3.patch
Patch24: glibc-with-nonshared-cflags.patch
Patch25: glibc-asflags.patch
+Patch26: glibc-ldflags.patch
##############################################################################
# Continued list of core "glibc" package information:
@@ -760,7 +761,17 @@ rpm_inherit_flags \
# Special flag to enable annobin annotations for statically linked
# assembler code. Needs to be passed to make; not preserved by
# configure.
-%define glibc_make_flags ASFLAGS="-g -Wa,--generate-missing-build-notes=yes"
+%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="-g
-Wa,--generate-missing-build-notes=yes"
+%else
+%define glibc_make_flags_ld %{nil}
+%endif
##############################################################################
# %%build - Generic options.
@@ -1746,6 +1757,9 @@ fi
%endif
%changelog
+* Wed Jul 11 2018 Florian Weimer <fweimer(a)redhat.com> - 2.27.9000-37
+- Work around valgrind issue on i686 (#1600034)
+
* Tue Jul 10 2018 Florian Weimer <fweimer(a)redhat.com> - 2.27.9000-36
- Auto-sync with upstream branch master,
commit fd70af45528d59a00eb3190ef6706cb299488fcd: