wok-current annotate glibc/stuff/glibc-2.23-gcc.patch @ rev 25728

Merge wok for both arch and few updates
author Stanislas Leduc <shann@slitaz.org>
date Thu Dec 05 08:39:45 2024 +0000 (9 months ago)
parents
children
rev   line source
shann@25629 1 From bc566388d68eb631a6ff0408d57a78d0a2781025 Mon Sep 17 00:00:00 2001
shann@25629 2 From: "H.J. Lu" <hjl.tools@gmail.com>
shann@25629 3 Date: Thu, 19 Oct 2017 08:42:59 -0700
shann@25629 4 Subject: [PATCH] Avoid .symver on common symbols [BZ #21666]
shann@25629 5
shann@25629 6 The .symver directive on common symbol just creates a new common symbol,
shann@25629 7 not an alias and the newer assembler with the bug fix for
shann@25629 8
shann@25629 9 https://sourceware.org/bugzilla/show_bug.cgi?id=21661
shann@25629 10
shann@25629 11 will issue an error. Before the fix, we got
shann@25629 12
shann@25629 13 $ readelf -sW libc.so | grep "loc[12s]"
shann@25629 14 5109: 00000000003a0608 8 OBJECT LOCAL DEFAULT 36 loc1
shann@25629 15 5188: 00000000003a0610 8 OBJECT LOCAL DEFAULT 36 loc2
shann@25629 16 5455: 00000000003a0618 8 OBJECT LOCAL DEFAULT 36 locs
shann@25629 17 6575: 00000000003a05f0 8 OBJECT GLOBAL DEFAULT 36 locs@GLIBC_2.2.5
shann@25629 18 7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1@GLIBC_2.2.5
shann@25629 19 7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2@GLIBC_2.2.5
shann@25629 20
shann@25629 21 in libc.so. The versioned loc1, loc2 and locs have the wrong addresses.
shann@25629 22 After the fix, we got
shann@25629 23
shann@25629 24 $ readelf -sW libc.so | grep "loc[12s]"
shann@25629 25 6570: 000000000039e3b8 8 OBJECT GLOBAL DEFAULT 34 locs@GLIBC_2.2.5
shann@25629 26 7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1@GLIBC_2.2.5
shann@25629 27 7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2@GLIBC_2.2.5
shann@25629 28
shann@25629 29 [BZ #21666]
shann@25629 30 * misc/regexp.c (loc1): Add __attribute__ ((nocommon));
shann@25629 31 (loc2): Likewise.
shann@25629 32 (locs): Likewise.
shann@25629 33
shann@25629 34 (cherry picked from commit 388b4f1a02f3a801965028bbfcd48d905638b797)
shann@25629 35 ---
shann@25629 36 ChangeLog | 7 +++++++
shann@25629 37 misc/regexp.c | 9 +++++----
shann@25629 38 2 files changed, 12 insertions(+), 4 deletions(-)
shann@25629 39
shann@25629 40 diff --git a/ChangeLog b/ChangeLog
shann@25629 41 index 697bffd99e..def4183de3 100644
shann@25629 42 --- a/ChangeLog
shann@25629 43 +++ b/ChangeLog
shann@25629 44 @@ -1,3 +1,10 @@
shann@25629 45 +2017-10-19 H.J. Lu <hongjiu.lu@intel.com>
shann@25629 46 +
shann@25629 47 + [BZ #21666]
shann@25629 48 + * misc/regexp.c (loc1): Add __attribute__ ((nocommon));
shann@25629 49 + (loc2): Likewise.
shann@25629 50 + (locs): Likewise.
shann@25629 51 +
shann@25629 52 2017-10-19 H.J. Lu <hongjiu.lu@intel.com>
shann@25629 53
shann@25629 54 * sysdeps/x86_64/dl-trampoline.h (_dl_runtime_resolve): Don't
shann@25629 55 diff --git a/misc/regexp.c b/misc/regexp.c
shann@25629 56 index 3b3668272f..b2a2c6e636 100644
shann@25629 57 --- a/misc/regexp.c
shann@25629 58 +++ b/misc/regexp.c
shann@25629 59 @@ -29,14 +29,15 @@
shann@25629 60
shann@25629 61 #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
shann@25629 62
shann@25629 63 -/* Define the variables used for the interface. */
shann@25629 64 -char *loc1;
shann@25629 65 -char *loc2;
shann@25629 66 +/* Define the variables used for the interface. Avoid .symver on common
shann@25629 67 + symbol, which just creates a new common symbol, not an alias. */
shann@25629 68 +char *loc1 __attribute__ ((nocommon));
shann@25629 69 +char *loc2 __attribute__ ((nocommon));
shann@25629 70 compat_symbol (libc, loc1, loc1, GLIBC_2_0);
shann@25629 71 compat_symbol (libc, loc2, loc2, GLIBC_2_0);
shann@25629 72
shann@25629 73 /* Although we do not support the use we define this variable as well. */
shann@25629 74 -char *locs;
shann@25629 75 +char *locs __attribute__ ((nocommon));
shann@25629 76 compat_symbol (libc, locs, locs, GLIBC_2_0);
shann@25629 77
shann@25629 78
shann@25629 79 --
shann@25629 80 2.39.3