From patchwork Tue Aug 10 21:15:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mail Delivery System X-Patchwork-Id: 44634 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2A98C3886C76 for ; Tue, 10 Aug 2021 21:16:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A98C3886C76 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1628630186; bh=CsRTUWpBARc9lqT4biunuaUsC+lT2h5gbCG1o6nSjuI=; h=Date:From:Subject:To:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=K6jWV8zLwuCD600PYk5Qd6jaLPXs117s1MFDYt6usxRQ3QrvujSS7fKxlB3R6Nj7q q8nkySiRvGQDo4KgyTw8REPOlFL124WwekA2AF4iqRJJgeqb/8nqSYNvyByfmZTFMg /8Uq8LZ+eASvasWhInC9iGu6Qgfw5qHWFLA2UiIc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from fx408.security-mail.net (smtpout140.security-mail.net [85.31.212.148]) by sourceware.org (Postfix) with ESMTPS id DA0CA396E43D for ; Tue, 10 Aug 2021 21:15:35 +0000 (GMT) Authentication-Results: sourceware.org; dkim=permerror (bad message/signature format) Received: by fx408.security-mail.net (Postfix) id 1EE721B7B181; Tue, 10 Aug 2021 23:15:35 +0200 (CEST) Date: Tue, 10 Aug 2021 23:15:35 +0200 (CEST) From: MAILER-DAEMON@sourceware.org (Mail Delivery System) Subject: Undelivered Mail Returned to Sender To: libc-alpha@sourceware.org Auto-Submitted: auto-replied MIME-Version: 1.0 Message-Id: <20210810211535.1EE721B7B181@fx408.security-mail.net> X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, HTML_MESSAGE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is the mail system at host fx408.security-mail.net. I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below. For further assistance, please send mail to postmaster. If you do so, please include this problem report. You can delete your own text from the attached returned message. The mail system : host zimbra2.kalray.eu[195.135.97.26] said: 550 5.1.1 : Recipient address rejected: User unknown in virtual mailbox table (in reply to RCPT TO command) On 2021-08-10, Fangrui Song wrote: >TLSDESC is the default on aarch64. Clang doesn't support >-mtls-dialect=trad. Its integrated assembler doesn't support the >marker. LLD's doesn't support R_AARCH64_TLSGD_*/R_AARCH64_TLSLD_* >relocations. Just skip the tests. > >With https://sourceware.org/pipermail/libc-alpha/2021-August/129966.html >("aarch64: Make elf_machine_{load_address, dynamic} robust [BZ #28203]"), >if we allow LLD in configure.ac, >`make check` test results of LLD are on par with GNU ld. I messed up in the diff. The correct diff needs `#include ` to make HAVE_TRAD_TLS defined. --- config.h.in | 3 +++ elf/tst-tls1.c | 8 ++++++-- elf/tst-tls2.c | 7 +++++-- elf/tst-tls3.c | 9 +++++---- elf/tst-tlsmod1.c | 7 +++++-- elf/tst-tlsmod2.c | 5 ++++- elf/tst-tlsmod3.c | 6 +++++- elf/tst-tlsmod4.c | 5 ++++- sysdeps/aarch64/configure | 30 ++++++++++++++++++++++++++++++ sysdeps/aarch64/configure.ac | 18 ++++++++++++++++++ 10 files changed, 85 insertions(+), 13 deletions(-) diff --git a/config.h.in b/config.h.in index 0d92504f65..7dcce4d3a4 100644 --- a/config.h.in +++ b/config.h.in @@ -198,6 +198,9 @@ /* Define if CC supports attribute retain. */ #undef HAVE_GNU_RETAIN +/* Define if CC and LD support traditional TLS GD/LD models. */ +#define HAVE_TRAD_TLS 1 + /* Define to 1 if the assembler needs intermediate aliases to define multiple symbol versions for one symbol. */ #define SYMVER_NEEDS_ALIAS 0 diff --git a/elf/tst-tls1.c b/elf/tst-tls1.c index c31da56ce9..1f102b62b7 100644 --- a/elf/tst-tls1.c +++ b/elf/tst-tls1.c @@ -1,4 +1,5 @@ /* glibc test for TLS in ld.so. */ +#include #include #include "tls-macros.h" @@ -39,7 +40,8 @@ do_test (void) result = 1; } - + /* Clang and LLD do not support traditional GD/LD TLS on aarch64. */ +#if HAVE_TRAD_TLS /* Get variables using local dynamic model. */ fputs ("get sum of foo and bar (LD)", stdout); ap = TLS_LD (foo); @@ -56,8 +58,9 @@ do_test (void) printf ("bar = %d\n", *bp); result = 1; } +#endif - +#if HAVE_TRAD_TLS /* Get variables using generic dynamic model. */ fputs ("get sum of foo and bar (GD)", stdout); ap = TLS_GD (foo); @@ -74,6 +77,7 @@ do_test (void) printf ("bar = %d\n", *bp); result = 1; } +#endif return result; } diff --git a/elf/tst-tls2.c b/elf/tst-tls2.c index 963b8d6c88..46e69b049b 100644 --- a/elf/tst-tls2.c +++ b/elf/tst-tls2.c @@ -1,4 +1,5 @@ /* glibc test for TLS in ld.so. */ +#include #include #include "tls-macros.h" @@ -39,7 +40,7 @@ do_test (void) result = 1; } - +#if HAVE_TRAD_TLS /* Get variables using local dynamic model. */ fputs ("get sum of foo and bar (LD)", stdout); ap = TLS_LD (foo); @@ -56,8 +57,9 @@ do_test (void) printf ("bar = %d\n", *bp); result = 1; } +#endif - +#if HAVE_TRAD_TLS /* Get variables using generic dynamic model. */ fputs ("get sum of foo and bar (GD)", stdout); ap = TLS_GD (foo); @@ -74,6 +76,7 @@ do_test (void) printf ("bar = %d\n", *bp); result = 1; } +#endif return result; } diff --git a/elf/tst-tls3.c b/elf/tst-tls3.c index 7e0abb4c58..4abdec2857 100644 --- a/elf/tst-tls3.c +++ b/elf/tst-tls3.c @@ -1,4 +1,5 @@ /* glibc test for TLS in ld.so. */ +#include #include #include "tls-macros.h" @@ -17,8 +18,7 @@ static int do_test (void) { int result = 0; - int *ap, *bp, *cp; - + int *ap, *bp; /* Set the variable using the local exec model. */ puts ("set baz to 3 (LE)"); @@ -33,7 +33,8 @@ do_test (void) bp = TLS_IE (bar); *bp = 2; - +#if HAVE_TRAD_TLS + int *cp; /* Get variables using local dynamic model. */ fputs ("get sum of foo, bar (GD) and baz (LD)", stdout); ap = TLS_GD (foo); @@ -56,7 +57,7 @@ do_test (void) printf ("baz = %d\n", *cp); result = 1; } - +#endif result |= in_dso (); diff --git a/elf/tst-tlsmod1.c b/elf/tst-tlsmod1.c index 8d9156791b..94346415c3 100644 --- a/elf/tst-tlsmod1.c +++ b/elf/tst-tlsmod1.c @@ -1,3 +1,4 @@ +#include #include #include "tls-macros.h" @@ -14,7 +15,7 @@ int in_dso (void) { int result = 0; - int *ap, *bp, *cp; + int *ap, *bp; /* Get variables using initial exec model. */ fputs ("get sum of foo and bar (IE)", stdout); @@ -34,7 +35,8 @@ in_dso (void) result = 1; } - +#if HAVE_TRAD_TLS + int *cp; /* Get variables using generic dynamic model. */ fputs ("get sum of foo and bar and baz (GD)", stdout); ap = TLS_GD (foo); @@ -57,6 +59,7 @@ in_dso (void) printf ("baz = %d\n", *cp); result = 1; } +#endif return result; } diff --git a/elf/tst-tlsmod2.c b/elf/tst-tlsmod2.c index 40eb1407f8..8028237155 100644 --- a/elf/tst-tlsmod2.c +++ b/elf/tst-tlsmod2.c @@ -1,3 +1,4 @@ +#include #include #include "tls-macros.h" @@ -9,9 +10,10 @@ COMMON_INT_DEF(foo); int in_dso (int n, int *caller_foop) { - int *foop; int result = 0; +#if HAVE_TRAD_TLS + int *foop; puts ("foo"); /* Make sure PLT is used before macros. */ asm ("" ::: "memory"); @@ -29,6 +31,7 @@ in_dso (int n, int *caller_foop) } *foop = 16; +#endif return result; } diff --git a/elf/tst-tlsmod3.c b/elf/tst-tlsmod3.c index 6d186c47ee..d001778247 100644 --- a/elf/tst-tlsmod3.c +++ b/elf/tst-tlsmod3.c @@ -1,3 +1,4 @@ +#include #include #include "tls-macros.h" @@ -12,8 +13,10 @@ COMMON_INT_DEF(comm_n); int in_dso2 (void) { - int *foop; int result = 0; + +#if HAVE_TRAD_TLS + int *foop; static int n; int *np; @@ -32,6 +35,7 @@ in_dso2 (void) result |= in_dso (*foop = 42 + n++, foop); *foop = 16; +#endif return result; } diff --git a/elf/tst-tlsmod4.c b/elf/tst-tlsmod4.c index 86889aac7e..a31c163ca6 100644 --- a/elf/tst-tlsmod4.c +++ b/elf/tst-tlsmod4.c @@ -1,3 +1,4 @@ +#include #include #include "tls-macros.h" @@ -9,9 +10,10 @@ COMMON_INT_DEF(baz); int in_dso (int n, int *caller_bazp) { - int *bazp; int result = 0; +#if HAVE_TRAD_TLS + int *bazp; puts ("foo"); /* Make sure PLT is used before macros. */ asm ("" ::: "memory"); @@ -29,6 +31,7 @@ in_dso (int n, int *caller_bazp) } *bazp = 16; +#endif return result; } diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure index 4c1fac49f3..eb62e68010 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -332,3 +332,33 @@ if test $libc_cv_aarch64_sve_asm = yes; then $as_echo "#define HAVE_AARCH64_SVE_ASM 1" >>confdefs.h fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mtls-dialect=trad" >&5 +$as_echo_n "checking for -mtls-dialect=trad... " >&6; } +if ${libc_cv_aarch64_trad_tls+:} 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_aarch64_trad_tls=yes + else + libc_cv_aarch64_trad_tls=no + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_aarch64_trad_tls" >&5 +$as_echo "$libc_cv_aarch64_trad_tls" >&6; } +if test $libc_cv_aarch64_trad_tls = no; then + $as_echo "#define HAVE_TRAD_TLS 0" >>confdefs.h + +fi diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac index 3347c13fa1..6d3b412acc 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -105,3 +105,21 @@ rm -f conftest*]) if test $libc_cv_aarch64_sve_asm = yes; then AC_DEFINE(HAVE_AARCH64_SVE_ASM) fi + +# Check if both CC and LD support traditional TLS GD/LD models. +AC_CACHE_CHECK([for -mtls-dialect=trad], libc_cv_aarch64_trad_tls, [dnl +cat > conftest.c <