slyfox      17/08/12 22:29:11

  Modified:             README.history
  Added:               
                        
00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch
  Log:
  Add upstream patch to survive building against binutils-2.29, bug #627164
  
  Patch picked at
  
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=388b4f1a02f3a801965028bbfcd48d905638b797
  
  Bug: https://bugs.gentoo.org/627164

Revision  Changes    Path
1.11                 src/patchsets/glibc/2.24/README.history

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?r1=1.10&r2=1.11

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.24/README.history,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- README.history      12 Aug 2017 16:30:05 -0000      1.10
+++ README.history      12 Aug 2017 22:29:11 -0000      1.11
@@ -1,4 +1,7 @@
-9              [pending]
+10             [pending]
+       + 00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch
+
+9              12 Aug 2017
        U extra/etc/nsswitch.conf
        U extra/locale/locale-gen
 



1.1                  
src/patchsets/glibc/2.24/00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch?rev=1.1&content-type=text/plain

Index: 00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch
===================================================================
https://bugs.gentoo.org/627164

>From 388b4f1a02f3a801965028bbfcd48d905638b797 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.to...@gmail.com>
Date: Fri, 23 Jun 2017 14:38:46 -0700
Subject: [PATCH] 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.
---
 ChangeLog     | 7 +++++++
 misc/regexp.c | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

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);
 
 
-- 
2.14.1





Reply via email to