From 59348f5ad7dbb8b9cae96a6b3d633b853b4102b6 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Sun, 3 Nov 2019 21:26:25 +0200
Subject: [PATCH] binutils: use new library search paths & ld.so location

---
 components/developer/binutils/binutils.p5m            |  4 ++--
 .../patches/ld.emulparams.elf_i386_ldso.sh.patch      | 10 ++++++++++
 .../binutils/patches/ld.emulparams.x86_64.sh.patch    | 19 ++++++++++---------
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 components/developer/binutils/patches/ld.emulparams.elf_i386_ldso.sh.patch

diff --git a/components/developer/binutils/binutils.p5m b/components/developer/binutils/binutils.p5m
index 0605ed5c6..6d02c8b43 100644
--- a/components/developer/binutils/binutils.p5m
+++ b/components/developer/binutils/binutils.p5m
@@ -75,8 +75,6 @@ file path=usr/include/diagnostics.h
 file path=usr/include/dis-asm.h
 file path=usr/include/plugin-api.h
 file path=usr/include/symcat.h
-file path=usr/lib/$(MACH64)/libbfd.a
-file path=usr/lib/$(MACH64)/libopcodes.a
 file path=usr/lib/ldscripts/elf_i386.x
 file path=usr/lib/ldscripts/elf_i386.xbn
 file path=usr/lib/ldscripts/elf_i386.xc
@@ -127,6 +125,8 @@ file path=usr/lib/ldscripts/elf_x86_64.xc
 file path=usr/lib/ldscripts/elf_x86_64.xce
 file path=usr/lib/ldscripts/elf_x86_64.xd
 file path=usr/lib/ldscripts/elf_x86_64.xdc
+file path=usr/lib/libbfd.a
+file path=usr/lib/libopcodes.a
 file path=usr/share/info/as.info
 file path=usr/share/info/bfd.info
 file path=usr/share/info/binutils.info
diff --git a/components/developer/binutils/patches/ld.emulparams.elf_i386_ldso.sh.patch b/components/developer/binutils/patches/ld.emulparams.elf_i386_ldso.sh.patch
new file mode 100644
index 000000000..acbf9086d
--- /dev/null
+++ b/components/developer/binutils/patches/ld.emulparams.elf_i386_ldso.sh.patch
@@ -0,0 +1,10 @@
+--- binutils-2.32/ld/emulparams/elf_i386_ldso.sh.orig	Sun Nov  3 21:32:16 2019
++++ binutils-2.32/ld/emulparams/elf_i386_ldso.sh	Sun Nov  3 21:33:25 2019
+@@ -11,5 +11,6 @@
+ MACHINE=
+ TEMPLATE_NAME=elf32
+ GENERATE_SHLIB_SCRIPT=yes
+-ELF_INTERPRETER_NAME=\"/usr/lib/ld.so.1\"
++ELF_INTERPRETER_NAME=\"/usr/libexec/i386/ld.so\"
++LIBPATH_SUFFIX=/i386
+ NO_SMALL_DATA=yes
diff --git a/components/developer/binutils/patches/ld.emulparams.x86_64.sh.patch b/components/developer/binutils/patches/ld.emulparams.x86_64.sh.patch
index bacfe9409..c3bf6034c 100644
--- a/components/developer/binutils/patches/ld.emulparams.x86_64.sh.patch
+++ b/components/developer/binutils/patches/ld.emulparams.x86_64.sh.patch
@@ -1,11 +1,12 @@
---- a/ld/emulparams/elf_x86_64.sh	Sun May  5 11:44:19 2019
-+++ b/ld/emulparams/elf_x86_64.sh	Sun May  5 11:44:51 2019
-@@ -54,7 +54,7 @@
- 	;;
-     esac
-     ;;
--  *-*-solaris2*)
-+  *-*-solaris2* | *-*-unleashed*)
+--- binutils-2.32/ld/emulparams/elf_x86_64.sh.~1~	Sat Jan 19 18:01:33 2019
++++ binutils-2.32/ld/emulparams/elf_x86_64.sh	Sun Nov  3 21:17:52 2019
+@@ -57,5 +57,8 @@
+   *-*-solaris2*)
      LIBPATH_SUFFIX=/amd64
      ELF_INTERPRETER_NAME=\"/lib/amd64/ld.so.1\"
-   ;;
+-  ;;
++    ;;
++  *-*-unleashed*)
++    ELF_INTERPRETER_NAME=\"/usr/libexec/ld.so\"
++    ;;
+ esac
-- 
2.11.4.GIT