From ba1cafea1616d6046ae54a1ed59540867ff647b9 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 14 Nov 2016 23:34:54 +0000 Subject: 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. --- sysdeps/unix/sysv/linux/tile/tilegx/configure | 17 +++++++++++++++++ sysdeps/unix/sysv/linux/tile/tilegx/configure.ac | 6 ++++++ 2 files changed, 23 insertions(+) (limited to 'sysdeps') 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 -- cgit 1.4.1