about summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2013-02-08 19:17:58 +0100
committerAndreas Schwab <schwab@suse.de>2013-03-14 10:00:26 +0100
commitcbc105f8b590fa5f5343160ef0a33dde6366c427 (patch)
tree74bf310a2ca348e52cd981e2f9c8556ba9d5fc3e /ports
parent0409959c86f6840510851a851a1588677a2e537b (diff)
downloadglibc-cbc105f8b590fa5f5343160ef0a33dde6366c427.tar.gz
glibc-cbc105f8b590fa5f5343160ef0a33dde6366c427.tar.xz
glibc-cbc105f8b590fa5f5343160ef0a33dde6366c427.zip
aarch64: use lib64 as default lib and slib directory
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.aarch646
-rw-r--r--ports/sysdeps/unix/sysv/linux/aarch64/configure13
-rw-r--r--ports/sysdeps/unix/sysv/linux/aarch64/configure.in12
3 files changed, 31 insertions, 0 deletions
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index 16b9b8e631..e8365091df 100644
--- a/ports/ChangeLog.aarch64
+++ b/ports/ChangeLog.aarch64
@@ -1,3 +1,9 @@
+2013-03-14  Andreas Schwab  <schwab@suse.de>
+
+	* sysdeps/unix/sysv/linux/aarch64/configure.in: Set
+	libc_cv_slibdir, libdir and libc_cv_localedir.
+	* sysdeps/unix/sysv/linux/aarch64/configure: Regenerate.
+
 2013-03-11  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #15234]
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure b/ports/sysdeps/unix/sysv/linux/aarch64/configure
index 5a22126fe8..04b6c81b67 100644
--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure
@@ -1,3 +1,16 @@
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
 
 arch_minimum_kernel=3.7.0
+
+test -n "$libc_cv_slibdir" ||
+case "$prefix" in
+  /usr | /usr/)
+    libc_cv_slibdir="/lib64"
+    if test "$libdir" = '${exec_prefix}/lib'; then
+      libdir='${exec_prefix}/lib64';
+      # Locale data can be shared between 32bit and 64bit libraries
+      libc_cv_localedir='${exec_prefix}/lib/locale'
+    fi
+    ;;
+esac
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
index d1995d486d..6596a15115 100644
--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
@@ -2,3 +2,15 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
 
 arch_minimum_kernel=3.7.0
+
+test -n "$libc_cv_slibdir" ||
+case "$prefix" in
+  /usr | /usr/)
+    libc_cv_slibdir="/lib64"
+    if test "$libdir" = '${exec_prefix}/lib'; then
+      libdir='${exec_prefix}/lib64';
+      # Locale data can be shared between 32bit and 64bit libraries
+      libc_cv_localedir='${exec_prefix}/lib/locale'
+    fi
+    ;;
+esac