[PATCH] binutils: enable s390x/ppc64el on arm64 hosts

[Alex Bennée <alex.bennee@linaro.org>]

All of the release architectures should be able to build binaries for
the other release architectures. This is required for a number of
Binary-Indep packages in QEMU for example, see:

 #921458: dependancy on gcc-s390x-linux-gnu fails on non-x86 hosts
---
 debian/changelog | 6 ++++++
 debian/control   | 8 ++++----
 debian/rules     | 8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7db77a..46aafe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+binutils (2.31.1-8) unstable; urgency=medium
+
+  * Enable s390x and ppc64el cross packages on arm64
+
+ -- Alex Bennée <alex.bennee@linaro.org>  Mon, 11 Feb 2019 20:34:00 +0000
+
 binutils (2.31.1-7) unstable; urgency=medium
 
   * Snapshot, taken from the 2.31 branch (20181018).
diff --git a/debian/control b/debian/control
index 3fb3f98..19813eb 100644
--- a/debian/control
+++ b/debian/control
@@ -401,7 +401,7 @@ Description: GNU binary utilities, for mips64el-linux-gnuabi64 target (debug sym
 
 Package: binutils-powerpc64le-linux-gnu
 Priority: optional
-Architecture: ppc64el amd64 i386 x32 ppc64
+Architecture: ppc64el amd64 i386 x32 ppc64 arm64
 Multi-Arch: foreign
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -419,7 +419,7 @@ Description: GNU binary utilities, for powerpc64le-linux-gnu target
 Package: binutils-powerpc64le-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: ppc64el amd64 i386 x32 ppc64
+Architecture: ppc64el amd64 i386 x32 ppc64 arm64
 Multi-Arch: foreign
 Depends: binutils-powerpc64le-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for powerpc64le-linux-gnu target (debug symbols)
@@ -427,7 +427,7 @@ Description: GNU binary utilities, for powerpc64le-linux-gnu target (debug symbo
 
 Package: binutils-s390x-linux-gnu
 Priority: optional
-Architecture: s390x amd64 i386 x32
+Architecture: s390x amd64 i386 x32 arm64
 Multi-Arch: foreign
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -445,7 +445,7 @@ Description: GNU binary utilities, for s390x-linux-gnu target
 Package: binutils-s390x-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: s390x amd64 i386 x32
+Architecture: s390x amd64 i386 x32 arm64
 Multi-Arch: foreign
 Depends: binutils-s390x-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for s390x-linux-gnu target (debug symbols)
diff --git a/debian/rules b/debian/rules
index 1a4ad35..17b2e9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,7 +130,7 @@ ifeq ($(src_name),binutils)
         CROSS_ARCHS += x32
       endif
     else ifeq ($(DEB_HOST_ARCH),arm64)
-      CROSS_ARCHS = armel armhf amd64 i386 x32
+      CROSS_ARCHS = armel armhf amd64 i386 x32 s390x ppc64el
     else ifeq ($(DEB_HOST_ARCH),ppc64)
       CROSS_ARCHS = ppc64el
     else ifeq ($(DEB_HOST_ARCH),ppc64el)
@@ -167,14 +167,16 @@ ifneq (,$(ADT_TEST_TRIGGERS))
 endif
 endif
 
+# This is the inverse of CROSS_ARCHES we select above, i.e. which hosts the
+# various cross targets are available on
 HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el
 HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el
 HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el
 HOST_ARCHS_mips = amd64 i386 x32
 HOST_ARCHS_mipsel = amd64 i386 x32
 HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el
-HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64
-HOST_ARCHS_s390x = amd64 i386 x32
+HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 arm64
+HOST_ARCHS_s390x = amd64 i386 x32 arm64
 HOST_ARCHS_amd64 = arm64 i386 ppc64el x32
 HOST_ARCHS_i386 = amd64 arm64 ppc64el x32
 HOST_ARCHS_ia64 = amd64 i386 x32
-- 
2.20.1