00db10
#
00db10
# All patches are from upstream and provide support for correct lib
00db10
# directory for AArch64.
00db10
#
00db10
# From 37bf2f1f983e37c0d87a1e34cd3d8a228ead5e16 Mon Sep 17 00:00:00 2001
00db10
# From: Andreas Schwab <schwab@suse.de>
00db10
# Date: Thu, 4 Apr 2013 12:22:22 -0400
00db10
# Subject: [PATCH 2/4] Add support for rtld directory different from slib
00db10
#  directory
00db10
# 
00db10
# ---
00db10
#  ChangeLog         | 15 +++++++++++++++
00db10
#  Makeconfig        | 10 ++++++++--
00db10
#  Makerules         |  4 ++--
00db10
#  config.make.in    |  1 +
00db10
#  configure         |  2 ++
00db10
#  configure.in      |  1 +
00db10
#  elf/Makefile      | 11 ++++++-----
00db10
#  scripts/rellns-sh | 17 +++++++++++++++--
00db10
#  8 files changed, 50 insertions(+), 11 deletions(-)
00db10
# 
00db10
# From 937dd2d4a5da7d51b87261b037e22dfca05face7 Mon Sep 17 00:00:00 2001
00db10
# From: Marcus Shawcroft <marcus.shawcroft@linaro.org>
00db10
# Date: Thu, 4 Apr 2013 12:26:55 -0400
00db10
# Subject: [PATCH 4/4] Correct missed use of $(rtlddir).
00db10
# 
00db10
# ---
00db10
#  ChangeLog | 4 ++++
00db10
#  Makerules | 2 +-
00db10
#  2 files changed, 5 insertions(+), 1 deletion(-)
00db10
# 
00db10
# From bcce68c6dc678b443e7f140d664ba1fa49c0ceaa Mon Sep 17 00:00:00 2001
00db10
# From: Andreas Schwab <schwab@suse.de>
00db10
# Date: Thu, 4 Apr 2013 12:23:43 -0400
00db10
# Subject: [PATCH 3/4] aarch64: Move rtld link to /lib
00db10
# 
00db10
# ---
00db10
#  ports/ChangeLog.aarch64                            | 6 ++++++
00db10
#  ports/sysdeps/unix/sysv/linux/aarch64/configure    | 1 +
00db10
#  ports/sysdeps/unix/sysv/linux/aarch64/configure.in | 1 +
00db10
#  3 files changed, 8 insertions(+)
00db10
# 
00db10
# From 05bc48a20b8c20574bc59a048750f0dd77fd6e23 Mon Sep 17 00:00:00 2001
00db10
# From: Andreas Schwab <schwab@suse.de>
00db10
# Date: Thu, 4 Apr 2013 12:02:53 -0400
00db10
# Subject: [PATCH 1/4] aarch64: use lib64 as default lib and slib directory
00db10
# 
00db10
# ---
00db10
#  ports/ChangeLog.aarch64                            |  6 ++++++
00db10
#  ports/sysdeps/unix/sysv/linux/aarch64/configure    | 13 +++++++++++++
00db10
#  ports/sysdeps/unix/sysv/linux/aarch64/configure.in | 12 ++++++++++++
00db10
#  3 files changed, 31 insertions(+)
00db10
# 
00db10
# commit 446737706c186b33529a2c07fcb6f0cc10b2d1ea
00db10
# Author: Andreas Schwab <schwab@suse.de>
00db10
# Date:   Tue Mar 19 10:13:46 2013 +0100
00db10
#
00db10
#    s390x: Move rtld link to /lib
00db10
#
00db10
diff -urN glibc-2.17-c758a686/config.make.in glibc-2.17-c758a686/config.make.in
00db10
--- glibc-2.17-c758a686/config.make.in	2013-10-28 10:56:39.996320904 -0400
00db10
+++ glibc-2.17-c758a686/config.make.in	2013-10-28 10:56:57.773317467 -0400
00db10
@@ -11,6 +11,7 @@
00db10
 datadir = @datadir@
00db10
 libdir = @libdir@
00db10
 slibdir = @libc_cv_slibdir@
00db10
+rtlddir = @libc_cv_rtlddir@
00db10
 localedir = @libc_cv_localedir@
00db10
 sysconfdir = @libc_cv_sysconfdir@
00db10
 libexecdir = @libexecdir@
00db10
diff -urN glibc-2.17-c758a686/configure glibc-2.17-c758a686/configure
00db10
--- glibc-2.17-c758a686/configure	2013-10-28 10:56:39.935320916 -0400
00db10
+++ glibc-2.17-c758a686/configure	2013-10-28 10:56:57.775317467 -0400
00db10
@@ -594,6 +594,7 @@
00db10
 libc_cv_localstatedir
00db10
 libc_cv_sysconfdir
00db10
 libc_cv_localedir
00db10
+libc_cv_rtlddir
00db10
 libc_cv_slibdir
00db10
 old_glibc_headers
00db10
 use_nscd
00db10
@@ -7600,6 +7601,7 @@
00db10
 
00db10
 
00db10
 
00db10
+
00db10
 
00db10
 
00db10
 
00db10
diff -urN glibc-2.17-c758a686/configure.in glibc-2.17-c758a686/configure.in
00db10
--- glibc-2.17-c758a686/configure.in	2013-10-28 10:56:39.902320923 -0400
00db10
+++ glibc-2.17-c758a686/configure.in	2013-10-28 10:56:57.776317467 -0400
00db10
@@ -2127,6 +2127,7 @@
00db10
 AC_SUBST(old_glibc_headers)
00db10
 
00db10
 AC_SUBST(libc_cv_slibdir)
00db10
+AC_SUBST(libc_cv_rtlddir)
00db10
 AC_SUBST(libc_cv_localedir)
00db10
 AC_SUBST(libc_cv_sysconfdir)
00db10
 AC_SUBST(libc_cv_localstatedir)
00db10
diff -urN glibc-2.17-c758a686/elf/Makefile glibc-2.17-c758a686/elf/Makefile
00db10
--- glibc-2.17-c758a686/elf/Makefile	2013-10-28 10:56:40.127320879 -0400
00db10
+++ glibc-2.17-c758a686/elf/Makefile	2013-10-28 10:56:57.776317467 -0400
00db10
@@ -66,7 +66,7 @@
00db10
 ifeq (yes,$(build-shared))
00db10
 extra-objs	= $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
00db10
 generated	+= librtld.os dl-allobjs.os ld.so ldd
00db10
-install-others	= $(inst_slibdir)/$(rtld-installed-name)
00db10
+install-others = $(inst_rtlddir)/$(rtld-installed-name)
00db10
 install-bin-script = ldd
00db10
 endif
00db10
 
00db10
@@ -341,7 +341,7 @@
00db10
 	  | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
00db10
 
00db10
 # interp.c exists just to get this string into the libraries.
00db10
-CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \
00db10
+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
00db10
 		  -DNOT_IN_libc=1
00db10
 $(objpfx)interp.os: $(common-objpfx)config.make
00db10
 
00db10
@@ -373,18 +373,19 @@
00db10
 	$(make-target-directory)
00db10
 	$(do-install-program)
00db10
 
00db10
-$(inst_slibdir)/$(rtld-installed-name): \
00db10
+$(inst_rtlddir)/$(rtld-installed-name): \
00db10
   $(inst_slibdir)/$(rtld-version-installed-name) \
00db10
   $(inst_slibdir)/libc-$(version).so
00db10
+	$(make-target-directory)
00db10
 	$(make-shlib-link)
00db10
 
00db10
 # Special target called by parent to install just the dynamic linker.
00db10
 .PHONY: ldso_install
00db10
-ldso_install: $(inst_slibdir)/$(rtld-installed-name)
00db10
+ldso_install: $(inst_rtlddir)/$(rtld-installed-name)
00db10
 endif
00db10
 
00db10
 
00db10
-common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
00db10
+common-ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
00db10
 		     -e 's%@VERSION@%$(version)%g' \
00db10
 		     -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
00db10
 		     -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g'
00db10
diff -urN glibc-2.17-c758a686/Makeconfig glibc-2.17-c758a686/Makeconfig
00db10
--- glibc-2.17-c758a686/Makeconfig	2013-10-28 10:56:40.434320820 -0400
00db10
+++ glibc-2.17-c758a686/Makeconfig	2013-10-28 10:56:57.772317467 -0400
00db10
@@ -148,12 +148,18 @@
00db10
 endif
00db10
 inst_libdir = $(install_root)$(libdir)
00db10
 
00db10
-# Where to install the shared library and dynamic linker.
00db10
+# Where to install the shared library.
00db10
 ifndef slibdir
00db10
 slibdir = $(exec_prefix)/lib
00db10
 endif
00db10
 inst_slibdir = $(install_root)$(slibdir)
00db10
 
00db10
+# Where to install the dynamic linker.
00db10
+ifndef rtlddir
00db10
+rtlddir = $(slibdir)
00db10
+endif
00db10
+inst_rtlddir = $(install_root)$(rtlddir)
00db10
+
00db10
 # Prefix to put on files installed in $(libdir).  For libraries `libNAME.a',
00db10
 # the prefix is spliced between `lib' and the name, so the linker switch
00db10
 # `-l$(libprefix)NAME' finds the library; for other files the prefix is
00db10
@@ -443,7 +449,7 @@
00db10
 endif
00db10
 ifndef config-LDFLAGS
00db10
 ifeq (yes,$(build-shared))
00db10
-config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
00db10
+config-LDFLAGS = -Wl,-dynamic-linker=$(rtlddir)/$(rtld-installed-name)
00db10
 endif
00db10
 endif
00db10
 ifndef link-libc
00db10
diff -urN glibc-2.17-c758a686/Makerules glibc-2.17-c758a686/Makerules
00db10
--- glibc-2.17-c758a686/Makerules	2013-10-28 10:56:39.928320918 -0400
00db10
+++ glibc-2.17-c758a686/Makerules	2013-10-28 10:56:57.777317467 -0400
00db10
@@ -873,7 +873,7 @@
00db10
 symbolic-link-prog := $(common-objpfx)elf/sln
00db10
 symbolic-link-list := $(common-objpfx)elf/symlink.list
00db10
 define make-shlib-link
00db10
-echo $(<F) $@ >> $(symbolic-link-list)
00db10
+echo `$(..)scripts/rellns-sh -p $< $@` $@ >> $(symbolic-link-list)
00db10
 endef
00db10
 else # cross-compiling
00db10
 # We need a definition that can be used by elf/Makefile's install rules.
00db10
@@ -883,7 +883,7 @@
00db10
 ifndef make-shlib-link
00db10
 define make-shlib-link
00db10
 rm -f $@
00db10
-$(LN_S) $(
00db10
+$(LN_S) `$(..)scripts/rellns-sh -p $< $@` $@
00db10
 endef
00db10
 endif
00db10
 
00db10
@@ -937,7 +937,7 @@
00db10
 	 cat $<; \
00db10
 	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
00db10
 	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
00db10
-	      ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
00db10
+	      ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
00db10
 	) > $@.new
00db10
 	mv -f $@.new $@
00db10
 
00db10
diff -urN glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure
00db10
--- glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure	2013-10-28 10:56:39.873320928 -0400
00db10
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure	2013-10-28 10:57:26.270311964 -0400
00db10
@@ -1,3 +1,17 @@
00db10
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
00db10
+ # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
00db10
 
00db10
 arch_minimum_kernel=3.7.0
00db10
+
00db10
+test -n "$libc_cv_slibdir" ||
00db10
+case "$prefix" in
00db10
+  /usr | /usr/)
00db10
+    libc_cv_slibdir="/lib64"
00db10
+    libc_cv_rtlddir="/lib"
00db10
+    if test "$libdir" = '${exec_prefix}/lib'; then
00db10
+      libdir='${exec_prefix}/lib64';
00db10
+      # Locale data can be shared between 32bit and 64bit libraries
00db10
+      libc_cv_localedir='${exec_prefix}/lib/locale'
00db10
+    fi
00db10
+    ;;
00db10
+esac
00db10
diff -urN glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure.in glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
00db10
--- glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure.in	2013-10-28 10:56:39.873320928 -0400
00db10
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/configure.in	2013-10-28 10:57:49.162307556 -0400
00db10
@@ -2,3 +2,16 @@
00db10
 # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
00db10
 
00db10
 arch_minimum_kernel=3.7.0
00db10
+
00db10
+test -n "$libc_cv_slibdir" ||
00db10
+case "$prefix" in
00db10
+  /usr | /usr/)
00db10
+    libc_cv_slibdir="/lib64"
00db10
+    libc_cv_rtlddir="/lib"
00db10
+    if test "$libdir" = '${exec_prefix}/lib'; then
00db10
+      libdir='${exec_prefix}/lib64';
00db10
+      # Locale data can be shared between 32bit and 64bit libraries
00db10
+      libc_cv_localedir='${exec_prefix}/lib/locale'
00db10
+    fi
00db10
+    ;;
00db10
+esac
00db10
diff -urN glibc-2.17-c758a686/scripts/rellns-sh glibc-2.17-c758a686/scripts/rellns-sh
00db10
--- glibc-2.17-c758a686/scripts/rellns-sh	2013-10-28 10:56:40.081320888 -0400
00db10
+++ glibc-2.17-c758a686/scripts/rellns-sh	2013-10-28 10:56:57.776317467 -0400
00db10
@@ -16,8 +16,17 @@
00db10
 # You should have received a copy of the GNU General Public License
00db10
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
00db10
 
00db10
+# With -p, instead of creating the link print the computed relative link
00db10
+# name.
00db10
+do_print=false
00db10
+case $1 in
00db10
+  -p)
00db10
+    do_print=true
00db10
+    shift
00db10
+    ;;
00db10
+esac
00db10
 if test $# -ne 2; then
00db10
-  echo "Usage: rellns SOURCE DEST" >&2
00db10
+  echo "Usage: rellns [-p] SOURCE DEST" >&2
00db10
   exit 1
00db10
 fi
00db10
 
00db10
@@ -70,4 +79,8 @@
00db10
   from=`echo $from | sed 's%^[^/]*/*%%'`
00db10
 done
00db10
 
00db10
-ln -s $rfrom$to $2
00db10
+if $do_print; then
00db10
+  echo "$rfrom$to"
00db10
+else
00db10
+  ln -s $rfrom$to $2
00db10
+fi
00db10
diff --git glibc-2.17-c758a686/sysdeps/gnu/configure glibc-2.17-c758a686/sysdeps/gnu/configure
00db10
index 26327ca..70aaa90 100644
00db10
--- glibc-2.17-c758a686/sysdeps/gnu/configure
00db10
+++ glibc-2.17-c758a686/sysdeps/gnu/configure
00db10
@@ -9,12 +9,17 @@
00db10
 case "$prefix" in
00db10
 /usr | /usr/)
00db10
   # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
00db10
-  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
00db10
-  # and libc_cv_localedir.
00db10
+  # Allow earlier configure scripts to handle libc_cv_slibdir,
00db10
+  # libc_cv_rtlddir, libdir, and libc_cv_localedir.
00db10
   test -n "$libc_cv_slibdir" || \
00db10
   case $machine in
00db10
   sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
00db10
     libc_cv_slibdir=/lib64
00db10
+    case $machine in
00db10
+    s390/s390-64)
00db10
+      libc_cv_rtlddir=/lib
00db10
+      ;;
00db10
+    esac
00db10
     if test "$libdir" = '${exec_prefix}/lib'; then
00db10
       libdir='${exec_prefix}/lib64';
00db10
       # Locale data can be shared between 32bit and 64bit libraries
00db10
diff --git glibc-2.17-c758a686/sysdeps/gnu/configure.in glibc-2.17-c758a686/sysdeps/gnu/configure.in
00db10
index b8fd74c..ce251df 100644
00db10
--- glibc-2.17-c758a686/sysdeps/gnu/configure.in
00db10
+++ glibc-2.17-c758a686/sysdeps/gnu/configure.in
00db10
@@ -9,12 +9,17 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
00db10
 case "$prefix" in
00db10
 /usr | /usr/)
00db10
   # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
00db10
-  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
00db10
-  # and libc_cv_localedir.
00db10
+  # Allow earlier configure scripts to handle libc_cv_slibdir,
00db10
+  # libc_cv_rtlddir, libdir, and libc_cv_localedir.
00db10
   test -n "$libc_cv_slibdir" || \
00db10
   case $machine in
00db10
   sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
00db10
     libc_cv_slibdir=/lib64
00db10
+    case $machine in
00db10
+    s390/s390-64)
00db10
+      libc_cv_rtlddir=/lib
00db10
+      ;;
00db10
+    esac
00db10
     if test "$libdir" = '${exec_prefix}/lib'; then
00db10
       libdir='${exec_prefix}/lib64';
00db10
       # Locale data can be shared between 32bit and 64bit libraries