diff mbox series

[v3,17/19] RISC-V: Add rv32 path to RTLDLIST in ldd

Message ID	3b9e6dd8baa53076ea5019f1e18d770ea47b58bb.1594568655.git.alistair.francis@wdc.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3A8E03861015 IronPort-SDR: 6mQXawilZ404g7RsCzEPPpPByG61ugMnijv05OqQDGS69E6Bt2OOLzebTPyPD4NuWwGasM2NSA Q+hKqejfx2rHqk+DQS+rqzB+SoW3i6Sutxht8WlhDDWnRILffnvD07QJxwu69YNdG7x2I+0OJC KFNgNim69DMee0xCsXxiQT9NlYFOOR/gXRM80QT26OwEjkGBcErLiW0nLRkTgiAvR+xHBnlONu 1w2OjsQ3I+AKv4GwXEv+ROjeFhPN0RAdB7JQ9nYaftM3H+vDsGBa97o50z8FB/0IOTVZeji6X4 Q2o= IronPort-SDR: e0itKHgB9Jyas7kh5eLUjUep8IuYbkA8BlOm9ttJfxH4mVE8jnuqa0t8rRMphQQX6K4hMUDx0b dgxDUMQGgpCar9pZj9zwqMcVrlqAitFJU= IronPort-SDR: eR5yRTNMmkds5SabA2d3W+E0b6S/ZttncONSbPn6Qp/3eUwRUmqSj6bleXeLNt75OiKxhBSxlp rgWJcMMoFaLA== WDCIronportException: Internal To: libc-alpha@sourceware.org Subject: [PATCH v3 17/19] RISC-V: Add rv32 path to RTLDLIST in ldd Date: Sun, 12 Jul 2020 08:48:05 -0700 Message-Id: <3b9e6dd8baa53076ea5019f1e18d770ea47b58bb.1594568655.git.alistair.francis@wdc.com> In-Reply-To: <cover.1594568655.git.alistair.francis@wdc.com> References: <cover.1594568655.git.alistair.francis@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Alistair Francis via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Alistair Francis <alistair.francis@wdc.com> Cc: alistair.francis@wdc.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org>
Series	glibc port for 32-bit RISC-V (RV32) \| [v3,00/19] glibc port for 32-bit RISC-V (RV32) [v3,01/19] RISC-V: Use 64-bit time_t and off_t for RV32 and RV64 [v3,02/19] RISC-V: Cleanup some of the sysdep.h code [v3,03/19] RISC-V: Use 64-bit-time syscall numbers with the 32-bit port [v3,04/19] RISC-V: Add support for 32-bit vDSO calls [v3,05/19] RISC-V: Support dynamic loader for the 32-bit [v3,06/19] sysv/linux: riscv: Fix dl-cache.h indentation [v3,07/19] RISC-V: Add path of library directories for the 32-bit [v3,08/19] RISC-V: Add arch-syscall.h for RV32 [v3,09/19] RISC-V: nptl: update default pthread-offsets.h [v3,10/19] RISC-V: Support the 32-bit ABI implementation [v3,11/19] RISC-V: Hard float support for 32-bit [v3,12/19] RISC-V: Add ABI lists [v3,13/19] RISC-V: Add the RV32 libm-test-ulps [v3,14/19] RISC-V: Fix llrint and llround missing exceptions on RV32 [v3,15/19] RISC-V: Build Infastructure for 32-bit [v3,16/19] riscv32: Specify the arch_minimum_kernel as 5.4 [v3,17/19] RISC-V: Add rv32 path to RTLDLIST in ldd [v3,18/19] Documentation for the RISC-V 32-bit port [v3,19/19] Add RISC-V 32-bit target to build-many-glibcs.py

Commit Message

Alistair Francis July 12, 2020, 3:48 p.m. UTC

  From: Zong Li <zong.li@sifive.com>

---
 sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maciej W. Rozycki July 15, 2020, 12:32 a.m. UTC | #1

On Sun, 12 Jul 2020, Alistair Francis via Libc-alpha wrote:

> diff --git a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> index 377a9c6ef4..bc0c4f51a1 100644
> --- a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> +++ b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> @@ -1 +1 @@
> -s_^\(RTLDLIST=\)\(.*lib/\)\(ld-linux\)-\(riscv64\)-\(lp64\)\(d*\)\(\.so\.[0-9.]*\)_\1"\2\3-\4-\5\7 \2\3-\4-\5d\7"_
> +s_^\(RTLDLIST=\)\(.*lib\)\(/[^/]*\)\(64\|32\)\(-.*\)\(lp\)\(64\|32\)\(d*\)\(\.so\.[0-9.]*\)[  	]*$_\1"\2\364-\664\9 \2\364-\664\8\9 \2\332-i\632\9 \2\332-i\632\8\9"_

 This doesn't seem right to me.  Currently the list produced is as 
follows:

RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv64-lp64d.so.1"

regardless of whether the ABI configured for has been lp64 or lp64d.  With 
this change in place the list becomes ABI specific and is:

RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv32-ilp32.so.1 /lib/ld-linux-riscv32-ilp32.so.1"

-- for the ilp32 or lp64 ABIs, and:

RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv64-lp64d.so.1 /lib/ld-linux-riscv32-ilp32.so.1 /lib/ld-linux-riscv32-ilp32d.so.1"

-- for the ilp32d or lp64d ABIs.  Please look into it.

  Maciej

Alistair Francis Aug. 10, 2020, 8:04 p.m. UTC | #2

On Tue, Jul 14, 2020 at 5:33 PM Maciej W. Rozycki via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> On Sun, 12 Jul 2020, Alistair Francis via Libc-alpha wrote:
>
> > diff --git a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> > index 377a9c6ef4..bc0c4f51a1 100644
> > --- a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> > +++ b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> > @@ -1 +1 @@
> > -s_^\(RTLDLIST=\)\(.*lib/\)\(ld-linux\)-\(riscv64\)-\(lp64\)\(d*\)\(\.so\.[0-9.]*\)_\1"\2\3-\4-\5\7 \2\3-\4-\5d\7"_
> > +s_^\(RTLDLIST=\)\(.*lib\)\(/[^/]*\)\(64\|32\)\(-.*\)\(lp\)\(64\|32\)\(d*\)\(\.so\.[0-9.]*\)[         ]*$_\1"\2\364-\664\9 \2\364-\664\8\9 \2\332-i\632\9 \2\332-i\632\8\9"_
>
>  This doesn't seem right to me.  Currently the list produced is as
> follows:
>
> RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv64-lp64d.so.1"
>
> regardless of whether the ABI configured for has been lp64 or lp64d.  With
> this change in place the list becomes ABI specific and is:
>
> RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv32-ilp32.so.1 /lib/ld-linux-riscv32-ilp32.so.1"
>
> -- for the ilp32 or lp64 ABIs, and:
>
> RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1 /lib/ld-linux-riscv64-lp64d.so.1 /lib/ld-linux-riscv32-ilp32.so.1 /lib/ld-linux-riscv32-ilp32d.so.1"
>
> -- for the ilp32d or lp64d ABIs.  Please look into it.

Fixed!

When targeting riscv32-ilp32:
I get:
RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1
/lib/ld-linux-riscv64-lp64d.so.1 /lib/ld-linux-riscv32-ilp32.so.1
/lib/ld-linux-riscv32-ilp32d.so.1"

When targeting riscv32-ilp32d:
I get:
RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1
/lib/ld-linux-riscv64-lp64d.so.1 /lib/ld-linux-riscv32-ilp32.so.1
/lib/ld-linux-riscv32-ilp32d.so.1"

When targeting riscv64-lp32d:
I get:
RTLDLIST="/lib/ld-linux-riscv64-lp64.so.1
/lib/ld-linux-riscv64-lp64d.so.1 /lib/ld-linux-riscv32-ilp32.so.1
/lib/ld-linux-riscv32-ilp32d.so.1"

Tested with this command:

LC_ALL=C sed -e 's%@RTLD@%/lib/ld-linux-riscv32-ilp32.so.1%g' -e
's%@VERSION@%2.32.9000%g' -e 's|@PKGVERSION@|(GNU libc) |g' -e
's|@REPORT_BUGS_TO@|<https://www.gnu.org/software/libc/bugs.html>|g'
-e 's%@BASH@%/usr/bin/bash%g' -e
's%@TEXTDOMAINDIR@%/usr/share/locale%g' < ldd.bash.in | LC_ALL=C sed
-f ../sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed | grep RTLDLIST=

Alistair

>
>   Maciej

diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
index 377a9c6ef4..bc0c4f51a1 100644
--- a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
@@ -1 +1 @@ 
-s_^\(RTLDLIST=\)\(.*lib/\)\(ld-linux\)-\(riscv64\)-\(lp64\)\(d*\)\(\.so\.[0-9.]*\)_\1"\2\3-\4-\5\7 \2\3-\4-\5d\7"_
+s_^\(RTLDLIST=\)\(.*lib\)\(/[^/]*\)\(64\|32\)\(-.*\)\(lp\)\(64\|32\)\(d*\)\(\.so\.[0-9.]*\)[  	]*$_\1"\2\364-\664\9 \2\364-\664\8\9 \2\332-i\632\9 \2\332-i\632\8\9"_