mirror of
https://abf.rosa.ru/djam/glibc.git
synced 2025-02-23 15:02:47 +00:00
118 lines
4.2 KiB
Diff
118 lines
4.2 KiB
Diff
diff -up glibc-2.36/config.make.in.60~ glibc-2.36/config.make.in
|
|
--- glibc-2.36/config.make.in.60~ 2022-08-24 17:40:34.246826821 +0200
|
|
+++ glibc-2.36/config.make.in 2022-08-24 17:41:45.676352975 +0200
|
|
@@ -69,6 +69,7 @@ have-libaudit = @have_libaudit@
|
|
have-libcap = @have_libcap@
|
|
have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
|
|
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 -up glibc-2.36/configure.60~ glibc-2.36/configure
|
|
--- glibc-2.36/configure.60~ 2022-07-30 00:03:09.000000000 +0200
|
|
+++ glibc-2.36/configure 2022-08-24 17:42:09.997531784 +0200
|
|
@@ -621,6 +621,7 @@ libc_cv_cc_submachine
|
|
libc_cv_cc_nofma
|
|
libc_cv_mtls_dialect_gnu2
|
|
libc_cv_has_glob_dat
|
|
+libc_cv_hashstyle
|
|
libc_cv_fpie
|
|
libc_cv_z_execstack
|
|
ASFLAGS_config
|
|
@@ -6192,6 +6193,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 -up glibc-2.36/configure.ac.60~ glibc-2.36/configure.ac
|
|
--- glibc-2.36/configure.ac.60~ 2022-07-30 00:03:09.000000000 +0200
|
|
+++ glibc-2.36/configure.ac 2022-08-24 17:40:34.249826843 +0200
|
|
@@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpi
|
|
|
|
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
|
|
diff -up glibc-2.36/Makeconfig.60~ glibc-2.36/Makeconfig
|
|
--- glibc-2.36/Makeconfig.60~ 2022-08-24 17:40:34.246826821 +0200
|
|
+++ glibc-2.36/Makeconfig 2022-08-24 17:41:18.307151554 +0200
|
|
@@ -365,6 +365,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
|
|
+
|
|
# Linker options to enable and disable DT_RELR.
|
|
ifeq ($(have-dt-relr),yes)
|
|
dt-relr-ldflag = -Wl,-z,pack-relative-relocs
|
|
diff -up glibc-2.36/Makerules.60~ glibc-2.36/Makerules
|
|
--- glibc-2.36/Makerules.60~ 2022-08-24 17:40:34.203826503 +0200
|
|
+++ glibc-2.36/Makerules 2022-08-24 17:40:34.246826821 +0200
|
|
@@ -558,6 +558,13 @@ $(common-objpfx)shlib.lds: $(common-objp
|
|
-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) \
|