diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch | 37 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
3 files changed, 17 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = glibc-git pkgdesc = GNU C Library - pkgver = 2.28.r100.g5abedf97a3 + pkgver = 2.28.r164.g81dca813cc pkgrel = 1 url = https://www.gnu.org/software/libc/ install = glibc-git.install @@ -25,7 +25,7 @@ pkgbase = glibc-git source = bz20338.patch sha256sums = SKIP sha256sums = 05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de - sha256sums = 3b764c4e5658486d1f9e98a36043eb51705c4eebc9abe3f9edc5049dd5dcdc47 + sha256sums = dd717ee59e778d808545f4f3f3f436bfc678a2d3937589d649b70767025e7e1e sha256sums = 959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a pkgname = glibc-git diff --git a/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch b/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch index 251cdf160927..15f8b73c3958 100644 --- a/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch +++ b/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch @@ -1,55 +1,44 @@ -From ef9302f7608a62980ad850596dc8bfd40346a8e7 Mon Sep 17 00:00:00 2001 +From 098e7db144012cbd19d359df3847461dc0c58514 Mon Sep 17 00:00:00 2001 From: Eli Schwartz <eschwartz@archlinux.org> -Date: Wed, 8 Aug 2018 21:02:26 +0000 +Date: Fri, 28 Sep 2018 05:19:46 +0000 Subject: [PATCH] Revert "elf: Correct absolute (SHN_ABS) symbol run-time calculation [BZ #19818]" This reverts commit e7feec374c635b6a29d65c39ae5e1855528fed39. --- - elf/Makefile | 8 ++------ + elf/Makefile | 4 ++-- elf/dl-addr.c | 2 -- elf/tst-absolute-sym-lib.c | 25 ------------------------ elf/tst-absolute-sym-lib.lds | 19 ------------------ elf/tst-absolute-sym.c | 38 ------------------------------------ sysdeps/generic/ldsodefs.h | 3 +-- - 6 files changed, 3 insertions(+), 92 deletions(-) + 6 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 elf/tst-absolute-sym-lib.c delete mode 100644 elf/tst-absolute-sym-lib.lds delete mode 100644 elf/tst-absolute-sym.c diff --git a/elf/Makefile b/elf/Makefile -index cd0771307f..f7484a81ef 100644 +index 455ec730fc..4560718fe2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -186,7 +186,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \ tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error tst-noload \ tst-latepthread tst-tls-manydynamic tst-nodelete-dlclose \ -- tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note -+ tst-debug1 tst-main1 tst-absolute-zero tst-big-note +- tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note \ ++ tst-debug1 tst-main1 tst-absolute-zero tst-big-note \ + tst-unwind-ctor # reldep9 tests-internal += loadtest unload unload2 circleload1 \ - neededtest neededtest2 neededtest3 neededtest4 \ -@@ -272,7 +272,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ +@@ -273,7 +273,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-audit12mod1 tst-audit12mod2 tst-audit12mod3 tst-auditmod12 \ tst-latepthreadmod $(tst-tls-many-dynamic-modules) \ tst-nodelete-dlclose-dso tst-nodelete-dlclose-plugin \ - tst-main1mod tst-libc_dlvsym-dso tst-absolute-sym-lib \ + tst-main1mod tst-libc_dlvsym-dso \ - tst-absolute-zero-lib tst-big-note-lib - - ifeq (yes,$(have-mtls-dialect-gnu2)) -@@ -1465,10 +1465,6 @@ tst-main1-no-pie = yes - LDLIBS-tst-main1 = $(libsupport) - tst-main1mod.so-no-z-defs = yes - --LDLIBS-tst-absolute-sym-lib.so = tst-absolute-sym-lib.lds --$(objpfx)tst-absolute-sym-lib.so: $(LDLIBS-tst-absolute-sym-lib.so) --$(objpfx)tst-absolute-sym: $(objpfx)tst-absolute-sym-lib.so -- - LDLIBS-tst-absolute-zero-lib.so = tst-absolute-zero-lib.lds - $(objpfx)tst-absolute-zero-lib.so: $(LDLIBS-tst-absolute-zero-lib.so) - $(objpfx)tst-absolute-zero: $(objpfx)tst-absolute-zero-lib.so + tst-absolute-zero-lib tst-big-note-lib tst-unwind-ctor-lib + # Most modules build with _ISOMAC defined, but those filtered out + # depend on internal headers. diff --git a/elf/dl-addr.c b/elf/dl-addr.c index e6c7d02094..2250617a73 100644 --- a/elf/dl-addr.c @@ -185,5 +174,5 @@ index 95dc87519b..3cac4fa362 100644 /* On some architectures a pointer to a function is not just a pointer to the actual code of the function but rather an architecture -- -2.18.0 +2.19.0 @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=glibc-git -pkgver=2.28.r100.g5abedf97a3 +pkgver=2.28.r164.g81dca813cc pkgrel=1 pkgdesc='GNU C Library' arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ source=('git+https://sourceware.org/git/glibc.git' 'bz20338.patch') sha256sums=('SKIP' '05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de' - '3b764c4e5658486d1f9e98a36043eb51705c4eebc9abe3f9edc5049dd5dcdc47' + 'dd717ee59e778d808545f4f3f3f436bfc678a2d3937589d649b70767025e7e1e' '959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a') pkgver() { |