158 lines
5.4 KiB
Diff
158 lines
5.4 KiB
Diff
From ddbe976964933cb943c6383a776e800cc7e0f47d Mon Sep 17 00:00:00 2001
|
|
From: Matthias Klose <doko42@users.noreply.github.com>
|
|
Date: Mon, 30 Apr 2018 19:22:16 +0200
|
|
Subject: [PATCH] bpo-33377: add triplets for mips-r6 and riscv (#6655)
|
|
|
|
* issue33377: add triplets for mips-r6 and riscv
|
|
|
|
* issue33377: add triplets for mips-r6 and riscv (NEWS entry)
|
|
---
|
|
.../2018-04-30-16-53-00.bpo-33377.QBh6vP.rst | 2 +
|
|
configure | 42 ++++++++++++++++++-
|
|
configure.ac | 28 +++++++++++++
|
|
3 files changed, 71 insertions(+), 1 deletion(-)
|
|
create mode 100644 Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst
|
|
|
|
--- /dev/null
|
|
+++ b/Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst
|
|
@@ -0,0 +1,2 @@
|
|
+Add new triplets for mips r6 and riscv variants (used in extension
|
|
+suffixes).
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -785,6 +785,7 @@ infodir
|
|
docdir
|
|
oldincludedir
|
|
includedir
|
|
+runstatedir
|
|
localstatedir
|
|
sharedstatedir
|
|
sysconfdir
|
|
@@ -898,6 +899,7 @@ datadir='${datarootdir}'
|
|
sysconfdir='${prefix}/etc'
|
|
sharedstatedir='${prefix}/com'
|
|
localstatedir='${prefix}/var'
|
|
+runstatedir='${localstatedir}/run'
|
|
includedir='${prefix}/include'
|
|
oldincludedir='/usr/include'
|
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
|
@@ -1150,6 +1152,15 @@ do
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
silent=yes ;;
|
|
|
|
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
|
+ | --run | --ru | --r)
|
|
+ ac_prev=runstatedir ;;
|
|
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
+ | --run=* | --ru=* | --r=*)
|
|
+ runstatedir=$ac_optarg ;;
|
|
+
|
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
|
ac_prev=sbindir ;;
|
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
|
@@ -1287,7 +1298,7 @@ fi
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
- libdir localedir mandir
|
|
+ libdir localedir mandir runstatedir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
# Remove trailing slashes.
|
|
@@ -1440,6 +1451,7 @@ Fine tuning of the installation director
|
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
--includedir=DIR C header files [PREFIX/include]
|
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
@@ -5261,6 +5273,26 @@ cat >> conftest.c <<EOF
|
|
ia64-linux-gnu
|
|
# elif defined(__m68k__) && !defined(__mcoldfire__)
|
|
m68k-linux-gnu
|
|
+# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL)
|
|
+# if _MIPS_SIM == _ABIO32
|
|
+ mipsisa32r6el-linux-gnu
|
|
+# elif _MIPS_SIM == _ABIN32
|
|
+ mipsisa64r6el-linux-gnuabin32
|
|
+# elif _MIPS_SIM == _ABI64
|
|
+ mipsisa64r6el-linux-gnuabi64
|
|
+# else
|
|
+# error unknown platform triplet
|
|
+# endif
|
|
+# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6)
|
|
+# if _MIPS_SIM == _ABIO32
|
|
+ mipsisa32r6-linux-gnu
|
|
+# elif _MIPS_SIM == _ABIN32
|
|
+ mipsisa64r6-linux-gnuabin32
|
|
+# elif _MIPS_SIM == _ABI64
|
|
+ mipsisa64r6-linux-gnuabi64
|
|
+# else
|
|
+# error unknown platform triplet
|
|
+# endif
|
|
# elif defined(__mips_hard_float) && defined(_MIPSEL)
|
|
# if _MIPS_SIM == _ABIO32
|
|
mipsel-linux-gnu
|
|
@@ -5303,6 +5335,14 @@ cat >> conftest.c <<EOF
|
|
sparc64-linux-gnu
|
|
# elif defined(__sparc__)
|
|
sparc-linux-gnu
|
|
+# elif defined(__riscv)
|
|
+# if __riscv_xlen == 32
|
|
+ riscv32-linux-gnu
|
|
+# elif __riscv_xlen == 64
|
|
+ riscv64-linux-gnu
|
|
+# else
|
|
+# error unknown platform triplet
|
|
+# endif
|
|
# else
|
|
# error unknown platform triplet
|
|
# endif
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -804,6 +804,26 @@ cat >> conftest.c <<EOF
|
|
ia64-linux-gnu
|
|
# elif defined(__m68k__) && !defined(__mcoldfire__)
|
|
m68k-linux-gnu
|
|
+# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL)
|
|
+# if _MIPS_SIM == _ABIO32
|
|
+ mipsisa32r6el-linux-gnu
|
|
+# elif _MIPS_SIM == _ABIN32
|
|
+ mipsisa64r6el-linux-gnuabin32
|
|
+# elif _MIPS_SIM == _ABI64
|
|
+ mipsisa64r6el-linux-gnuabi64
|
|
+# else
|
|
+# error unknown platform triplet
|
|
+# endif
|
|
+# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6)
|
|
+# if _MIPS_SIM == _ABIO32
|
|
+ mipsisa32r6-linux-gnu
|
|
+# elif _MIPS_SIM == _ABIN32
|
|
+ mipsisa64r6-linux-gnuabin32
|
|
+# elif _MIPS_SIM == _ABI64
|
|
+ mipsisa64r6-linux-gnuabi64
|
|
+# else
|
|
+# error unknown platform triplet
|
|
+# endif
|
|
# elif defined(__mips_hard_float) && defined(_MIPSEL)
|
|
# if _MIPS_SIM == _ABIO32
|
|
mipsel-linux-gnu
|
|
@@ -846,6 +866,14 @@ cat >> conftest.c <<EOF
|
|
sparc64-linux-gnu
|
|
# elif defined(__sparc__)
|
|
sparc-linux-gnu
|
|
+# elif defined(__riscv)
|
|
+# if __riscv_xlen == 32
|
|
+ riscv32-linux-gnu
|
|
+# elif __riscv_xlen == 64
|
|
+ riscv64-linux-gnu
|
|
+# else
|
|
+# error unknown platform triplet
|
|
+# endif
|
|
# else
|
|
# error unknown platform triplet
|
|
# endif
|