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=2d4666e46047...
https://src.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=77cd17d27494....
Change:
-%ifarch %{multiarcharches}
+%ifarch %{ix86}
Thanks.
Full change:
============
commit 4cd15aea67050866ca9b074ee0a027f105dce898
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Aug 16 11:41:13 2017 +0200
Auto-sync with upstream release/2.25/master
Upstream commit: 47db584c74e2bbcf1ba55e62d949c1a738da5e0a
- Disable SSE2 usage on i686 (#1471427)
- CVE-2017-12132: Reduce EDNS payload size to 1200 bytes (#1477530)
- Call exit directly in clone (swbz#21512)
- assert: Suppress pedantic warning caused by statement expression (swbz#21242)
- x86-64: Use _dl_runtime_resolve_opt only with AVX512F (swbz#21871)
- powerpc: Fix logbl on power7 (swbz#21280)
- Avoid .symver on common symbols (swbz#21666)
- aarch64: Use hidden __GI__dl_argv in rtld startup code
diff --git a/glibc.spec b/glibc.spec
index bed1bd4..e193bbf 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.25-24-g49f97e6
+%define glibcsrcdir glibc-2.25-45-g47db584c74
%define glibcversion 2.25
-%define glibcrelease 7%{?dist}
+%define glibcrelease 8%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -2242,6 +2242,18 @@ rm -f *.filelist*
%endif
%changelog
+* Wed Aug 16 2017 Florian Weimer <fweimer(a)redhat.com> - 2.25-8
+- Disable SSE2 usage on i686 (#1471427)
+- Auto-sync with upstream release/2.25/master,
+ commit 47db584c74e2bbcf1ba55e62d949c1a738da5e0a:
+- CVE-2017-12132: Reduce EDNS payload size to 1200 bytes (#1477530)
+- Call exit directly in clone (swbz#21512)
+- assert: Suppress pedantic warning caused by statement expression (swbz#21242)
+- x86-64: Use _dl_runtime_resolve_opt only with AVX512F (swbz#21871)
+- powerpc: Fix logbl on power7 (swbz#21280)
+- Avoid .symver on common symbols (swbz#21666)
+- aarch64: Use hidden __GI__dl_argv in rtld startup code
+
* Thu Jul 06 2017 Florian Weimer <fweimer(a)redhat.com> - 2.25-7
- Auto-sync with upstream release/2.25/master,
commit 49f97e641e4e84a42246655d30adbc4756e67114:
diff --git a/sources b/sources
index 7a90908..668397a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-24-g49f97e6.tar.gz) =
277039923a26b20b91dc761b5a8e323282bb912f0049c893fa50c839374425bb2500e88abab7c4cbc12bb79ac75863df8be381e287729a3294f08242ba43947c
+SHA512 (glibc-2.25-45-g47db584c74.tar.gz) =
9211200e524181471e8133d908ff7b4f9ee879caf04d528b414c992f4c9300df6f40512e1910dc84ce661d679127bd576cc290999439a9d340ecffa6b7322da1
commit 77cd17d274946d6b62e368275857ddcff7304d5a
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Aug 16 11:14:32 2017 +0200
Disable multi-arch (IFUNC string functions) on i686 (#1471427)
diff --git a/glibc.spec b/glibc.spec
index 424a970..bed1bd4 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1007,6 +1007,9 @@ build()
--enable-obsolete-rpc \
--enable-systemtap \
${core_with_options} \
+%ifarch %{ix86}
+ --disable-multi-arch \
+%endif
%ifarch %{lock_elision_arches}
--enable-lock-elision \
%endif
commit 2d4666e46047bf02b9b377f90047968e51dceaab
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Aug 16 11:12:36 2017 +0200
Use upstream default for multi-arch support
Drop binutils run-time conflict. If we still want those, they should
be on glibc-devel, not the main package.
diff --git a/glibc.spec b/glibc.spec
index c811423..424a970 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -131,14 +131,6 @@
# will be created for the architecture.
%define debuginfocommonarches %{biarcharches} alpha alphaev6
##############################################################################
-# If the architecture has multiarch support in glibc then it should be listed
-# here to enable support in the build. Multiarch support is a single library
-# with implementations of certain functions for multiple architectures. The
-# most optimal function is selected at runtime based on the hardware that is
-# detected by glibc. The underlying support for function selection and
-# execution is provided by STT_GNU_IFUNC.
-%define multiarcharches %{power64} %{ix86} x86_64 %{sparc}
-##############################################################################
# Add -s for a less verbose build output.
%define silentrules PARALLELMFLAGS=
##############################################################################
@@ -380,29 +372,9 @@ Conflicts: kernel < %{enablekernel}
%endif
%endif
-%ifarch %{multiarcharches}
-# Need STT_IFUNC support
-%ifarch %{power64}
-BuildRequires: binutils >= 2.20.51.0.2
-Conflicts: binutils < 2.20.51.0.2
-%else
-%ifarch s390 s390x
-# Needed for STT_GNU_IFUNC support for s390/390x
-BuildRequires: binutils >= 2.23.52.0.1-8
-Conflicts: binutils < 2.23.52.0.1-8
-%else
-# Default to this version
-BuildRequires: binutils >= 2.19.51.0.10
-Conflicts: binutils < 2.19.51.0.10
-%endif
-%endif
+BuildRequires: binutils >= 2.25
# Earlier releases have broken support for IRELATIVE relocations
Conflicts: prelink < 0.4.2
-%else
-# Need AS_NEEDED directive
-# Need --hash-style=* support
-BuildRequires: binutils >= 2.17.50.0.2-5
-%endif
BuildRequires: gcc >= 3.2.1-5
%ifarch s390 s390x
@@ -1012,7 +984,7 @@ AddOns=`echo */configure | sed -e
's!/configure!!g;s!\(nptl\|powerpc-cpu\)\( \|$
# Build glibc in `build-%{target}$1', passing the rest of the arguments
# as CFLAGS to the build (not the same as configure CFLAGS). Several
# global values are used to determine build flags, add-ons, kernel
-# version, multiarch support, system tap support, etc.
+# version, system tap support, etc.
##############################################################################
build()
{
@@ -1030,9 +1002,6 @@ build()
--enable-add-ons=$AddOns \
--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
--build=%{target} \
-%ifarch %{multiarcharches}
- --enable-multi-arch \
-%endif
--enable-stack-protector=strong \
--enable-tunables \
--enable-obsolete-rpc \