This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[RFC v1 09/16] RISC-V: Add path of library directories for the 32-bit
- From: Alistair Francis <alistair dot francis at wdc dot com>
- To: libc-alpha at sourceware dot org
- Cc: alistair dot francis at wdc dot com, alistair23 at gmail dot com
- Date: Fri, 21 Jun 2019 21:37:36 -0700
- Subject: [RFC v1 09/16] RISC-V: Add path of library directories for the 32-bit
- Ironport-sdr: t8bNrH1Bod4DXSVmxI/EGcTEw02ZWJLmfElqSjZP1RsZXlY8ozeDmcQF6oOXtFwCG0gfo0WHGu zFzTvbhz2DUXaCmm7ZIFxllfnVf5sa68ToXsn3pVx0ugPeDLys9swVRVaEQWNOYTdFW0y82GdB BXHU6vDHqScPZcnEJa7Y8zDFq7SzksF9HoagH8bdRNH5ZT5PcWjWoaEWC2mIG4ZBw+GIej1yRB As9MXhcOVJN4EqFBVQHSoTzE7jJzSuwOYXS5nN7o2MTzCeHPkEgGoOCJg8NNeWzjGb7f+KfHlj gB51xeNMF4S0b4XhusVBpJ9C
- Ironport-sdr: qn+5vZsaFaMQOZxSwKhmk/Z15Cebr7O3kPeLBhFovXAQugWE93eRW+VPeivx3Z45USoozFeTOW +DzM46eOl3oAJD+ZzhmOLgSqpFBxpRNW//34j8XPgOIn+Glf8iYZL2R/2EY6dTFEMIIRVUoryR Zb5nyd4IGydlv9wa/f4y7zgXeBbc8BvReLol40cEu1IPAG4KaV0t5atFT7xS4IuKH9YtxXAVKn HHPHDtquideFnbJgPvLkZUzREAGD2HQclrioYuw6sbi/NvmCttKDrwH3CljLoCRpmBIgwrMymQ YZQ=
- References: <cover.1561177967.git.alistair.francis@wdc.com>
From: Zong Li <zongbox@gmail.com>
For the recommand of 64 bit version, we add the libraries path of 32 bit
in this patch. This includes a fix to avoid an out of bound array check
when building with GCC 8.2.
2018-11-29 Zong Li <zong@andestech.com>
* sysdeps/unix/sysv/linux/riscv/dl-cache.h (add_system_dir): Add
libraries path for rv32.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
ChangeLog | 3 +++
sysdeps/unix/sysv/linux/riscv/dl-cache.h | 17 +++++++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2a752ae444..73d07ab159 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
2018-06-20 Zong Li <zong@andestech.com>
* sysdeps/unix/sysv/linux/riscv/ldconfig.h (LD_SO_ABI): Support rv32.
+ * sysdeps/unix/sysv/linux/riscv/ldconfig.h (LD_SO_ABI): Support rv32.
+ * sysdeps/unix/sysv/linux/riscv/dl-cache.h (add_system_dir): Add
+ libraries path for rv32.
2019-06-20 Dmitry V. Levin <ldv@altlinux.org>
Florian Weimer <fweimer@redhat.com>
diff --git a/sysdeps/unix/sysv/linux/riscv/dl-cache.h b/sysdeps/unix/sysv/linux/riscv/dl-cache.h
index 2a15e28e3b..5943060536 100644
--- a/sysdeps/unix/sysv/linux/riscv/dl-cache.h
+++ b/sysdeps/unix/sysv/linux/riscv/dl-cache.h
@@ -34,6 +34,8 @@
RISC-V, libraries can be found in paths ending in:
- /lib64/lp64d
- /lib64/lp64
+ - /lib32/ilp32d
+ - /lib32/ilp32
- /lib (only ld.so)
so this will add all of those paths.
@@ -49,9 +51,16 @@
do \
{ \
size_t len = strlen (dir); \
- char path[len + 9]; \
+ char path[len + 10]; \
memcpy (path, dir, len + 1); \
- if (len >= 12 && ! memcmp(path + len - 12, "/lib64/lp64d", 12)) \
+ if (len >= 13 && ! memcmp(path + len - 13, "/lib32/ilp32d", 13)) \
+ { \
+ len -= 9; \
+ path[len] = '\0'; \
+ } \
+ if (len >= 12 \
+ && (! memcmp(path + len - 12, "/lib32/ilp32", 12) \
+ || ! memcmp(path + len - 12, "/lib64/lp64d", 12))) \
{ \
len -= 8; \
path[len] = '\0'; \
@@ -64,6 +73,10 @@
add_dir (path); \
if (len >= 4 && ! memcmp(path + len - 4, "/lib", 4)) \
{ \
+ memcpy (path + len, "32/ilp32d", 10); \
+ add_dir (path); \
+ memcpy (path + len, "32/ilp32", 9); \
+ add_dir (path); \
memcpy (path + len, "64/lp64d", 9); \
add_dir (path); \
memcpy (path + len, "64/lp64", 8); \
--
2.22.0