Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (decf2aa6364ec3f3e0d8a78cc7f2153a71e5f8bd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (decf2aa6364ec3f3e0d8a78cc7f2153a71e5f8bd)
  • Date: Sat, 29 Jul 2017 17:03:01 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

libs/glibc/HISTORY | 4 +++
libs/glibc/PRE_BUILD | 1
libs/glibc/symver.patch | 63
++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 68 insertions(+)

New commits:
commit decf2aa6364ec3f3e0d8a78cc7f2153a71e5f8bd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/glibc: added a fix to build with current binutils

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index d648ad9..7348be3 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2017-07-29 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, symver.patch: added slightly modified patch from upstream
+ to fix building with binutils 2.29
+
2017-02-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.25, SECURITY_PATCH++, (CVE-2016-6323,
CVE-2015-5180)
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 8a08cfc..d0111e0 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -92,6 +92,7 @@ patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&

patch -p1 <
$SPELL_DIRECTORY/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
&&
patch -p1 < $SPELL_DIRECTORY/glibc-2.20-fhs-1.patch
&&
+patch -p1 < "${SPELL_DIRECTORY}/symver.patch"
&&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/symver.patch b/libs/glibc/symver.patch
new file mode 100644
index 0000000..8c0b421
--- /dev/null
+++ b/libs/glibc/symver.patch
@@ -0,0 +1,63 @@
+From 388b4f1a02f3a801965028bbfcd48d905638b797 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools AT 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 AT GLIBC_2.2.5
+ 7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1 AT GLIBC_2.2.5
+ 7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2 AT 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 AT GLIBC_2.2.5
+ 7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1 AT GLIBC_2.2.5
+ 7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2 AT GLIBC_2.2.5
+
+ [BZ #21666]
+ * misc/regexp.c (loc1): Add __attribute__ ((nocommon));
+ (loc2): Likewise.
+ (locs): Likewise.
+---
+ misc/regexp.c | 9 +++++----
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/misc/regexp.c b/misc/regexp.c
+index 19d76c0..eaea7c3 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.9.3
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (decf2aa6364ec3f3e0d8a78cc7f2153a71e5f8bd), Pavel Vinogradov, 07/29/2017

Archive powered by MHonArc 2.6.24.

Top of Page