This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-370-gba1cafe
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Nov 2016 23:35:18 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-370-gba1cafe
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ba1cafea1616d6046ae54a1ed59540867ff647b9 (commit)
from e6502dfb8894b4790004a5d58c519c7f33966180 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ba1cafea1616d6046ae54a1ed59540867ff647b9
commit ba1cafea1616d6046ae54a1ed59540867ff647b9
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Nov 14 23:34:54 2016 +0000
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.
diff --git a/ChangeLog b/ChangeLog
index 737732c..8aee2af 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 0a6a63f..36e42e0 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 87d86bd..baca1f6 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/tile/tilegx/configure | 17 +++++++++++++++++
sysdeps/unix/sysv/linux/tile/tilegx/configure.ac | 6 ++++++
3 files changed, 29 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources