From db88abb64a139bbf62c565ffcb84adc31395a498 Mon Sep 17 00:00:00 2001
From: kenmays <maybird1776@yahoo.com>
Date: Fri, 26 Oct 2018 08:24:30 -0700
Subject: [PATCH] Binutils: enable x86 arch for version 2.31.1. (#3250)

---
 sys-devel/binutils/binutils-2.31.1.recipe      |  4 ++--
 .../binutils/patches/binutils-2.31.1.patchset  | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sys-devel/binutils/binutils-2.31.1.recipe b/sys-devel/binutils/binutils-2.31.1.recipe
index 5951d4857..e1a214504 100644
--- a/sys-devel/binutils/binutils-2.31.1.recipe
+++ b/sys-devel/binutils/binutils-2.31.1.recipe
@@ -34,8 +34,8 @@ SOURCE_DIR="binutils-$binutilsVersion"
 PATCHES="binutils-$portVersion.patchset"
 
 # disabled on x86: see https://github.com/haikuports/haikuports/issues/1750
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm ?ppc"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	binutils$secondaryArchSuffix = $portVersion compat >= 2.23
diff --git a/sys-devel/binutils/patches/binutils-2.31.1.patchset b/sys-devel/binutils/patches/binutils-2.31.1.patchset
index 02a49fe93..f1f026198 100644
--- a/sys-devel/binutils/patches/binutils-2.31.1.patchset
+++ b/sys-devel/binutils/patches/binutils-2.31.1.patchset
@@ -481,6 +481,13 @@ index b7eec77..692f1b4 100755
 -- 
 2.19.1
 
+
+From c368003d273be47f9f3cc1e16a156645beabfd0e Mon Sep 17 00:00:00 2001
+From: Ken Mays <kmays2000@gmail.com>
+Date: Wed, 10 Oct 2018 18:21:36 +0000
+Subject: Haiku patches for Binutils 2.31.1 - suite
+
+
 diff --git a/gas/config/te-beos.h b/gas/config/te-beos.h
 new file mode 100644
 index 0000000..23eea6a
@@ -517,7 +524,6 @@ index 0000000..23eea6a
 +#define LOCAL_LABELS_FB 1
 +
 +#include "obj-format.h"
-
 diff --git a/gas/config/te-haiku.h b/gas/config/te-haiku.h
 new file mode 100644
 index 0000000..5578046
@@ -554,7 +560,6 @@ index 0000000..5578046
 +#define LOCAL_LABELS_FB 1
 +
 +#include "obj-format.h"
-
 diff --git a/ld/emulparams/armelf_haiku.sh b/ld/emulparams/armelf_haiku.sh
 new file mode 100644
 index 0000000..9dcdf54
@@ -587,7 +592,6 @@ index 0000000..9dcdf54
 +NO_SMALL_DATA=yes
 +
 +. ${srcdir}/emulparams/elf_haiku.sh
-
 diff --git a/ld/emulparams/elf32ppchaiku.sh b/ld/emulparams/elf32ppchaiku.sh
 new file mode 100644
 index 0000000..547e5c8
@@ -608,7 +612,6 @@ index 0000000..401eedc
 +++ b/ld/emulparams/elf_haiku.sh
 @@ -0,0 +1 @@
 +ELF_INTERPRETER_NAME=\"/system/runtime_loader\"
-
 diff --git a/ld/emulparams/elf_i386_haiku.sh b/ld/emulparams/elf_i386_haiku.sh
 new file mode 100644
 index 0000000..b70da86
@@ -627,7 +630,6 @@ index 0000000..b70da86
 +GENERATE_SHLIB_SCRIPT=yes
 +NO_SMALL_DATA=yes
 +. ${srcdir}/emulparams/elf_haiku.sh
-
 diff --git a/ld/emulparams/elf_mipsel_haiku.sh b/ld/emulparams/elf_mipsel_haiku.sh
 new file mode 100644
 index 0000000..ab38e23
@@ -637,7 +639,6 @@ index 0000000..ab38e23
 +. ${srcdir}/emulparams/elf32lmip.sh
 +. ${srcdir}/emulparams/elf_haiku.sh
 +
-
 diff --git a/ld/emulparams/elf_x86_64_haiku.sh b/ld/emulparams/elf_x86_64_haiku.sh
 new file mode 100644
 index 0000000..f049559
@@ -647,7 +648,7 @@ index 0000000..f049559
 +. ${srcdir}/emulparams/elf_x86_64.sh
 +. ${srcdir}/emulparams/elf_haiku.sh
 diff --git a/libtool.m4 b/libtool.m4
-index 24d13f3..84d70b8 100644
+index 4345300..1eda810 100644
 --- a/libtool.m4
 +++ b/libtool.m4
 @@ -2342,7 +2342,7 @@ haiku*)
@@ -660,4 +661,5 @@ index 24d13f3..84d70b8 100644
    ;;
  
 -- 
-2.13.1
+2.19.1
+