From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 4D248385840D for ; Tue, 2 Nov 2021 20:29:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4D248385840D Received: by mail-pl1-x633.google.com with SMTP id u11so683219plf.3 for ; Tue, 02 Nov 2021 13:29:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=25FC/kzhlz8U66VrpDn/Uv+c1kvR1PJ+C7saZbUFhDQ=; b=aLmjniOii3S8n1Eg+9V+n9k9GCSEo+QppoEHBWYdQiMojqR4774QAVmBqxY+TAk1iW FEjy3qOTDaucuz9MEe51TmpMWuDa0a4TGWbsG0tyFqxRvu3wYtVVHKk2ihyFKu1B9Ean qXvINl18DRX+kCDe4g/w3BXptUjx25uBKX1XjIHsIR42Jy83ars4WfBNKbQC9XhXhHgI 5oWuMeZwmBQgObnKNYAn4GlbPhiteynAG/kXP+sxV7wjjl11MckA5GwqhEg6RiTrb1cX 9WrGChhsX9UM1fhGuWjhRWs4RQaI5KplZef6yIIk9qYBYmOf6DdNw/3+b+IW6eZVXyyo Y62w== X-Gm-Message-State: AOAM532UMGXoK3mUko2ltQhCxQjIbQwvNTrAmAmhjKzWl97vVnm9GzY9 lmUJPbb0ZFTTr0AFKxXmi0ezrg== X-Google-Smtp-Source: ABdhPJzw8EMvaSW7IjPzifGVLPJkLnqyyGjvjKjRCV9TC+1dupVdOYBhpp103flh5UZGAHg8qMWJSg== X-Received: by 2002:a17:90b:1e0c:: with SMTP id pg12mr4199054pjb.135.1635884949227; Tue, 02 Nov 2021 13:29:09 -0700 (PDT) Received: from google.com ([2620:15c:2ce:200:be09:83e2:3abe:b3eb]) by smtp.gmail.com with ESMTPSA id t12sm3305778pjo.44.2021.11.02.13.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:29:08 -0700 (PDT) Date: Tue, 2 Nov 2021 13:29:06 -0700 From: Fangrui Song To: Adhemerval Zanella Cc: "H.J. Lu" , GNU C Library Subject: Re: [PATCH] riscv: Build with -mno-relax if linker does not support R_RISCV_ALIGN Message-ID: <20211102202906.rrdsp7goozjtx2ih@google.com> References: <20211102195720.1979908-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-27.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_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-List-Received-Date: Tue, 02 Nov 2021 20:29:13 -0000 On 2021-11-02, H.J. Lu wrote: >On Tue, Nov 2, 2021 at 12:57 PM Adhemerval Zanella > wrote: >> >> It allows build both glibc and tests with lld (Since lld does not >> support R_RISCV_ALIGN linker relaxation). >> >> Checked with a build for riscv32-linux-gnu-rv32imafdc-ilp32d and >> riscv64-linux-gnu-rv64imafdc-lp64d. >> --- >> sysdeps/riscv/Makefile | 6 ++++++ >> sysdeps/riscv/configure | 30 ++++++++++++++++++++++++++++++ >> sysdeps/riscv/configure.ac | 16 ++++++++++++++++ >> 3 files changed, 52 insertions(+) >> >> diff --git a/sysdeps/riscv/Makefile b/sysdeps/riscv/Makefile >> index 20a9968106..8fb10b164f 100644 >> --- a/sysdeps/riscv/Makefile >> +++ b/sysdeps/riscv/Makefile >> @@ -5,3 +5,9 @@ endif >> # RISC-V's assembler also needs to know about PIC as it changes the definition >> # of some assembler macros. >> ASFLAGS-.os += $(pic-ccflag) >> + >> +ifeq (no,$(riscv-r-align)) >> +ASFLAGS-.os += -Wa,-mno-relax >> +ASFLAGS-.o += -Wa,-mno-relax >> +sysdep-CFLAGS += -mno-relax >> +endif >> diff --git a/sysdeps/riscv/configure b/sysdeps/riscv/configure >> index 53f5f1b5f1..4a56fca94b 100644 >> --- a/sysdeps/riscv/configure >> +++ b/sysdeps/riscv/configure >> @@ -2,3 +2,33 @@ >> # Local configure fragment for sysdeps/riscv/elf. >> >> $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h >> + >> + >> +# Check if static linker supports R_RISCV_ALIGN >> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for R_RISCV_ALIGN linker relaxation support" >&5 >> +$as_echo_n "checking for R_RISCV_ALIGN linker relaxation support... " >&6; } >> +if ${libc_cv_riscv_r_align+:} false; then : >> + $as_echo_n "(cached) " >&6 >> +else >> + cat > conftest.S <> +.align 3 >> +foo: >> + li a0,42 >> + ret >> +EOF >> + libc_cv_riscv_r_align=no >> + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles $no_ssp -shared -fPIC -o contests.o conftest.S' >> + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&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_riscv_r_align=yes >> + fi >> + rm -rf conftest.* >> +fi >> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_riscv_r_align" >&5 >> +$as_echo "$libc_cv_riscv_r_align" >&6; } >> +config_vars="$config_vars >> +riscv-r-align = $libc_cv_riscv_r_align" >> diff --git a/sysdeps/riscv/configure.ac b/sysdeps/riscv/configure.ac >> index 34f62d4b4b..44a5279903 100644 >> --- a/sysdeps/riscv/configure.ac >> +++ b/sysdeps/riscv/configure.ac >> @@ -2,3 +2,19 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. >> # Local configure fragment for sysdeps/riscv/elf. >> >> AC_DEFINE(PI_STATIC_AND_HIDDEN) >> + >> +# Check if static linker supports R_RISCV_ALIGN >> +AC_CACHE_CHECK([for R_RISCV_ALIGN linker relaxation support], [libc_cv_riscv_r_align],[dnl >> + cat > conftest.S <> +.align 3 >> +foo: >> + li a0,42 >> + ret >> +EOF >> + libc_cv_riscv_r_align=no >> + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles $no_ssp -shared -fPIC -o contests.o conftest.S]) >> + then >> + libc_cv_riscv_r_align=yes >> + fi >> + rm -rf conftest.*]) >> +LIBC_CONFIG_VAR([riscv-r-align], [$libc_cv_riscv_r_align]) >> -- >> 2.32.0 >> > >LGTM. > >Reviewed-by: H.J. Lu > >Thanks. Thanks Reviewed-by: Fangrui Song