From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) by sourceware.org (Postfix) with ESMTPS id 9400C3850402 for ; Mon, 10 Aug 2020 20:15:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9400C3850402 Received: by mail-io1-xd43.google.com with SMTP id s189so10320326iod.2 for ; Mon, 10 Aug 2020 13:15:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Hb3cMPO8JTT4JhvBQdendXHgDAZOKb+HfX8gpBt/A3s=; b=dM+tfMFd8lND1QLeT0OqVyZrcve1rqJ/A2Qwfc2rA2VC5/gs5v51WN7+VBYjzwzOEc 1iFKWlI1eHImP8sanRnE1EyiLPP7PPtM3a4WQaeihQjYpOVzXJUbNzhbSYvxu0vUzr7l M65SdCcYl070DWmKTro0oWD9GVr+S7BXw3BJSZYMMM7c5AWgTikLAhniN/W+hcGaM+gd Zv2HjijnvHCp732KfJ8u4PpY9c0FiLZX7agGg5wL2TZrcgl8oGfbQEPKTfNQ0p/7c3Jf Hfu2OOyUkIfAD/LQhkexJxlppMothVeWNqQiUiuZ7olM2RaCtGTr9oLMTmXDWZXFMRr3 Nfjw== X-Gm-Message-State: AOAM532rJAcUHRaX0NsrEIypEQG3Co2hhsUc7TSRCVQzbFUhw2qaLM9y VEQTa0q3236qTFMRszuE4V3rYkTgtIJt9nVtlp+w1eqPe7s= X-Google-Smtp-Source: ABdhPJwPVpoCVU333jfOa1IBVWUjio3mAuS7Jq5B9VX94dOhr5J51uZWGi1VGoUIZ//2jI3HAyu1M7A+xv842khnQJQ= X-Received: by 2002:a05:6638:248e:: with SMTP id x14mr21626811jat.135.1597090510100; Mon, 10 Aug 2020 13:15:10 -0700 (PDT) MIME-Version: 1.0 References: <3b9e6dd8baa53076ea5019f1e18d770ea47b58bb.1594568655.git.alistair.francis@wdc.com> In-Reply-To: From: Alistair Francis Date: Mon, 10 Aug 2020 13:04:47 -0700 Message-ID: Subject: Re: [PATCH v3 17/19] RISC-V: Add rv32 path to RTLDLIST in ldd To: "Maciej W. Rozycki" Cc: Alistair Francis , GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2020 20:15:11 -0000 On Tue, Jul 14, 2020 at 5:33 PM Maciej W. Rozycki via Libc-alpha 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@||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