about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/tile/tilegx
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-11-14 23:34:54 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-11-14 23:34:54 +0000
commitba1cafea1616d6046ae54a1ed59540867ff647b9 (patch)
tree1cdd533ecc31f80184df75f4c96ed03229fe3b12 /sysdeps/unix/sysv/linux/tile/tilegx
parente6502dfb8894b4790004a5d58c519c7f33966180 (diff)
downloadglibc-ba1cafea1616d6046ae54a1ed59540867ff647b9.tar.gz
glibc-ba1cafea1616d6046ae54a1ed59540867ff647b9.tar.xz
glibc-ba1cafea1616d6046ae54a1ed59540867ff647b9.zip
Make tilegx32 install libraries in lib32 directories.
This patch makes tilegx32 install libraries in lib32 directories,
matching what GCC expects and avoiding conflict with 64-bit libraries
installed in lib directories.

Tested (compilation only) for tilegx (32-bit and 64-bit, BE and LE,
GCC 5).

	* sysdeps/unix/sysv/linux/tile/tilegx/configure.ac: Use
	LIBC_SLIBDIR_RTLDDIR for tilegx32.
	* sysdeps/unix/sysv/linux/tile/tilegx/configure: Regenerated.
Diffstat (limited to 'sysdeps/unix/sysv/linux/tile/tilegx')
-rw-r--r--sysdeps/unix/sysv/linux/tile/tilegx/configure17
-rw-r--r--sysdeps/unix/sysv/linux/tile/tilegx/configure.ac6
2 files changed, 23 insertions, 0 deletions
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