From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d]) by sourceware.org (Postfix) with ESMTPS id 40F5E385840C for ; Tue, 12 Mar 2024 16:38:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 40F5E385840C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 40F5E385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::112d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710261538; cv=none; b=Zfrl/ckgViCfNG9tnBtLagdFm8dvTV73GTKenWwFFjNyRtWBKlg6t8PlhA+QxBOd5fa3ez1QEo+fV9seYH6TpwHNU8bVTDAkcFi3u4KuizSHqZqp6hoSkbHSxrERJFE24UTDWbLe42vjm5GXkkPR6TJIJyFb7xlvHQ4+VKzBpXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710261538; c=relaxed/simple; bh=sR3o4+cc8AIE3rqucdbXn+Ogn/OdKjrVWgwQClJByJo=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=aAXkTfU4XC3vil4vkDKA3iDnqsj/SePYO9B2kiBY482uOWfrURyOZgolBKaXn3Lz8XGRo9McTnaGU6TVvA0AKOkRK5KxbQjn4B1t8o8CookPrBYCsPPQh67XFcUDCCuqTGdzDEt1drw89R30s7TcE+bRzOJRzF+WbqU6vM7yfOA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-60a3c48e70fso24155287b3.1 for ; Tue, 12 Mar 2024 09:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710261535; x=1710866335; darn=sourceware.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ueWSLZfqvWaQmIATW541W4pQiWqzeg9WqLK3oEPuDK0=; b=HOPYp+1TFDwlF9AnaxIM3IX+1F2xVNHhIXMUZb2k2JmCPnwXu1D4eHwDi7PEEd/PMF 0v6+adW7W8QzTpW6v46tW88Wn7PhbcUIHwhgMqroMqBXyC/4RBCMCwzEo7wl1DTFQ6J/ AeNHDAlK3rN11vQBqI6JojAns6NxdW6URSKbdWzp1jyN9/8veYTFGwv0MQcshIGB16jV Qz561MGezVQl37TDh3pHdtUS656gl6e1ILibkDbOJbzRiD8I+XTsdyXdBsTv2eT9LT6E 4ZP9oolFx2R5EFNIugRmDlTNVFjHtxhVpkAlOrXu7eW4lUh803X7CJdWaAauYzOccVca zK1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710261535; x=1710866335; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ueWSLZfqvWaQmIATW541W4pQiWqzeg9WqLK3oEPuDK0=; b=HtwvL02TUlMJscrKmEwOwFnckYHHPsOwxAoaxUSSvW62O/geCPzi6BReI44uxysHjn IkCca8gStsz3L8nK9bLvYCjSZwhhK4kIPJOk7N0FwJuTh8jCyDpcH9VFE3hfcW9AVWWg TpwkeIvmYgrIppQYdjqv/Ja7ZiZ6JHgxavyNLnTAUKAIwmXlavMzn9RqE57kfnWNrvlG aAVdYr2HUkmNLyYvyaFfrbtYSTUOWbgd85xKvR+aEFM1gQsjpJxrUijmN9JFNArx2y2q qXKv1PxXJzAGUdhrN2KX83wrieAvL/2bGUKT9GK2KpLvGTSQu7XAaPCN6GLw3rx3o3eh ruYQ== X-Gm-Message-State: AOJu0YwbGxMBVT+Xfv+jiLFHUBjO3DI77AdfYTOTutYgTrh+DRR90+fy 6v4CbLE8aknJiDB0imiebp0Y+7yPekl6Wtktdwb16lqim9rPgXIqhnxBpAyX4xvZVxOBNdjCeW/ 63vLUzbcpuhiFvD20hIsMTGNX4is= X-Google-Smtp-Source: AGHT+IE2CPvdtl+6m/hSwA9i9v0Lg2p6aoTjyyWeGhTXCjxSreRBaldn84EPn/yMPUbGpssYk7Ho/e2aNR+V33YLHGc= X-Received: by 2002:a81:84c7:0:b0:60a:33f4:f3b8 with SMTP id u190-20020a8184c7000000b0060a33f4f3b8mr6426075ywf.38.1710261535388; Tue, 12 Mar 2024 09:38:55 -0700 (PDT) MIME-Version: 1.0 References: <20240312162120.1360522-1-adhemerval.zanella@linaro.org> <20240312162120.1360522-4-adhemerval.zanella@linaro.org> In-Reply-To: <20240312162120.1360522-4-adhemerval.zanella@linaro.org> From: "H.J. Lu" Date: Tue, 12 Mar 2024 09:38:19 -0700 Message-ID: Subject: Re: [PATCH v2 3/3] elf: Enable TLS descriptor tests on aarch64 To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Szabolcs Nagy , Arjun Shankar Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3019.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Tue, Mar 12, 2024 at 9:21=E2=80=AFAM Adhemerval Zanella wrote: > > The aarch64 uses 'trad' for traditional tls and 'desc' for tls > descriptors, but unlike other targets it defaults to 'desc'. The > gnutls2 configure check does not set aarch64 as an ABI that uses > TLS descriptors, which then disable somes stests. > > Also rename the internal machinery fron gnu2 to tls descriptors. > > Checked on aarch64-linux-gnu. > --- > configure | 23 +++++++++++++---------- > configure.ac | 15 +++++++++------ > elf/Makefile | 26 +++++++++++++------------- > sysdeps/aarch64/preconfigure | 1 + > sysdeps/arm/Makefile | 8 ++++---- > 5 files changed, 40 insertions(+), 33 deletions(-) > > diff --git a/configure b/configure > index 117b48a421..432e40a592 100755 > --- a/configure > +++ b/configure > @@ -653,7 +653,7 @@ LIBGD > libc_cv_cc_loop_to_function > libc_cv_cc_submachine > libc_cv_cc_nofma > -libc_cv_mtls_dialect_gnu2 > +libc_cv_mtls_descriptor > libc_cv_has_glob_dat > libc_cv_fpie > libc_cv_z_execstack > @@ -4760,6 +4760,9 @@ libc_config_ok=3Dno > # whether to use such directories. > with_fp_cond=3D1 > > +# A preconfigure script may define another name to TLS descriptor varian= t > +mtls_descriptor=3Dgnu2 > + > if frags=3D`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null` > then > { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysdeps pre= configure fragments" >&5 > @@ -7006,9 +7009,9 @@ fi > printf "%s\n" "$libc_cv_has_glob_dat" >&6; } > > > -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -mtls-dialect= =3Dgnu2" >&5 > -printf %s "checking for -mtls-dialect=3Dgnu2... " >&6; } > -if test ${libc_cv_mtls_dialect_gnu2+y} > +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tls descripto= r support" >&5 > +printf %s "checking for tls descriptor support... " >&6; } > +if test ${libc_cv_mtls_descriptor+y} > then : > printf %s "(cached) " >&6 > else $as_nop > @@ -7019,7 +7022,7 @@ void foo (void) > i =3D 10; > } > EOF > -if { ac_try=3D'${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=3Dgnu2 -no= stdlib -nostartfiles > +if { ac_try=3D'${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=3D$mtls_de= scriptor -nostdlib -nostartfiles > -shared conftest.c -o conftest 1>&5' > { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 > (eval $ac_try) 2>&5 > @@ -7027,17 +7030,17 @@ if { ac_try=3D'${CC-cc} $CFLAGS $CPPFLAGS -fPIC -= mtls-dialect=3Dgnu2 -nostdlib -nost > printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 > test $ac_status =3D 0; }; } > then > - libc_cv_mtls_dialect_gnu2=3Dyes > + libc_cv_mtls_descriptor=3D$mtls_descriptor > else > - libc_cv_mtls_dialect_gnu2=3Dno > + libc_cv_mtls_descriptor=3Dno > fi > rm -f conftest* > fi > -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_dial= ect_gnu2" >&5 > -printf "%s\n" "$libc_cv_mtls_dialect_gnu2" >&6; } > +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_desc= riptor" >&5 > +printf "%s\n" "$libc_cv_mtls_descriptor" >&6; } > > config_vars=3D"$config_vars > -have-mtls-dialect-gnu2 =3D $libc_cv_mtls_dialect_gnu2" > +have-mtls-descriptor =3D $libc_cv_mtls_descriptor" > > { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-a= ttributes is required for aliases" >&5 > printf %s "checking if -Wno-ignored-attributes is required for aliases..= . " >&6; } > diff --git a/configure.ac b/configure.ac > index 19b88a47a5..bdc385d03c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -442,6 +442,9 @@ libc_config_ok=3Dno > # whether to use such directories. > with_fp_cond=3D1 > > +# A preconfigure script may define another name to TLS descriptor varian= t > +mtls_descriptor=3Dgnu2 > + > dnl Let sysdeps/*/preconfigure act here. > LIBC_PRECONFIGURE([$srcdir], [for sysdeps]) > > @@ -1287,7 +1290,7 @@ fi > rm -f conftest*]) > AC_SUBST(libc_cv_has_glob_dat) > > -AC_CACHE_CHECK([for -mtls-dialect=3Dgnu2], libc_cv_mtls_dialect_gnu2, > +AC_CACHE_CHECK([for tls descriptor support], libc_cv_mtls_descriptor, > [dnl > cat > conftest.c < __thread int i; > @@ -1296,16 +1299,16 @@ void foo (void) > i =3D 10; > } > EOF > -if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=3Dgnu2= -nostdlib -nostartfiles > +if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=3D$mtl= s_descriptor -nostdlib -nostartfiles > -shared conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) > then > - libc_cv_mtls_dialect_gnu2=3Dyes > + libc_cv_mtls_descriptor=3D$mtls_descriptor > else > - libc_cv_mtls_dialect_gnu2=3Dno > + libc_cv_mtls_descriptor=3Dno > fi > rm -f conftest*]) > -AC_SUBST(libc_cv_mtls_dialect_gnu2) > -LIBC_CONFIG_VAR([have-mtls-dialect-gnu2], [$libc_cv_mtls_dialect_gnu2]) > +AC_SUBST(libc_cv_mtls_descriptor) > +LIBC_CONFIG_VAR([have-mtls-descriptor], [$libc_cv_mtls_descriptor]) > > dnl clang emits an warning for a double alias redirection, to warn the > dnl original symbol is sed even when weak definition overrides it. > diff --git a/elf/Makefile b/elf/Makefile > index 393a27ef2a..4f1903391a 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -1001,13 +1001,13 @@ modules-names-tests =3D $(filter-out ifuncmod% ts= t-tlsmod%,\ > # For +depfiles in Makerules. > extra-test-objs +=3D tst-auditmod17.os > > -ifeq (yes,$(have-mtls-dialect-gnu2)) > +ifneq (no,$(have-mtls-descriptor)) > tests +=3D tst-gnu2-tls1 > modules-names +=3D tst-gnu2-tls1mod > $(objpfx)tst-gnu2-tls1: $(objpfx)tst-gnu2-tls1mod.so > tst-gnu2-tls1mod.so-no-z-defs =3D yes > -CFLAGS-tst-gnu2-tls1mod.c +=3D -mtls-dialect=3Dgnu2 > -endif # $(have-mtls-dialect-gnu2) > +CFLAGS-tst-gnu2-tls1mod.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > +endif # $(have-mtls-descriptor) > > ifeq (yes,$(have-protected-data)) > modules-names +=3D tst-protected1moda tst-protected1modb > @@ -2975,11 +2975,11 @@ $(objpfx)tst-tls-allocation-failure-static-patche= d.out: \ > $(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \ > $(objpfx)tst-audit-tlsdesc-mod2.so \ > $(shared-thread-library) > -ifeq (yes,$(have-mtls-dialect-gnu2)) > +ifneq (no,$(have-mtls-descriptor)) > # The test is valid for all TLS types, but we want to exercise GNU2 > # TLS if possible. > -CFLAGS-tst-audit-tlsdesc-mod1.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-audit-tlsdesc-mod2.c +=3D -mtls-dialect=3Dgnu2 > +CFLAGS-tst-audit-tlsdesc-mod1.c +=3D -mtls-dialect=3D$(have-mtls-descrip= tor) > +CFLAGS-tst-audit-tlsdesc-mod2.c +=3D -mtls-dialect=3D$(have-mtls-descrip= tor) > endif > $(objpfx)tst-audit-tlsdesc-dlopen: $(shared-thread-library) > $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-audit-tlsdesc-mod1.s= o \ > @@ -3058,11 +3058,11 @@ $(objpfx)tst-gnu2-tls2.out: \ > $(objpfx)tst-gnu2-tls2mod1.so \ > $(objpfx)tst-gnu2-tls2mod2.so > > -ifeq (yes,$(have-mtls-dialect-gnu2)) > -CFLAGS-tst-tlsgap-mod0.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-tlsgap-mod1.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-tlsgap-mod2.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-gnu2-tls2mod0.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-gnu2-tls2mod1.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-gnu2-tls2mod2.c +=3D -mtls-dialect=3Dgnu2 > +ifneq (no,$(have-mtls-descriptor)) > +CFLAGS-tst-tlsgap-mod0.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > +CFLAGS-tst-tlsgap-mod1.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > +CFLAGS-tst-tlsgap-mod2.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > +CFLAGS-tst-gnu2-tls2mod0.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > +CFLAGS-tst-gnu2-tls2mod1.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > +CFLAGS-tst-gnu2-tls2mod2.c +=3D -mtls-dialect=3D$(have-mtls-descriptor) > endif > diff --git a/sysdeps/aarch64/preconfigure b/sysdeps/aarch64/preconfigure > index d9bd1f8558..19657b627b 100644 > --- a/sysdeps/aarch64/preconfigure > +++ b/sysdeps/aarch64/preconfigure > @@ -2,5 +2,6 @@ case "$machine" in > aarch64*) > base_machine=3Daarch64 > machine=3Daarch64 > + mtls_descriptor=3Ddesc > ;; > esac > diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile > index d5cea717a9..619474eca9 100644 > --- a/sysdeps/arm/Makefile > +++ b/sysdeps/arm/Makefile > @@ -13,15 +13,15 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr= 1.os > lib-noranlib: $(objpfx)libgcc-stubs.a > > ifeq ($(build-shared),yes) > -ifeq (yes,$(have-mtls-dialect-gnu2)) > +ifneq (no,$(have-mtls-descriptor)) > tests +=3D tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy > modules-names +=3D tst-armtlsdesclocmod > modules-names +=3D tst-armtlsdescextlazymod tst-armtlsdescextnowmod > CPPFLAGS-tst-armtlsdescextnowmod.c +=3D -Dstatic=3D > CPPFLAGS-tst-armtlsdescextlazymod.c +=3D -Dstatic=3D > -CFLAGS-tst-armtlsdesclocmod.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-armtlsdescextnowmod.c +=3D -mtls-dialect=3Dgnu2 > -CFLAGS-tst-armtlsdescextlazymod.c +=3D -mtls-dialect=3Dgnu2 > +CFLAGS-tst-armtlsdesclocmod.c +=3D -mtls-dialect=3D$(have-mtls-descripto= r) > +CFLAGS-tst-armtlsdescextnowmod.c +=3D -mtls-dialect=3D$(have-mtls-descri= ptor) > +CFLAGS-tst-armtlsdescextlazymod.c +=3D -mtls-dialect=3D$(have-mtls-descr= iptor) > LDFLAGS-tst-armtlsdescextnowmod.so +=3D -Wl,-z,now > tst-armtlsdescloc-ENV =3D LD_BIND_NOW=3D1 > tst-armtlsdescextnow-ENV =3D LD_BIND_NOW=3D1 > -- > 2.34.1 > LGTM. Reviewed-by: H.J. Lu Thanks. --=20 H.J.