00274: Upstream uses Debian-style architecture naming, change to match Fedora

encukou · hroncok · torsava · hroncok · commit 3d96f0eedf46 · 2020-08-11T23:52:55.000+02:00
Co-authored-by: Petr Viktorin &lt;pviktori@redhat.com&gt;
Co-authored-by: Miro Hrončok &lt;miro@hroncok.cz&gt;
Co-authored-by: Tomas Orsava &lt;torsava@redhat.com&gt;
diff --git a/config.sub b/config.sub
@@ -1042,7 +1042,7 @@ case $basic_machine in
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
diff --git a/configure.ac b/configure.ac
@@ -759,9 +759,9 @@ cat >> conftest.c <<EOF
         alpha-linux-gnu
 # elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
 #  if defined(__ARMEL__)
-        arm-linux-gnueabihf
+        arm-linux-gnueabi
 #  else
-        armeb-linux-gnueabihf
+        armeb-linux-gnueabi
 #  endif
 # elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
 #  if defined(__ARMEL__)
@@ -801,7 +801,7 @@ cat >> conftest.c <<EOF
 #  elif _MIPS_SIM == _ABIN32
         mips64el-linux-gnuabin32
 #  elif _MIPS_SIM == _ABI64
-        mips64el-linux-gnuabi64
+        mips64el-linux-gnu
 #  else
 #   error unknown platform triplet
 #  endif
@@ -811,22 +811,22 @@ cat >> conftest.c <<EOF
 #  elif _MIPS_SIM == _ABIN32
         mips64-linux-gnuabin32
 #  elif _MIPS_SIM == _ABI64
-        mips64-linux-gnuabi64
+        mips64-linux-gnu
 #  else
 #   error unknown platform triplet
 #  endif
 # 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
+        ppc64le-linux-gnu
 #  else
-        powerpc64-linux-gnu
+        ppc64-linux-gnu
 #  endif
 # elif defined(__powerpc__)
-        powerpc-linux-gnu
+        ppc-linux-gnu
 # elif defined(__s390x__)
         s390x-linux-gnu
 # elif defined(__s390__)
