This is an automated email from the git hooks/post-receive script.
adconrad pushed a commit to branch sid
in repository glibc.
commit dbd0299a9648e80ac87892d26e7f4ece128ad9a1
Author: Adam Conrad <adcon...@0c3.net>
Date: Sat Jul 1 14:22:48 2017 -0600
debian/patches/any/cvs-common-symbols.diff: Fix build with newer binutils.
---
debian/changelog | 3 ++
debian/patches/any/cvs-common-symbols.diff | 58 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 62 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e5bce4f..6fbd76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ glibc (2.24-13) UNRELEASED; urgency=medium
* debian/rules.d/debhelper.mk: relax the dependency on linux-libc-dev to the
upstream version.
+ [ Adam Conrad ]
+ * debian/patches/any/cvs-common-symbols.diff: Fix build with newer binutils.
+
-- Aurelien Jarno <aure...@debian.org> Mon, 19 Jun 2017 17:36:36 +0200
glibc (2.24-12) unstable; urgency=high
diff --git a/debian/patches/any/cvs-common-symbols.diff
b/debian/patches/any/cvs-common-symbols.diff
new file mode 100644
index 0000000..7764c99
--- /dev/null
+++ b/debian/patches/any/cvs-common-symbols.diff
@@ -0,0 +1,58 @@
+commit 388b4f1a02f3a801965028bbfcd48d905638b797
+Author: H.J. Lu <hjl.to...@gmail.com>
+Date: Fri Jun 23 14:38:46 2017 -0700
+
+ Avoid .symver on common symbols [BZ #21666]
+
+ The .symver directive on common symbol just creates a new common symbol,
+ not an alias and the newer assembler with the bug fix for
+
+ https://sourceware.org/bugzilla/show_bug.cgi?id=21661
+
+ will issue an error. Before the fix, we got
+
+ $ readelf -sW libc.so | grep "loc[12s]"
+ 5109: 00000000003a0608 8 OBJECT LOCAL DEFAULT 36 loc1
+ 5188: 00000000003a0610 8 OBJECT LOCAL DEFAULT 36 loc2
+ 5455: 00000000003a0618 8 OBJECT LOCAL DEFAULT 36 locs
+ 6575: 00000000003a05f0 8 OBJECT GLOBAL DEFAULT 36 locs@GLIBC_2.2.5
+ 7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1@GLIBC_2.2.5
+ 7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2@GLIBC_2.2.5
+
+ in libc.so. The versioned loc1, loc2 and locs have the wrong addresses.
+ After the fix, we got
+
+ $ readelf -sW libc.so | grep "loc[12s]"
+ 6570: 000000000039e3b8 8 OBJECT GLOBAL DEFAULT 34 locs@GLIBC_2.2.5
+ 7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1@GLIBC_2.2.5
+ 7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2@GLIBC_2.2.5
+
+ [BZ #21666]
+ * misc/regexp.c (loc1): Add __attribute__ ((nocommon));
+ (loc2): Likewise.
+ (locs): Likewise.
+
+diff --git a/misc/regexp.c b/misc/regexp.c
+index 19d76c0c37..eaea7c3b89 100644
+--- a/misc/regexp.c
++++ b/misc/regexp.c
+@@ -29,14 +29,15 @@
+
+ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
+
+-/* Define the variables used for the interface. */
+-char *loc1;
+-char *loc2;
++/* Define the variables used for the interface. Avoid .symver on common
++ symbol, which just creates a new common symbol, not an alias. */
++char *loc1 __attribute__ ((nocommon));
++char *loc2 __attribute__ ((nocommon));
+ compat_symbol (libc, loc1, loc1, GLIBC_2_0);
+ compat_symbol (libc, loc2, loc2, GLIBC_2_0);
+
+ /* Although we do not support the use we define this variable as well. */
+-char *locs;
++char *locs __attribute__ ((nocommon));
+ compat_symbol (libc, locs, locs, GLIBC_2_0);
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 2aee2be..8c3bd83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -224,3 +224,4 @@ any/local-CVE-2017-1000366-rtld-LD_PRELOAD.diff
any/local-CVE-2017-1000366-rtld-LD_AUDIT.diff
any/cvs-vectorized-strcspn-guards.diff
any/cvs-hwcap-AT_SECURE.diff
+any/cvs-common-symbols.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
