From patchwork Tue Aug 17 07:41:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 44678 X-Patchwork-Delegate: tuliom@linux.vnet.ibm.com 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 D6E6E3835817 for ; Tue, 17 Aug 2021 07:42:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D6E6E3835817 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1629186120; bh=jiopkV7xilFEudUxuOL0Zw3z120i4Cjrhm+QaDB7PPo=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FLASmxkz2we5vkj4+WyU+MnKxCfuUTsfGht1g97ojMuxcSJX+CI5TyMYnq/9mFER9 NSjiuctHZj/ujCFLqiBOAWNdo9KmgesF+UHrBaRW1Rv2Kdaly4n/lHscpuzMJgQVBF V573hCXwp8K75vv3VC5gmwnjwxca29Z1QtWSEeNE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id EA2023860C3C for ; Tue, 17 Aug 2021 07:41:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EA2023860C3C Received: by mail-yb1-xb49.google.com with SMTP id x5-20020a0569020505b0290592c25b8c59so19413160ybs.18 for ; Tue, 17 Aug 2021 00:41:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=jiopkV7xilFEudUxuOL0Zw3z120i4Cjrhm+QaDB7PPo=; b=jRUwL1sGtyAi/fLcGAaQ8qrvw11x9NkTrWrP1FOnKuN4CDkd3eOMHc9kHLxpe8lsgn MeI9MbscteG8sohPuzDV8IlaGHo5NbzW0vWWqKhAPmPEcmrMitId/Z6JSFodNlvx2F1N efFjUuQQr8Lr8FW1ORneedYLTJwJhl83hrkyZEgDMOpBxPSHOTAwPvWpys+4psjMiV8j pbfjAqWVi+fB/eUE96NUx3WKG0SGHCe0nZMhQ4FReXeL+ncEV1qK3tAOuGsvUoOaJPLH YKS1byF4Jpj3apQL1KkVds7ctamsADYzZ+dh8TbgFaEdax7bhp7ayj3u0r6Y9VzPDCzg MIFQ== X-Gm-Message-State: AOAM530AqrmxMt4i2R0IYgu1PWHkJpr+pOOzW21TW6M7zZd3hUa5kLZW LC8BeAnq8mdiOV9/VgXR8pWVU9/iP8txVe9q0Y+CfGxvsKcAptbaVvUGnXKrESYZbRvRWevm8DA OJr5gaq+qUbqdsUrMwtWCsM0IcLMft/lb4MklQYe/um6zGau5MZoVTNYmDp3PxwQFdRH+ X-Google-Smtp-Source: ABdhPJydqrDVnn/e68AQNUVNfR+hxrrAtJbCyuepewWqqZEPjGPr1XFIrDJWydJaGNEhpyCFOMsG+qW30mro X-Received: from maskray1.svl.corp.google.com ([2620:15c:2ce:200:e30a:fd5e:699:fa1c]) (user=maskray job=sendgmr) by 2002:a25:a0ce:: with SMTP id i14mr2790260ybm.474.1629186090361; Tue, 17 Aug 2021 00:41:30 -0700 (PDT) Date: Tue, 17 Aug 2021 00:41:26 -0700 Message-Id: <20210817074126.2348547-1-maskray@google.com> Mime-Version: 1.0 Subject: [PATCH] powerpc: Use --no-tls-get-addr-optimize in test only if the linker supports it To: libc-alpha@sourceware.org, Tulio Magno Quites Machado Filho X-Spam-Status: No, score=-19.9 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL 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-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: , X-Patchwork-Original-From: Fangrui Song via Libc-alpha From: Fangrui Song Reply-To: Fangrui Song Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" LLD doesn't support --{,no-}tls-get-addr-optimize. When LLD 13.0.0 is allowed in configure.ac (https://sourceware.org/pipermail/libc-alpha/2021-August/129866.html), `make check` result is on par with glibc built with GNU ld on ppc64le. Reviewed-by: Tulio Magno Quites Machado Filho --- sysdeps/unix/sysv/linux/powerpc/Makefile | 2 ++ sysdeps/unix/sysv/linux/powerpc/configure | 34 ++++++++++++++++++++ sysdeps/unix/sysv/linux/powerpc/configure.ac | 4 +++ 3 files changed, 40 insertions(+) diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile index 733557ba13..fc7c29c695 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Makefile +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -14,8 +14,10 @@ endif ifeq ($(subdir),elf) # Otherwise tst-tls-dlinfo fails due to tst-tlsmod2.so using static tls. +ifeq ($(have-tls-get-addr-optimize),yes) LDFLAGS-tst-tlsmod2.so += -Wl,--no-tls-get-addr-optimize endif +endif ifeq ($(subdir),misc) sysdep_headers += bits/ppc.h diff --git a/sysdeps/unix/sysv/linux/powerpc/configure b/sysdeps/unix/sysv/linux/powerpc/configure index 6f883de396..ceb1bd7c1b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/configure +++ b/sysdeps/unix/sysv/linux/powerpc/configure @@ -76,4 +76,38 @@ $as_echo "$libc_cv_mabi_ibmlongdouble" >&6; } fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports --no-tls-get-addr-optimize" >&5 +$as_echo_n "checking for linker that supports --no-tls-get-addr-optimize... " >&6; } +libc_linker_feature=no +if test x"$gnu_ld" = x"yes"; then + libc_linker_check=`$LD -v --help 2>/dev/null | grep "\--no-tls-get-addr-optimize"` + if test -n "$libc_linker_check"; then + 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_linker_feature=yes + fi + rm -f conftest* + fi +fi +if test $libc_linker_feature = yes; then + libc_cv_tls_get_addr_optimize=yes +else + libc_cv_tls_get_addr_optimize=no +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5 +$as_echo "$libc_linker_feature" >&6; } +config_vars="$config_vars +have-tls-get-addr-optimize = $libc_cv_tls_get_addr_optimize" + ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed diff --git a/sysdeps/unix/sysv/linux/powerpc/configure.ac b/sysdeps/unix/sysv/linux/powerpc/configure.ac index 598e44ab71..8d2ec60f68 100644 --- a/sysdeps/unix/sysv/linux/powerpc/configure.ac +++ b/sysdeps/unix/sysv/linux/powerpc/configure.ac @@ -36,4 +36,8 @@ long double foobar (long double x) { return x; }]])], fi fi +LIBC_LINKER_FEATURE([--no-tls-get-addr-optimize], [-Wl,--no-tls-get-addr-optimize], + [libc_cv_tls_get_addr_optimize=yes], [libc_cv_tls_get_addr_optimize=no]) +LIBC_CONFIG_VAR([have-tls-get-addr-optimize], [$libc_cv_tls_get_addr_optimize]) + ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed