87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
From 5201fc9ca191439c337c238542efb85b1f91ed57 Mon Sep 17 00:00:00 2001
|
|
From: Petr Viktorin <pviktori@redhat.com>
|
|
Date: Mon, 28 Aug 2017 17:16:46 +0200
|
|
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
|
|
to match Fedora
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Co-authored-by: Petr Viktorin <pviktori@redhat.com>
|
|
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
Co-authored-by: Tomas Orsava <torsava@redhat.com>
|
|
---
|
|
config.sub | 2 +-
|
|
configure.ac | 16 ++++++++--------
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/config.sub b/config.sub
|
|
index ba37cf99e2..52a9ec6662 100755
|
|
--- 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
|
|
index 56e8f3e11e..a66d6ebcda 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -753,9 +753,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__)
|
|
@@ -795,7 +795,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
|
|
@@ -805,22 +805,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__)
|
|
--
|
|
2.24.1
|
|
|