summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/tile/tilegx/configure17
-rw-r--r--sysdeps/unix/sysv/linux/tile/tilegx/configure.ac6
3 files changed, 29 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 737732cb7d..8aee2af571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-14 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/tile/tilegx/configure.ac: Use
+ LIBC_SLIBDIR_RTLDDIR for tilegx32.
+ * sysdeps/unix/sysv/linux/tile/tilegx/configure: Regenerated.
+
2016-11-14 Zack Weinberg <zackw@panix.com>
* sunrpc/Makefile (rpcgen-tests): Delete the .out file before
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/configure b/sysdeps/unix/sysv/linux/tile/tilegx/configure
index 0a6a63ff99..36e42e07e9 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/configure
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/configure
@@ -2,3 +2,20 @@
# Local configure fragment for sysdeps/unix/sysv/linux/tile/tilegx
ldd_rewrite_script=$dir/ldd-rewrite.sed
+
+case $machine in
+tile/tilegx/tilegx32)
+ test -n "$libc_cv_slibdir" ||
+case "$prefix" in
+/usr | /usr/)
+ libc_cv_slibdir=/lib32
+ libc_cv_rtlddir=/lib32
+ if test "$libdir" = '${exec_prefix}/lib'; then
+ libdir='${exec_prefix}/lib32';
+ # Locale data can be shared between 32-bit and 64-bit libraries.
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
+ fi
+ ;;
+esac
+ ;;
+esac
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac b/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac
index 87d86bd4c0..baca1f62a8 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac
@@ -2,3 +2,9 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/unix/sysv/linux/tile/tilegx
ldd_rewrite_script=$dir/ldd-rewrite.sed
+
+case $machine in
+tile/tilegx/tilegx32)
+ LIBC_SLIBDIR_RTLDDIR([lib32], [lib32])
+ ;;
+esac