diff mbox series

[v4,16/18] RISC-V: Add rv32 path to RTLDLIST in ldd

Message ID	703af27797ca64c90c3c6103454fba4dc4ac34b9.1597243100.git.alistair.francis@wdc.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9379B384A882 IronPort-SDR: cjzwLqSQ1Qb4e6ILFiqePZsucIb+tD5A32fBFDkhyiMGBFaLzgiS+3/TlkYXk6mRNUd74uLBjr ogNutb1gWYFhOLV+3FxwIGQu2ZoaB1wP8WeoDM6feFRrwBEmpQL6OlUm/BqAvU2LIf7/0vWoan 6XxzZ4egesYU/l7NMmSxMsFKLIp63MV3HpMoirmfh5OQoarISdMFLI+TST6hJUCesoeGo/KCuV ciElFLEcSg29YdCUBHzAkxl1cRwqyv9vu/sdHmcgekFXb4G+BBBqrJ01wH8O9pEnlf/AOQxmx6 aWA= IronPort-SDR: mCalv7X1cHF2B8qDuXsqVqTvIFtfysxRJ5XZelk8JbI0lku2PsuUy7neokPKHUuF7x1mglyStm XgREO13rdZKA== IronPort-SDR: PRJORPXj5gZnVmFzvEOpfoV7z2WiL3/Y4ynIBpXQtnkQkr/WElGBL1eqOA9u//hu2UzjebMoAr 7mfUJvIjwS+A== WDCIronportException: Internal To: libc-alpha@sourceware.org Subject: [PATCH v4 16/18] RISC-V: Add rv32 path to RTLDLIST in ldd Date: Wed, 12 Aug 2020 07:41:58 -0700 Message-Id: <703af27797ca64c90c3c6103454fba4dc4ac34b9.1597243100.git.alistair.francis@wdc.com> In-Reply-To: <cover.1597243100.git.alistair.francis@wdc.com> References: <cover.1597243100.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: macro@wdc.com, 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) \| [v4,00/18] glibc port for 32-bit RISC-V (RV32) [v4,01/18] RISC-V: Use 64-bit time_t and off_t for RV32 and RV64 [v4,02/18] RISC-V: Cleanup some of the sysdep.h code [v4,03/18] RISC-V: Use 64-bit-time syscall numbers with the 32-bit port [v4,04/18] RISC-V: Add support for 32-bit vDSO calls [v4,05/18] RISC-V: Support dynamic loader for the 32-bit [v4,07/18] sysv/linux: riscv: Fix dl-cache.h indentation [v4,08/18] RISC-V: Add arch-syscall.h for RV32 [v4,09/18] RISC-V: Support the 32-bit ABI implementation [v4,10/18] RISC-V: Hard float support for 32-bit [v4,11/18] RISC-V: Add 32-bit ABI lists [v4,12/18] RISC-V: Add the RV32 libm-test-ulps [v4,13/18] RISC-V: Fix llrint and llround missing exceptions on RV32 [v4,14/18] riscv32: Specify the arch_minimum_kernel as 5.4 [v4,16/18] RISC-V: Add rv32 path to RTLDLIST in ldd [v4,17/18] Documentation for the RISC-V 32-bit port [v4,18/18] Add RISC-V 32-bit target to build-many-glibcs.py

Commit Message

Alistair Francis Aug. 12, 2020, 2:41 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 Aug. 18, 2020, 11:52 p.m. UTC | #1

On Wed, 12 Aug 2020, Alistair Francis wrote:

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

 Again there is a hole in numbering here and v3's 15/19, which I requested 
to come after this change, is missing.

> diff --git a/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed
> index 377a9c6ef4..0b26352c21 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-\664d\9 \2\332-i\632\9 \2\332-i\632d\9"_

 Ah, thanks for tracking down the problem here.  This however caused that 
\8 is not used anymore, so how about:

s_^\(RTLDLIST=\)\(.*lib\)\(/[^/]*\)\(64\|32\)\(-.*\)\(lp\)\(64\|32\)d*\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\364-\664\8 \2\364-\664d\8 \2\332-i\632\8 \2\332-i\632d\8"_

(note that I fixed up an extraneous repeated space in `[ 	]' too)?

  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..0b26352c21 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-\664d\9 \2\332-i\632\9 \2\332-i\632d\9"_