From b02de40d57688ae9f50044e848e69daf775ff011 Mon Sep 17 00:00:00 2001
From: Tomas Orsava <torsava@redhat.com>
Date: Thu, 14 Feb 2019 17:37:18 +0100
Subject: [PATCH] Fix arch names for the ppc architecture

Updated patch 00274
---
 00274-fix-arch-names.patch | 39 +++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch
index c8e53c1..ee15930 100644
--- a/00274-fix-arch-names.patch
+++ b/00274-fix-arch-names.patch
@@ -1,8 +1,19 @@
+From 3b0d3a25576e74c2ac1eb25136ae811bdbdd7c6c Mon Sep 17 00:00:00 2001
+From: Tomas Orsava <torsava@redhat.com>
+Date: Thu, 14 Feb 2019 16:08:57 +0100
+Subject: [PATCH] Upstream uses Debian-style architecture naming. Change to
+ match Fedora / RHEL
+
+---
+ config.sub   |  2 +-
+ configure.ac | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
 diff --git a/config.sub b/config.sub
-index ba37cf9..52a9ec6 100755
+index 40ea5df..932128b 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -1042,7 +1042,7 @@ case $basic_machine in
+@@ -1045,7 +1045,7 @@ case $basic_machine in
  		;;
  	ppc64)	basic_machine=powerpc64-unknown
  		;;
@@ -12,10 +23,10 @@ index ba37cf9..52a9ec6 100755
  	ppc64le | powerpc64little)
  		basic_machine=powerpc64le-unknown
 diff --git a/configure.ac b/configure.ac
-index 2535969..9fb3193 100644
+index a075ce3..b7f2ee3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -765,9 +765,9 @@ cat >> conftest.c <<EOF
+@@ -788,9 +788,9 @@ cat >> conftest.c <<EOF
          alpha-linux-gnu
  # elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
  #  if defined(__ARMEL__)
@@ -27,7 +38,7 @@ index 2535969..9fb3193 100644
  #  endif
  # elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
  #  if defined(__ARMEL__)
-@@ -807,7 +807,7 @@ cat >> conftest.c <<EOF
+@@ -810,7 +810,7 @@ cat >> conftest.c <<EOF
  #  elif _MIPS_SIM == _ABIN32
          mips64el-linux-gnuabin32
  #  elif _MIPS_SIM == _ABI64
@@ -36,7 +47,7 @@ index 2535969..9fb3193 100644
  #  else
  #   error unknown platform triplet
  #  endif
-@@ -817,7 +817,7 @@ cat >> conftest.c <<EOF
+@@ -820,22 +820,22 @@ cat >> conftest.c <<EOF
  #  elif _MIPS_SIM == _ABIN32
          mips64-linux-gnuabin32
  #  elif _MIPS_SIM == _ABI64
@@ -45,8 +56,11 @@ index 2535969..9fb3193 100644
  #  else
  #   error unknown platform triplet
  #  endif
-@@ -827,9 +827,9 @@ cat >> conftest.c <<EOF
-         powerpc-linux-gnuspe
+ # elif defined(__or1k__)
+         or1k-linux-gnu
+ # elif defined(__powerpc__) && defined(__SPE__)
+-        powerpc-linux-gnuspe
++        ppc-linux-gnuspe
  # elif defined(__powerpc64__)
  #  if defined(__LITTLE_ENDIAN__)
 -        powerpc64le-linux-gnu
@@ -56,4 +70,11 @@ index 2535969..9fb3193 100644
 +        ppc64-linux-gnu
  #  endif
  # elif defined(__powerpc__)
-         powerpc-linux-gnu
+-        powerpc-linux-gnu
++        ppc-linux-gnu
+ # elif defined(__s390x__)
+         s390x-linux-gnu
+ # elif defined(__s390__)
+-- 
+2.20.1
+