Skip to content

bpo-33377: add triplets for mips-r6 and riscv #6655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doko42 merged 2 commits into from
Apr 30, 2018
Merged

bpo-33377: add triplets for mips-r6 and riscv #6655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37cc3d7
issue33377: add triplets for mips-r6 and riscv
doko42 Apr 30, 2018
25afe4b
issue33377: add triplets for mips-r6 and riscv (NEWS entry)
doko42 Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add new triplets for mips r6 and riscv variants (used in extension
suffixes).
42 changes: 41 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -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}'
Expand Down Expand Up @@ -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=* \
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
28 changes: 28 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down