Message ID | 3b9e6dd8baa53076ea5019f1e18d770ea47b58bb.1594568655.git.alistair.francis@wdc.com |
---|---|
State | Committed |
Headers |
Return-Path: <libc-alpha-bounces@sourceware.org> 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 99B193861003; Sun, 12 Jul 2020 15:57:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99B193861003 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594569459; bh=pXBeNDKMLkM5h3SVg4fKWz3LvFQ39AmZPYTiYWwJavY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=e23HBWFCA1g1tj7GicCZxYuPvTPKyklH1x4QdPKsSyX+w0r+tMWDA3k84NPcb5QtF PM22kuP2Pd2yW+YO9U1H2F+xC7jzhG2VT0neA4qHcmJU3JX56GDX9nmhv2KW4r7/cJ xoDzOliqzedbc3jX514KU3OYaPLULNn/3BK3wmJA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by sourceware.org (Postfix) with ESMTPS id 3A8E03861015 for <libc-alpha@sourceware.org>; Sun, 12 Jul 2020 15:57:37 +0000 (GMT) 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= X-IronPort-AV: E=Sophos;i="5.75,344,1589212800"; d="scan'208";a="142401286" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 12 Jul 2020 23:57:36 +0800 IronPort-SDR: e0itKHgB9Jyas7kh5eLUjUep8IuYbkA8BlOm9ttJfxH4mVE8jnuqa0t8rRMphQQX6K4hMUDx0b dgxDUMQGgpCar9pZj9zwqMcVrlqAitFJU= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2020 08:46:07 -0700 IronPort-SDR: eR5yRTNMmkds5SabA2d3W+E0b6S/ZttncONSbPn6Qp/3eUwRUmqSj6bleXeLNt75OiKxhBSxlp rgWJcMMoFaLA== WDCIronportException: Internal Received: from usa002626.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.178]) by uls-op-cesaip02.wdc.com with ESMTP; 12 Jul 2020 08:57:36 -0700 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> X-Mailer: git-send-email 2.27.0 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 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <http://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <http://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> 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)
|
|
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
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
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 --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"_