From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id B09CE3857831; Wed, 4 May 2022 06:02:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B09CE3857831 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/nsz/bug23293] Do not use --hash-style=both for building glibc shared objects X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/nsz/bug23293 X-Git-Oldrev: 5b5b1012d579bfb38e11cea3767bec06554c0063 X-Git-Newrev: e47de5cb2d4dbecb58f569ed241e8e95c568f03c Message-Id: <20220504060233.B09CE3857831@sourceware.org> Date: Wed, 4 May 2022 06:02:33 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2022 06:02:33 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e47de5cb2d4dbecb58f569ed241e8e95c568f03c commit e47de5cb2d4dbecb58f569ed241e8e95c568f03c Author: Florian Weimer Date: Fri Apr 29 16:37:51 2022 +0200 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 Diff: --- Makeconfig | 9 --------- Makerules | 7 ------- config.make.in | 1 - configure | 28 ---------------------------- configure.ac | 16 ---------------- 5 files changed, 61 deletions(-) diff --git a/Makeconfig b/Makeconfig index 0aa5fb0099..760f14e92f 100644 --- a/Makeconfig +++ b/Makeconfig @@ -362,15 +362,6 @@ 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 a/Makerules b/Makerules index 428464f092..354528b8c7 100644 --- a/Makerules +++ b/Makerules @@ -557,13 +557,6 @@ $(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 a/config.make.in b/config.make.in index bf728c71c0..fff4c78dd0 100644 --- a/config.make.in +++ b/config.make.in @@ -70,7 +70,6 @@ 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 a/configure b/configure index 5a730dc5fc..716dc041b6 100755 --- a/configure +++ b/configure @@ -622,7 +622,6 @@ 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 @@ -6194,33 +6193,6 @@ $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 <&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 a/configure.ac b/configure.ac index a045f6608e..d08ad4d64e 100644 --- a/configure.ac +++ b/configure.ac @@ -1360,22 +1360,6 @@ 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 <&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 <