bpo-33377: add triplets for mips-r6 and riscv (GH-6655) (GH-6660)

(cherry picked from commit ddbe976964)

Co-authored-by: Matthias Klose <doko42@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2018-05-01 07:40:17 -07:00 committed by Ned Deily
parent 77fa7835da
commit 0596f31902
3 changed files with 71 additions and 1 deletions

View File

@ -0,0 +1,2 @@
Add new triplets for mips r6 and riscv variants (used in extension
suffixes).

42
configure vendored
View File

@ -781,6 +781,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -893,6 +894,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}'
@ -1145,6 +1147,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=* \
@ -1282,7 +1293,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.
@ -1435,6 +1446,7 @@ Fine tuning of the installation directories:
--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]
@ -5238,6 +5250,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
@ -5280,6 +5312,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

View File

@ -781,6 +781,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
@ -823,6 +843,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