Message ID | 703af27797ca64c90c3c6103454fba4dc4ac34b9.1597243100.git.alistair.francis@wdc.com |
---|---|
State | New |
Headers | show |
Series | glibc port for 32-bit RISC-V (RV32) | expand |
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 --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"_
From: Zong Li <zong.li@sifive.com> --- sysdeps/unix/sysv/linux/riscv/ldd-rewrite.sed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)