This repository has been archived by the owner on May 20, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 246
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
re-add DT_HASH to glibc shared objects removed in 2.36
An anti cheat tool from EPIC still relies on DT_HASH. This is supposed to give upstream some time to adapt to DT_GNU_HASH. git-svn-id: file:///srv/repos/svn-packages/svn@452589 eb2447ed-0c53-47e4-bac8-5bc4a241df78
- Loading branch information
freswa
authored and
svntogit
committed
Aug 11, 2022
1 parent
19538cb
commit e1d69d8
Showing
2 changed files
with
153 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| From e47de5cb2d4dbecb58f569ed241e8e95c568f03c Mon Sep 17 00:00:00 2001 | ||
| From: Florian Weimer <fweimer@redhat.com> | ||
| Date: Fri, 29 Apr 2022 16:37:51 +0200 | ||
| Subject: [PATCH] Do not use --hash-style=both for building glibc shared | ||
| objects | ||
|
|
||
| The comment indicates that --hash-style=both was used to maintain | ||
| compatibility with static dlopen, but we had many internal ABI | ||
| changes since then, so this compatiblity does not add value anymore. | ||
|
|
||
| Reviewed-by: Carlos O'Donell <carlos@redhat.com> | ||
| --- | ||
| Makeconfig | 9 +++++++++ | ||
| Makerules | 7 +++++++ | ||
| config.make.in | 1 + | ||
| configure | 28 ++++++++++++++++++++++++++++ | ||
| configure.ac | 16 ++++++++++++++++ | ||
| 5 files changed, 61 insertions(+) | ||
|
|
||
| diff --git b/Makeconfig a/Makeconfig | ||
| index 760f14e92f..0aa5fb0099 100644 | ||
| --- b/Makeconfig | ||
| +++ a/Makeconfig | ||
| @@ -362,6 +362,15 @@ relro-LDFLAGS = -Wl,-z,relro | ||
| LDFLAGS.so += $(relro-LDFLAGS) | ||
| LDFLAGS-rtld += $(relro-LDFLAGS) | ||
|
|
||
| +ifeq (yes,$(have-hash-style)) | ||
| +# For the time being we unconditionally use 'both'. At some time we | ||
| +# should declare statically linked code as 'out of luck' and compile | ||
| +# with --hash-style=gnu only. | ||
| +hashstyle-LDFLAGS = -Wl,--hash-style=both | ||
| +LDFLAGS.so += $(hashstyle-LDFLAGS) | ||
| +LDFLAGS-rtld += $(hashstyle-LDFLAGS) | ||
| +endif | ||
| + | ||
| ifeq (no,$(build-pie-default)) | ||
| pie-default = $(no-pie-ccflag) | ||
| else # build-pie-default | ||
| diff --git b/Makerules a/Makerules | ||
| index 354528b8c7..428464f092 100644 | ||
| --- b/Makerules | ||
| +++ a/Makerules | ||
| @@ -557,6 +557,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules | ||
| -Wl,--verbose 2>/dev/null | \ | ||
| sed > $@T \ | ||
| -e '/^=========/,/^=========/!d;/^=========/d' \ | ||
| + $(if $(filter yes,$(have-hash-style)), \ | ||
| + -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ | ||
| + -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ | ||
| + -e '/DATA_SEGMENT_ALIGN/{H;g}' \ | ||
| + , \ | ||
| + -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ | ||
| + ) \ | ||
| -e 's/^.*\*(\.dynbss).*$$/& \ | ||
| PROVIDE(__start___libc_freeres_ptrs = .); \ | ||
| *(__libc_freeres_ptrs) \ | ||
| diff --git b/config.make.in a/config.make.in | ||
| index fff4c78dd0..bf728c71c0 100644 | ||
| --- b/config.make.in | ||
| +++ a/config.make.in | ||
| @@ -70,6 +70,7 @@ have-libcap = @have_libcap@ | ||
| have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ | ||
| fno-unit-at-a-time = @fno_unit_at_a_time@ | ||
| bind-now = @bindnow@ | ||
| +have-hash-style = @libc_cv_hashstyle@ | ||
| use-default-link = @use_default_link@ | ||
| have-cxx-thread_local = @libc_cv_cxx_thread_local@ | ||
| have-loop-to-function = @libc_cv_cc_loop_to_function@ | ||
| diff --git b/configure a/configure | ||
| index 716dc041b6..5a730dc5fc 100755 | ||
| --- b/configure | ||
| +++ a/configure | ||
| @@ -622,6 +622,7 @@ libc_cv_cc_nofma | ||
| libc_cv_mtls_dialect_gnu2 | ||
| fno_unit_at_a_time | ||
| libc_cv_has_glob_dat | ||
| +libc_cv_hashstyle | ||
| libc_cv_fpie | ||
| libc_cv_z_execstack | ||
| ASFLAGS_config | ||
| @@ -6193,6 +6194,33 @@ $as_echo "$libc_cv_fpie" >&6; } | ||
|
|
||
|
|
||
|
|
||
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5 | ||
| +$as_echo_n "checking for --hash-style option... " >&6; } | ||
| +if ${libc_cv_hashstyle+:} false; then : | ||
| + $as_echo_n "(cached) " >&6 | ||
| +else | ||
| + cat > conftest.c <<EOF | ||
| +int _start (void) { return 42; } | ||
| +EOF | ||
| +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp | ||
| + -fPIC -shared -o conftest.so conftest.c | ||
| + -Wl,--hash-style=both -nostdlib 1>&5' | ||
| + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 | ||
| + (eval $ac_try) 2>&5 | ||
| + ac_status=$? | ||
| + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
| + test $ac_status = 0; }; } | ||
| +then | ||
| + libc_cv_hashstyle=yes | ||
| +else | ||
| + libc_cv_hashstyle=no | ||
| +fi | ||
| +rm -f conftest* | ||
| +fi | ||
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hashstyle" >&5 | ||
| +$as_echo "$libc_cv_hashstyle" >&6; } | ||
| + | ||
| + | ||
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 | ||
| $as_echo_n "checking for GLOB_DAT reloc... " >&6; } | ||
| if ${libc_cv_has_glob_dat+:} false; then : | ||
| diff --git b/configure.ac a/configure.ac | ||
| index d08ad4d64e..a045f6608e 100644 | ||
| --- b/configure.ac | ||
| +++ a/configure.ac | ||
| @@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no]) | ||
|
|
||
| AC_SUBST(libc_cv_fpie) | ||
|
|
||
| +AC_CACHE_CHECK(for --hash-style option, | ||
| + libc_cv_hashstyle, [dnl | ||
| +cat > conftest.c <<EOF | ||
| +int _start (void) { return 42; } | ||
| +EOF | ||
| +if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp | ||
| + -fPIC -shared -o conftest.so conftest.c | ||
| + -Wl,--hash-style=both -nostdlib 1>&AS_MESSAGE_LOG_FD]) | ||
| +then | ||
| + libc_cv_hashstyle=yes | ||
| +else | ||
| + libc_cv_hashstyle=no | ||
| +fi | ||
| +rm -f conftest*]) | ||
| +AC_SUBST(libc_cv_hashstyle) | ||
| + | ||
| AC_CACHE_CHECK(for GLOB_DAT reloc, | ||
| libc_cv_has_glob_dat, [dnl | ||
| cat > conftest.c <<EOF | ||
| -- | ||
| 2.37.1 | ||
|
|
e1d69d8There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍