Message ID | 0afac7b4aa891fae06fccdef5f85d676747e7fa8.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: > diff --git a/sysdeps/unix/sysv/linux/riscv/dl-cache.h b/sysdeps/unix/sysv/linux/riscv/dl-cache.h > index 331e6015f4..d2adfbc301 100644 > --- a/sysdeps/unix/sysv/linux/riscv/dl-cache.h > +++ b/sysdeps/unix/sysv/linux/riscv/dl-cache.h > @@ -31,7 +31,7 @@ > ((flags) == _DL_CACHE_DEFAULT_ID) > > /* If given a path to one of our library directories, adds every library > - directory via add_dir (), otherwise just adds the giver directory. On > + directory via add_dir (), otherwise just adds the given directory. On > RISC-V, libraries can be found in paths ending in: > - /lib64/lp64d > - /lib64/lp64 > @@ -41,15 +41,16 @@ > so this will add all of those paths. > > According to Joseph Myers: > - My reasoning for that would be: generic autoconf-configured (etc.) > - software may only know about using the lib directory, so you want the > - lib directory to be searched regardless of the ABI - but it's also > - useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all > - architectures and have that automatically imply /usr/local/lib64/lp64d > - etc. so that libraries can be found that come from software that does > - use the ABI-specific directories. */ > + My reasoning for that would be: generic autoconf-configured (etc.) > + software may only know about using the lib directory, so you want the > + lib directory to be searched regardless of the ABI - but it's also > + useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all > + architectures and have that automatically imply /usr/local/lib64/lp64d > + etc. so that libraries can be found that come from software that does > + use the ABI-specific directories. */ > + > #define add_system_dir(dir) \ > - do \ > + do \ Hmm, wrong patch submitted (06/19 from v3, which I asked to drop, rather than 07/19)? Also there's no 6/18 in the series, so something surely went wrong. NB I suggest splitting any fixes for typos or formatting anomalies off for a later submission unless made on a line that is changed for another reason anyway. Such changes can usually be committed as obvious right away with a note sent to the list and may be ignored for any backports. Maciej
diff --git a/sysdeps/unix/sysv/linux/riscv/dl-cache.h b/sysdeps/unix/sysv/linux/riscv/dl-cache.h index 331e6015f4..d2adfbc301 100644 --- a/sysdeps/unix/sysv/linux/riscv/dl-cache.h +++ b/sysdeps/unix/sysv/linux/riscv/dl-cache.h @@ -31,7 +31,7 @@ ((flags) == _DL_CACHE_DEFAULT_ID) /* If given a path to one of our library directories, adds every library - directory via add_dir (), otherwise just adds the giver directory. On + directory via add_dir (), otherwise just adds the given directory. On RISC-V, libraries can be found in paths ending in: - /lib64/lp64d - /lib64/lp64 @@ -41,15 +41,16 @@ so this will add all of those paths. According to Joseph Myers: - My reasoning for that would be: generic autoconf-configured (etc.) - software may only know about using the lib directory, so you want the - lib directory to be searched regardless of the ABI - but it's also - useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all - architectures and have that automatically imply /usr/local/lib64/lp64d - etc. so that libraries can be found that come from software that does - use the ABI-specific directories. */ + My reasoning for that would be: generic autoconf-configured (etc.) + software may only know about using the lib directory, so you want the + lib directory to be searched regardless of the ABI - but it's also + useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all + architectures and have that automatically imply /usr/local/lib64/lp64d + etc. so that libraries can be found that come from software that does + use the ABI-specific directories. */ + #define add_system_dir(dir) \ - do \ + do \ { \ static const char* lib_dirs[] = { \ "/lib64/lp64d", \
Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- sysdeps/unix/sysv/linux/riscv/dl-cache.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)