From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 76EFD385C6EE; Tue, 2 Apr 2024 16:00:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76EFD385C6EE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712073607; bh=SDNGQRgb7WzhYb668gdmgCgMB2tKbXDrCG7zMqj4wt8=; h=From:To:Subject:Date:From; b=Oqtj++/hbeERUDqaZqsQyIVRwJ4X8jG9upncG8GtbqajvOyN/Szlj4kbFT8Gmh6Fc wZRy855s3n+olv6Mb8P/jTkgnSWUKa3LK8Z1HyB/niKKkKU8eTKV97D97zX/x/sQ5V up65KYargZYG8xrI4ddpFlBxO5uzkr/zB54pVGig= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] i686: Do not build ifunc tests if compiler does not generate supported relocations X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 38831688eaebab0bce550d1a40fc20c8961c7d7e X-Git-Newrev: e7b63f40c3daa3142e6ab60883b75140ac451367 Message-Id: <20240402160007.76EFD385C6EE@sourceware.org> Date: Tue, 2 Apr 2024 16:00:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e7b63f40c3daa3142e6ab60883b75140ac451367 commit e7b63f40c3daa3142e6ab60883b75140ac451367 Author: Adhemerval Zanella Date: Tue Aug 22 16:27:15 2023 -0300 i686: Do not build ifunc tests if compiler does not generate supported relocations clang with --target i668 might not produce supported relocations that ld.bfd can use for -static-pie without -fPIC, which are used on some tests. Disable them for now. Diff: --- aclocal.m4 | 6 +++--- configure | 4 ++++ configure.ac | 3 +++ elf/Makefile | 18 +++++++++++++++--- sysdeps/i386/configure | 31 +++++++++++++++++++++++++++++++ sysdeps/i386/configure.ac | 15 +++++++++++++++ 6 files changed, 71 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a097d66a49..25735e4881 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -148,7 +148,7 @@ AC_SUBST(NM) ]) dnl Run a static link test with -nostdlib -nostartfiles. -dnl LIBC_TRY_LINK_STATIC([code], [action-if-true], [action-if-false]) +dnl LIBC_TRY_LINK_STATIC([code], [opts], [action-if-true], [action-if-false]) AC_DEFUN([LIBC_TRY_LINK_STATIC], [cat > conftest.c <&AS_MESSAGE_LOG_FD])], - [$2], [$3]) + [$3], [$4]) rm -f conftest*]) dnl Test a compiler option or options with an empty input file. diff --git a/configure b/configure index c01ae25e90..a7a649eb5b 100755 --- a/configure +++ b/configure @@ -8002,6 +8002,7 @@ libc_cv_localstatedir=$localstatedir libc_cv_gcc_unwind_find_fde=no libc_cv_idn=no pthread_in_libc=yes +libc_cv_ifunc_static_pie=yes # Iterate over all the sysdep directories we will use, running their # configure fragments. @@ -8017,6 +8018,9 @@ printf "%s\n" "running configure fragment for $dir" >&6; } fi done +config_vars="$config_vars +ifunc-static-pie = $libc_cv_ifunc_static_pie" + if test x"$build_mathvec" = xnotset; then build_mathvec=no fi diff --git a/configure.ac b/configure.ac index 826d55de64..2b2e2f4927 100644 --- a/configure.ac +++ b/configure.ac @@ -1761,6 +1761,7 @@ libc_cv_localstatedir=$localstatedir libc_cv_gcc_unwind_find_fde=no libc_cv_idn=no pthread_in_libc=yes +libc_cv_ifunc_static_pie=yes # Iterate over all the sysdep directories we will use, running their # configure fragments. @@ -1775,6 +1776,8 @@ for dir in $sysnames; do fi done +LIBC_CONFIG_VAR([ifunc-static-pie], [$libc_cv_ifunc_static_pie]) + if test x"$build_mathvec" = xnotset; then build_mathvec=no fi diff --git a/elf/Makefile b/elf/Makefile index d1e4df03c1..c271095eb7 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1054,16 +1054,20 @@ tests += $(tests-static) ifeq (yes,$(have-ifunc)) tests-ifuncstatic := \ ifuncmain1picstatic \ - ifuncmain1static \ ifuncmain2picstatic \ ifuncmain2static \ ifuncmain4picstatic \ - ifuncmain4static \ ifuncmain5picstatic \ ifuncmain5static \ + # tests-ifuncstatic +ifeq (yes,$(ifunc-static-pie)) +tests-ifuncstatic += \ + ifuncmain1static \ + ifuncmain4static \ ifuncmain7picstatic \ ifuncmain7static \ # tests-ifuncstatic +endif ifeq (yes,$(have-gcc-ifunc)) tests-ifuncstatic += ifuncmain9static ifuncmain9picstatic endif @@ -1083,11 +1087,15 @@ tests-internal += \ ifuncmain2 \ ifuncmain2pic \ ifuncmain3 \ - ifuncmain4 \ ifuncmain5staticpic \ + # tests-internal +ifeq (yes,$(ifunc-static-pie)) +tests-internal += \ + ifuncmain4 \ ifuncmain7 \ ifuncmain7pic \ # tests-internal +endif ifeq (no,$(with-lld)) tests-internal += \ ifuncmain1 \ @@ -1116,9 +1124,13 @@ ifunc-pie-tests = \ ifuncmain1pie \ ifuncmain1staticpie \ ifuncmain1vispie \ + # ifunc-pie-tests +ifeq (yes,$(ifunc-static-pie)) +ifunc-pie-tests += \ ifuncmain6pie \ ifuncmain7pie \ # ifunc-pie-tests +endif ifeq (yes,$(have-gcc-ifunc)) ifunc-pie-tests += ifuncmain9pie endif diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index 84656cef6e..d10a9b6fd0 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -89,6 +89,37 @@ printf "%s\n" "$libc_cv_ld_static_pie" >&6; } fi fi +if test "$libc_cv_static_pie" == "yes"; then + cat > conftest.c <&5 + (eval $ac_try) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + libc_cv_ifunc_static_pie=yes +else $as_nop + libc_cv_ifunc_static_pie=no +fi +rm -f conftest* +fi + if test x"$multi_arch" != xno; then printf "%s\n" "#define NO_HIDDEN_EXTERN_FUNC_IN_PIE 1" >>confdefs.h diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac index 7f68e6210a..d61ab42927 100644 --- a/sysdeps/i386/configure.ac +++ b/sysdeps/i386/configure.ac @@ -58,6 +58,21 @@ rm -f conftest*]) fi fi +if test "$libc_cv_static_pie" == "yes"; then + LIBC_TRY_LINK_STATIC([dnl +int foo (void) __attribute__ ((ifunc ("foo_ifunc"))); +void * +foo_ifunc (void) +{ + return 0; +} +int main (void) +{ + return foo (); +}], + [-fPIE -static-pie], libc_cv_ifunc_static_pie=yes, libc_cv_ifunc_static_pie=no) +fi + dnl When multi-arch is enabled, all external functions must be called dnl via PIC PLT in PIE, which requires setting up EBX register. if test x"$multi_arch" != xno; then