| 1 |
slyfox 17/08/12 22:29:11 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: |
| 5 |
00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch |
| 6 |
Log: |
| 7 |
Add upstream patch to survive building against binutils-2.29, bug #627164 |
| 8 |
|
| 9 |
Patch picked at |
| 10 |
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=388b4f1a02f3a801965028bbfcd48d905638b797 |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/627164 |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.11 src/patchsets/glibc/2.24/README.history |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.11&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.11&content-type=text/plain |
| 19 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?r1=1.10&r2=1.11 |
| 20 |
|
| 21 |
Index: README.history |
| 22 |
=================================================================== |
| 23 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.24/README.history,v |
| 24 |
retrieving revision 1.10 |
| 25 |
retrieving revision 1.11 |
| 26 |
diff -u -r1.10 -r1.11 |
| 27 |
--- README.history 12 Aug 2017 16:30:05 -0000 1.10 |
| 28 |
+++ README.history 12 Aug 2017 22:29:11 -0000 1.11 |
| 29 |
@@ -1,4 +1,7 @@ |
| 30 |
-9 [pending] |
| 31 |
+10 [pending] |
| 32 |
+ + 00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch |
| 33 |
+ |
| 34 |
+9 12 Aug 2017 |
| 35 |
U extra/etc/nsswitch.conf |
| 36 |
U extra/locale/locale-gen |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 src/patchsets/glibc/2.24/00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch |
| 42 |
|
| 43 |
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 |
| 44 |
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 |
| 45 |
|
| 46 |
Index: 00_all_0054-Avoid-.symver-on-common-symbols-BZ-21666.patch |
| 47 |
=================================================================== |
| 48 |
https://bugs.gentoo.org/627164 |
| 49 |
|
| 50 |
From 388b4f1a02f3a801965028bbfcd48d905638b797 Mon Sep 17 00:00:00 2001 |
| 51 |
From: "H.J. Lu" <hjl.tools@×××××.com> |
| 52 |
Date: Fri, 23 Jun 2017 14:38:46 -0700 |
| 53 |
Subject: [PATCH] Avoid .symver on common symbols [BZ #21666] |
| 54 |
|
| 55 |
The .symver directive on common symbol just creates a new common symbol, |
| 56 |
not an alias and the newer assembler with the bug fix for |
| 57 |
|
| 58 |
https://sourceware.org/bugzilla/show_bug.cgi?id=21661 |
| 59 |
|
| 60 |
will issue an error. Before the fix, we got |
| 61 |
|
| 62 |
$ readelf -sW libc.so | grep "loc[12s]" |
| 63 |
5109: 00000000003a0608 8 OBJECT LOCAL DEFAULT 36 loc1 |
| 64 |
5188: 00000000003a0610 8 OBJECT LOCAL DEFAULT 36 loc2 |
| 65 |
5455: 00000000003a0618 8 OBJECT LOCAL DEFAULT 36 locs |
| 66 |
6575: 00000000003a05f0 8 OBJECT GLOBAL DEFAULT 36 locs@GLIBC_2.2.5 |
| 67 |
7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1@GLIBC_2.2.5 |
| 68 |
7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2@GLIBC_2.2.5 |
| 69 |
|
| 70 |
in libc.so. The versioned loc1, loc2 and locs have the wrong addresses. |
| 71 |
After the fix, we got |
| 72 |
|
| 73 |
$ readelf -sW libc.so | grep "loc[12s]" |
| 74 |
6570: 000000000039e3b8 8 OBJECT GLOBAL DEFAULT 34 locs@GLIBC_2.2.5 |
| 75 |
7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1@GLIBC_2.2.5 |
| 76 |
7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2@GLIBC_2.2.5 |
| 77 |
|
| 78 |
[BZ #21666] |
| 79 |
* misc/regexp.c (loc1): Add __attribute__ ((nocommon)); |
| 80 |
(loc2): Likewise. |
| 81 |
(locs): Likewise. |
| 82 |
--- |
| 83 |
ChangeLog | 7 +++++++ |
| 84 |
misc/regexp.c | 9 +++++---- |
| 85 |
2 files changed, 12 insertions(+), 4 deletions(-) |
| 86 |
|
| 87 |
diff --git a/misc/regexp.c b/misc/regexp.c |
| 88 |
index 19d76c0c37..eaea7c3b89 100644 |
| 89 |
--- a/misc/regexp.c |
| 90 |
+++ b/misc/regexp.c |
| 91 |
@@ -29,14 +29,15 @@ |
| 92 |
|
| 93 |
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23) |
| 94 |
|
| 95 |
-/* Define the variables used for the interface. */ |
| 96 |
-char *loc1; |
| 97 |
-char *loc2; |
| 98 |
+/* Define the variables used for the interface. Avoid .symver on common |
| 99 |
+ symbol, which just creates a new common symbol, not an alias. */ |
| 100 |
+char *loc1 __attribute__ ((nocommon)); |
| 101 |
+char *loc2 __attribute__ ((nocommon)); |
| 102 |
compat_symbol (libc, loc1, loc1, GLIBC_2_0); |
| 103 |
compat_symbol (libc, loc2, loc2, GLIBC_2_0); |
| 104 |
|
| 105 |
/* Although we do not support the use we define this variable as well. */ |
| 106 |
-char *locs; |
| 107 |
+char *locs __attribute__ ((nocommon)); |
| 108 |
compat_symbol (libc, locs, locs, GLIBC_2_0); |
| 109 |
|
| 110 |
|
| 111 |
-- |
| 112 |
2.14.1 |
Archives