[binutils/f19] Fix library search paths for 64-bit aarch64 linux targets. Resolves: #950098

[Nicholas Clifton]

commit fe37c4ca3bb401041c432717100fca8c5403cda7
Author: Nick Clifton <nickc at redhat.com>
Date:   Tue Apr 9 17:32:09 2013 +0100

    Fix library search paths for 64-bit aarch64 linux targets.
    Resolves: #950098

 binutils-2.23.52.0.1-aarch64-lib64.patch |   18 ++++++++++++++++++
 binutils.spec                            |    7 ++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/binutils-2.23.52.0.1-aarch64-lib64.patch b/binutils-2.23.52.0.1-aarch64-lib64.patch
new file mode 100644
index 0000000..812a3ac
--- /dev/null
+++ b/binutils-2.23.52.0.1-aarch64-lib64.patch
@@ -0,0 +1,18 @@
+*** ../binutils-2.23.52.0.1.orig/ld/emulparams/aarch64linux.sh	2013-04-09 17:12:43.108529894 +0100
+--- ld/emulparams/aarch64linux.sh	2013-04-09 17:15:04.382533810 +0100
+*************** OTHER_SECTIONS='.note.gnu.arm.ident 0 :
+*** 34,36 ****
+--- 34,46 ----
+  ATTRS_SECTIONS='.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }'
+  # Ensure each PLT entry is aligned to a cache line.
+  PLT=".plt          ${RELOCATING-0} : ALIGN(16) { *(.plt)${IREL_IN_PLT+ *(.iplt)} }"
++ 
++ # Linux modifies the default library search path to first include
++ # a 64-bit specific directory.
++ case "$target" in
++   aarch64*-linux*)
++     case "$EMULATION_NAME" in
++       aarch64linux*) LIBPATH_SUFFIX=64 ;;
++     esac
++     ;;
++ esac
diff --git a/binutils.spec b/binutils.spec
index ddf1b8a..42399a5 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.23.52.0.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -46,6 +46,8 @@ Patch11: binutils-2.23.52.0.1-64-bit-thin-archives.patch
 Patch12: binutils-2.23.52.0.1-as-doc-texinfo-fixes.patch
 # Revert HJ's patch for  PR15149.  This stops the reporting of weak DT_NEEDED symbols.
 Patch13: binutils-2.23.52.0.1-revert-pr15149.patch
+# Fix search paths for 64-bit linux aarch64 targets.
+Patch14: binutils-2.23.52.0.1-aarch64-lib64.patch
 
 Provides: bundled(libiberty)
 
@@ -456,6 +458,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Tue Apr 09 2013 Nick Clifton <nickc at redhat.com> - 2.23.52.0.1-7
+- Fix library search paths for 64-bit aarch64 linux targets.  (#950098)
+
 * Wed Mar 13 2013 Nick Clifton <nickc at redhat.com> - 2.23.52.0.1-6
 - Add explicit requirement of /usr/bin/pod2man.  (#920545)