diff --git a/office/calligra/calligra-plan/pspec.xml b/office/calligra/calligra-plan/pspec.xml
index 6a6699951e..171e17ba3d 100644
--- a/office/calligra/calligra-plan/pspec.xml
+++ b/office/calligra/calligra-plan/pspec.xml
@@ -71,6 +71,7 @@
kparts
libgcc
kconfig
+ kwallet
kxmlgui
karchive
kcalcore
diff --git a/programming/language/ocaml/ocaml/actions.py b/programming/language/ocaml/ocaml/actions.py
index e032eb653b..e8f3ca3e35 100644
--- a/programming/language/ocaml/ocaml/actions.py
+++ b/programming/language/ocaml/ocaml/actions.py
@@ -15,7 +15,6 @@ def setup():
autotools.rawConfigure("-prefix /usr \
-bindir /usr/bin \
- -x11include /usr/include \
-libdir /usr/lib/ocaml \
-mandir /usr/share/man \
--with-pthread")
@@ -24,13 +23,14 @@ def build():
autotools.make("-j1 world")
autotools.make("-j1 opt")
autotools.make("-j1 opt.opt")
- autotools.make("-C emacs ocamltags")
+ #autotools.make("-C emacs ocamltags")
def install():
- autotools.rawInstall("BINDIR=%(install)s/usr/bin \
- LIBDIR=%(install)s/usr/lib/ocaml \
- MANDIR=%(install)s/usr/share/man" \
- % { "install": get.installDIR()})
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ #autotools.rawInstall("BINDIR=%(install)s/usr/bin \
+ #LIBDIR=%(install)s/usr/lib/ocaml \
+ #MANDIR=%(install)s/usr/share/man" \
+ #% { "install": get.installDIR()})
pisitools.dodoc("Changes", "LICENSE", "README*")
diff --git a/programming/language/ocaml/ocaml/files/fedora/0001-Don-t-add-rpaths-to-libraries.patch b/programming/language/ocaml/ocaml/files/fedora/0001-Don-t-add-rpaths-to-libraries.patch
index 6665489d20..5b60aef59a 100644
--- a/programming/language/ocaml/ocaml/files/fedora/0001-Don-t-add-rpaths-to-libraries.patch
+++ b/programming/language/ocaml/ocaml/files/fedora/0001-Don-t-add-rpaths-to-libraries.patch
@@ -1,27 +1,27 @@
-From 8ddacdf1283fe3d7054f51a4b764bc6b44d7a342 Mon Sep 17 00:00:00 2001
+From d3bc916ff1bc467c503e21015db9c1e2a47a64f2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones"
Date: Tue, 24 Jun 2014 10:00:15 +0100
-Subject: [PATCH 1/8] Don't add rpaths to libraries.
+Subject: [PATCH 1/5] Don't add rpaths to libraries.
---
tools/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
-index 78d2a1068..fbec019ed 100644
+index ee0e0be4c..7c96b6405 100644
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -157,8 +157,8 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo misc.cmo \
- ocamlmklibconfig.ml: ../config/Makefile Makefile
+@@ -153,8 +153,8 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo \
+ ocamlmklibconfig.ml: $(ROOTDIR)/Makefile.config Makefile
(echo 'let bindir = "$(BINDIR)"'; \
echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
- echo 'let default_rpath = "$(RPATH)"'; \
- echo 'let mksharedlibrpath = "$(MKSHAREDLIBRPATH)"'; \
+ echo 'let default_rpath = ""'; \
+ echo 'let mksharedlibrpath = ""'; \
- echo 'let toolpref = "$(TOOLPREF)"'; \
- sed -n -e 's/^#ml //p' ../config/Makefile) \
+ echo 'let toolpref = "$(TOOLPREF)"';) \
> ocamlmklibconfig.ml
+
--
-2.17.1
+2.22.0.rc3
diff --git a/programming/language/ocaml/ocaml/files/fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch b/programming/language/ocaml/ocaml/files/fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch
index 5fb49671fa..093be83c1f 100644
--- a/programming/language/ocaml/ocaml/files/fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch
+++ b/programming/language/ocaml/ocaml/files/fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch
@@ -1,27 +1,27 @@
-From 8ddd2fb4909bf6ed1a3506723126432da8fcf0c4 Mon Sep 17 00:00:00 2001
+From 8cc56a1515816c9cef84694e63eaed63a0474090 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones"
Date: Tue, 29 May 2012 20:44:18 +0100
-Subject: [PATCH 3/8] configure: Allow user defined C compiler flags.
+Subject: [PATCH 2/5] configure: Allow user defined C compiler flags.
---
- configure | 4 ++++
+ configure.ac | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/configure b/configure
-index 1316b3c1e..53f45f85b 100755
---- a/configure
-+++ b/configure
-@@ -2050,6 +2050,10 @@ if $flat_float_array; then
- echo "#define FLAT_FLOAT_ARRAY" >> m.h
- fi
+diff --git a/configure.ac b/configure.ac
+index f5d8a2687..ad5b701bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -553,6 +553,10 @@ AS_CASE([$host],
+ internal_cflags="$gcc_warnings"],
+ [common_cflags="-O"])])
-+# Allow user defined C Compiler flags
-+bytecccompopts="$bytecccompopts $CFLAGS"
-+nativecccompopts="$nativecccompopts $CFLAGS"
++# Allow CFLAGS and LDFLAGS to be added.
++common_cflags="$common_cflags $CFLAGS"
++oc_ldflags="$oc_ldflags $LDFLAGS"
+
- # Finish generated files
+ internal_cppflags="-DCAML_NAME_SPACE $internal_cppflags"
- cclibs="$cclibs $mathlib"
+ # Enable SSE2 on x86 mingw to avoid using 80-bit registers.
--
-2.17.1
+2.22.0.rc3
diff --git a/programming/language/ocaml/ocaml/files/fedora/0003-configure-Remove-incorrect-assumption-about-cross-co.patch b/programming/language/ocaml/ocaml/files/fedora/0003-configure-Remove-incorrect-assumption-about-cross-co.patch
new file mode 100644
index 0000000000..99bca0e678
--- /dev/null
+++ b/programming/language/ocaml/ocaml/files/fedora/0003-configure-Remove-incorrect-assumption-about-cross-co.patch
@@ -0,0 +1,27 @@
+From 0204a1137a8e8058afd1665aa6112656bc7bf0be Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones"
+Date: Fri, 26 Apr 2019 16:16:29 +0100
+Subject: [PATCH 3/5] configure: Remove incorrect assumption about
+ cross-compiling.
+
+See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad5b701bd..2227769e8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -959,7 +959,7 @@ AS_CASE([$host],
+ [*-*-mingw32|*-pc-windows], [asppprofflags=''],
+ [asppprofflags='-DPROFILING'])
+
+-AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
++#AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
+
+ # We first compute default values for as and aspp
+ # If values have been given by the user then they take precedence over
+--
+2.22.0.rc3
+
diff --git a/programming/language/ocaml/ocaml/files/fedora/0004-Add-RISC-V-backend.patch b/programming/language/ocaml/ocaml/files/fedora/0004-Add-RISC-V-backend.patch
index 22d8fe3ada..63ceeb6b5d 100644
--- a/programming/language/ocaml/ocaml/files/fedora/0004-Add-RISC-V-backend.patch
+++ b/programming/language/ocaml/ocaml/files/fedora/0004-Add-RISC-V-backend.patch
@@ -1,22 +1,60 @@
-From 38ac4778744fb7137e04708998d4e856ada1c8b8 Mon Sep 17 00:00:00 2001
+From acc93802cac96da98ad5468756da2025625ca416 Mon Sep 17 00:00:00 2001
From: Nicolas Ojeda Bar
Date: Fri, 27 Oct 2017 17:05:25 +0200
-Subject: [PATCH 4/8] Add RISC-V backend
+Subject: [PATCH 4/5] Add RISC-V backend
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+This is the RISC-V backend by Nicolás Ojeda Bär, cherry-picked for
+Fedora from https://github.com/nojb/riscv-ocaml/commits/trunk
+
+The following additional commits are included:
+
+- Copyright, untabify
+
+- fix caml_c_call: reload caml_young_limit
+
+- Adapt to changes in trunk
+
+- Adapt to changes in trunk
+
+- Adapt configure.ac
+
+- Update config.{guess,sub}
+
+- Regenerate configure
+
+- Add Proc.dwarf_register_numbers
+
+- Add Proc.stack_ptr_dwarf_register_number
+
+- Add Proc.destroyed_at_reloadretaddr
+
+- Typo
+
+- Rename
+
+- riscv.S: align to 16
+
+- Test CI
---
- README.adoc | 1 +
- asmcomp/riscv/CSE.ml | 36 ++
- asmcomp/riscv/arch.ml | 87 +++++
- asmcomp/riscv/emit.mlp | 653 ++++++++++++++++++++++++++++++++++++
- asmcomp/riscv/proc.ml | 301 +++++++++++++++++
- asmcomp/riscv/reload.ml | 16 +
- asmcomp/riscv/scheduling.ml | 19 ++
- asmcomp/riscv/selection.ml | 72 ++++
- asmrun/riscv.S | 424 +++++++++++++++++++++++
- byterun/caml/stack.h | 5 +
- config/gnu/config.guess | 5 +-
- configure | 5 +-
- 12 files changed, 1622 insertions(+), 2 deletions(-)
+ .travis.yml | 32 +-
+ README.adoc | 1 +
+ asmcomp/riscv/CSE.ml | 36 +
+ asmcomp/riscv/arch.ml | 87 ++
+ asmcomp/riscv/emit.mlp | 655 +++++++++
+ asmcomp/riscv/proc.ml | 330 +++++
+ asmcomp/riscv/reload.ml | 16 +
+ asmcomp/riscv/scheduling.ml | 19 +
+ asmcomp/riscv/selection.ml | 71 +
+ config/gnu/config.guess | 925 ++++++-------
+ config/gnu/config.sub | 2505 ++++++++++++++++++-----------------
+ configure | 10 +-
+ configure.ac | 11 +-
+ runtime/caml/stack.h | 5 +
+ runtime/riscv.S | 424 ++++++
+ 15 files changed, 3352 insertions(+), 1775 deletions(-)
create mode 100644 asmcomp/riscv/CSE.ml
create mode 100644 asmcomp/riscv/arch.ml
create mode 100644 asmcomp/riscv/emit.mlp
@@ -24,13 +62,60 @@ Subject: [PATCH 4/8] Add RISC-V backend
create mode 100644 asmcomp/riscv/reload.ml
create mode 100644 asmcomp/riscv/scheduling.ml
create mode 100644 asmcomp/riscv/selection.ml
- create mode 100644 asmrun/riscv.S
+ create mode 100644 runtime/riscv.S
+diff --git a/.travis.yml b/.travis.yml
+index 60b2d7abb..410ed8b51 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -13,36 +13,16 @@
+ #* *
+ #**************************************************************************
+
+-sudo: false
+ language: c
++services:
++ - docker
+ git:
+ submodules: false
+-script: bash -e tools/ci/travis/travis-ci.sh
+-matrix:
+- include:
+- - env: CI_KIND=build XARCH=i386
+- addons:
+- apt:
+- packages:
+- - gcc:i386
+- - cpp:i386
+- - binutils:i386
+- - binutils-dev:i386
+- - libx11-dev:i386
+- - libc6-dev:i386
+- - env: CI_KIND=build XARCH=x64
+- - env: CI_KIND=build XARCH=x64 CONFIG_ARG=--enable-flambda OCAMLRUNPARAM=b,v=0
+- - env: CI_KIND=changes
+- - env: CI_KIND=manual
+- - env: CI_KIND=check-typo
+- - env: CI_KIND=tests
+- allow_failures:
+- - env: CI_KIND=tests
++before_install:
++ - docker pull nojb/riscv-ocaml-ci
++ - echo ':riscv64:M::\x7f\x45\x4c\x46\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf3\x00:\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff:/usr/bin/qemu-riscv64:' | sudo tee /proc/sys/fs/binfmt_misc/register >/dev/null
++ - docker run -v $TRAVIS_BUILD_DIR:/home/root/ocaml nojb/riscv-ocaml-ci /bin/sh -c "cd ocaml && ./configure && make world.opt"
+ addons:
+ apt:
+ packages:
+ - binutils-dev
+-
+-notifications:
+- email:
+- - ocaml-ci-notifications@inria.fr
diff --git a/README.adoc b/README.adoc
-index 74d1ec258..ac6c6eac3 100644
+index 53cd4512e..60fe53f62 100644
--- a/README.adoc
+++ b/README.adoc
-@@ -47,6 +47,7 @@ AMD64:: FreeBSD, OpenBSD, NetBSD
+@@ -55,6 +55,7 @@ AMD64:: FreeBSD, OpenBSD, NetBSD
IA32 (Pentium):: NetBSD, OpenBSD, Solaris 9
PowerPC:: NetBSD
ARM:: NetBSD
@@ -175,10 +260,10 @@ index 000000000..22c807c49
+ printreg arg.(0) printreg arg.(1) printreg arg.(2)
diff --git a/asmcomp/riscv/emit.mlp b/asmcomp/riscv/emit.mlp
new file mode 100644
-index 000000000..51165d0f1
+index 000000000..88ea9f884
--- /dev/null
+++ b/asmcomp/riscv/emit.mlp
-@@ -0,0 +1,653 @@
+@@ -0,0 +1,655 @@
+(***********************************************************************)
+(* *)
+(* OCaml *)
@@ -444,6 +529,11 @@ index 000000000..51165d0f1
+let emit_instr i =
+ match i.desc with
+ Lend -> ()
++ | Lprologue ->
++ let n = frame_size() in
++ emit_stack_adjustment (-n);
++ if !contains_calls then store_ra n;
++ `{emit_label !tailrec_entry_point}:\n`;
+ | Lop(Imove | Ispill | Ireload) ->
+ let src = i.arg.(0) and dst = i.res.(0) in
+ if src.loc <> dst.loc then begin
@@ -538,7 +628,7 @@ index 000000000..51165d0f1
+ | Double | Double_u -> "fsd"
+ in
+ ` {emit_string instr} {emit_reg i.arg.(0)}, {emit_int ofs}({emit_reg i.arg.(1)})\n`
-+ | Lop(Ialloc {words = n; label_after_call_gc = label; _}) ->
++ | Lop(Ialloc {bytes = n; label_after_call_gc = label; _}) ->
+ let lbl_frame_lbl = record_frame_label ?label i.live false i.dbg in
+ let lbl_redo = new_label () in
+ let lbl_call_gc = new_label () in
@@ -642,19 +732,20 @@ index 000000000..51165d0f1
+ ` {emit_string name} {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}, {emit_label lbl}\n`
+ | Iinttest_imm _ ->
+ fatal_error "Emit.emit_instr (Iinttest_imm _)"
-+ | Ifloattest(cmp, neg) ->
-+ let neg = match cmp with
-+ | Ceq -> ` feq.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`; neg
-+ | Cne -> ` feq.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`; not neg
-+ | Clt -> ` flt.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`; neg
-+ | Cgt -> ` flt.d {emit_reg reg_tmp1}, {emit_reg i.arg.(1)}, {emit_reg i.arg.(0)}\n`; neg
-+ | Cle -> ` fle.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`; neg
-+ | Cge -> ` fle.d {emit_reg reg_tmp1}, {emit_reg i.arg.(1)}, {emit_reg i.arg.(0)}\n`; neg
++ | Ifloattest cmp ->
++ let branch =
++ match cmp with
++ | CFneq | CFnlt | CFngt | CFnle | CFnge -> "beqz"
++ | CFeq | CFlt | CFgt | CFle | CFge -> "bnez"
+ in
-+ if neg then
-+ ` beqz {emit_reg reg_tmp1}, {emit_label lbl}\n`
-+ else
-+ ` bnez {emit_reg reg_tmp1}, {emit_label lbl}\n`
++ begin match cmp with
++ | CFeq | CFneq -> ` feq.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`
++ | CFlt | CFnlt -> ` flt.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`
++ | CFgt | CFngt -> ` flt.d {emit_reg reg_tmp1}, {emit_reg i.arg.(1)}, {emit_reg i.arg.(0)}\n`
++ | CFle | CFnle -> ` fle.d {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}\n`
++ | CFge | CFnge -> ` fle.d {emit_reg reg_tmp1}, {emit_reg i.arg.(1)}, {emit_reg i.arg.(0)}\n`
++ end;
++ ` {emit_string branch} {emit_reg reg_tmp1}, {emit_label lbl}\n`
+ | Ioddtest ->
+ ` andi {emit_reg reg_tmp1}, {emit_reg i.arg.(0)}, 1\n`;
+ ` bnez {emit_reg reg_tmp1}, {emit_label lbl}\n`
@@ -731,10 +822,6 @@ index 000000000..51165d0f1
+ ` {emit_string code_space}\n`;
+ ` .align 2\n`;
+ `{emit_symbol fundecl.fun_name}:\n`;
-+ let n = frame_size() in
-+ emit_stack_adjustment (-n);
-+ if !contains_calls then store_ra n;
-+ `{emit_label !tailrec_entry_point}:\n`;
+ emit_all fundecl.fun_body;
+ List.iter emit_call_gc !call_gc_sites;
+ List.iter emit_call_bound_error !bound_error_sites;
@@ -834,10 +921,10 @@ index 000000000..51165d0f1
+ }
diff --git a/asmcomp/riscv/proc.ml b/asmcomp/riscv/proc.ml
new file mode 100644
-index 000000000..c0b0dcdb8
+index 000000000..c0db0fd7b
--- /dev/null
+++ b/asmcomp/riscv/proc.ml
-@@ -0,0 +1,301 @@
+@@ -0,0 +1,330 @@
+(***********************************************************************)
+(* *)
+(* OCaml *)
@@ -1107,6 +1194,8 @@ index 000000000..c0b0dcdb8
+
+let destroyed_at_raise = all_phys_regs
+
++let destroyed_at_reloadretaddr = [| |] (* CHECK *)
++
+(* Maximal register pressure *)
+
+let safe_register_pressure = function
@@ -1132,6 +1221,33 @@ index 000000000..c0b0dcdb8
+let num_stack_slots = [| 0; 0 |]
+let contains_calls = ref false
+
++(* See
++ https://github.com/riscv/riscv-elf-psabi-doc/blob/master/riscv-elf.md *)
++
++let int_dwarf_reg_numbers =
++ [| 10; 11; 12; 13; 14; 15; 16; 17;
++ 18; 19; 20; 21; 22; 23; 24; 25;
++ 7; 29; 29; 30; 31;
++ 5; 6; 8; 9; 26; 27;
++ |]
++
++let float_dwarf_reg_numbers =
++ [| 32; 33; 34; 35; 36; 37; 38; 39;
++ 40; 41;
++ 42; 43; 44; 45; 46; 47; 48; 49;
++ 50; 51; 52; 53; 54; 55; 56; 57;
++ 58; 59;
++ 60; 61; 62; 63;
++ |]
++
++let dwarf_register_numbers ~reg_class =
++ match reg_class with
++ | 0 -> int_dwarf_reg_numbers
++ | 1 -> float_dwarf_reg_numbers
++ | _ -> Misc.fatal_errorf "Bad register class %d" reg_class
++
++let stack_ptr_dwarf_register_number = 2
++
+(* Calling the assembler *)
+
+let assemble_file infile outfile =
@@ -1188,10 +1304,10 @@ index 000000000..e436be1cc
+let fundecl f = f
diff --git a/asmcomp/riscv/selection.ml b/asmcomp/riscv/selection.ml
new file mode 100644
-index 000000000..092ca88aa
+index 000000000..85bac1161
--- /dev/null
+++ b/asmcomp/riscv/selection.ml
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,71 @@
+(***********************************************************************)
+(* *)
+(* OCaml *)
@@ -1250,25 +1366,4808 @@ index 000000000..092ca88aa
+(* Instruction selection for conditionals *)
+
+method! select_condition = function
-+ | Cop(Ccmpi cmp, args, _) ->
++ Cop(Ccmpi cmp, args, _) ->
+ (Iinttest(Isigned cmp), Ctuple args)
+ | Cop(Ccmpa cmp, args, _) ->
+ (Iinttest(Iunsigned cmp), Ctuple args)
+ | Cop(Ccmpf cmp, args, _) ->
-+ (Ifloattest(cmp, false), Ctuple args)
++ (Ifloattest cmp, Ctuple args)
+ | Cop(Cand, [arg; Cconst_int 1], _) ->
+ (Ioddtest, arg)
+ | arg ->
+ (Itruetest, arg)
-+
+end
+
+let fundecl f = (new selector)#emit_fundecl f
-diff --git a/asmrun/riscv.S b/asmrun/riscv.S
+diff --git a/config/gnu/config.guess b/config/gnu/config.guess
+index b79252d6b..a81aa505b 100755
+--- a/config/gnu/config.guess
++++ b/config/gnu/config.guess
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright 1992-2013 Free Software Foundation, Inc.
++# Copyright 1992-2019 Free Software Foundation, Inc.
+
+-timestamp='2013-06-10'
++timestamp='2019-01-15'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -15,7 +15,7 @@ timestamp='2013-06-10'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see .
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -24,12 +24,12 @@ timestamp='2013-06-10'
+ # program. This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ #
+-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to .
+
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
+
+ Output the configuration name of the system \`$me' is run on.
+
+-Operation modes:
++Options:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+@@ -50,7 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2019 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -84,8 +84,6 @@ if test $# != 0; then
+ exit 1
+ fi
+
+-trap 'exit 1' 1 2 15
+-
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+ # temporary files to be created and, as you can see below, it is a
+@@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15
+
+ # Portable tmp directory creation inspired by the Autoconf team.
+
+-set_cc_for_build='
+-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+-: ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+-dummy=$tmp/dummy ;
+-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+-case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,) echo "int x;" > $dummy.c ;
+- for c in cc gcc c89 c99 ; do
+- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+- CC_FOR_BUILD="$c"; break ;
+- fi ;
+- done ;
+- if test x"$CC_FOR_BUILD" = x ; then
+- CC_FOR_BUILD=no_compiler_found ;
+- fi
+- ;;
+- ,,*) CC_FOR_BUILD=$CC ;;
+- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+-esac ; set_cc_for_build= ;'
++tmp=
++# shellcheck disable=SC2172
++trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
++
++set_cc_for_build() {
++ : "${TMPDIR=/tmp}"
++ # shellcheck disable=SC2039
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
++ dummy=$tmp/dummy
++ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
++ ,,) echo "int x;" > "$dummy.c"
++ for driver in cc gcc c89 c99 ; do
++ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
++ CC_FOR_BUILD="$driver"
++ break
++ fi
++ done
++ if test x"$CC_FOR_BUILD" = x ; then
++ CC_FOR_BUILD=no_compiler_found
++ fi
++ ;;
++ ,,*) CC_FOR_BUILD=$CC ;;
++ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
++ esac
++}
+
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
++if test -f /.attbin/uname ; then
+ PATH=$PATH:/.attbin ; export PATH
+ fi
+
+@@ -132,14 +134,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-case "${UNAME_SYSTEM}" in
++case "$UNAME_SYSTEM" in
+ Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+- eval $set_cc_for_build
+- cat <<-EOF > $dummy.c
++ set_cc_for_build
++ cat <<-EOF > "$dummy.c"
+ #include
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+@@ -149,13 +151,20 @@ Linux|GNU|GNU/*)
+ LIBC=gnu
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
++
++ # If ldd exists, use it to detect musl libc.
++ if command -v ldd >/dev/null && \
++ ldd --version 2>&1 | grep -q ^musl
++ then
++ LIBC=musl
++ fi
+ ;;
+ esac
+
+ # Note: order is significant - the case branches are not exclusive.
+
+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+@@ -168,21 +177,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+- case "${UNAME_MACHINE_ARCH}" in
++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++ "/sbin/$sysctl" 2>/dev/null || \
++ "/usr/sbin/$sysctl" 2>/dev/null || \
++ echo unknown)`
++ case "$UNAME_MACHINE_ARCH" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
+- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++ earmv*)
++ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
++ machine="${arch}${endian}"-unknown
++ ;;
++ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+- # to ELF recently, or will in the future.
+- case "${UNAME_MACHINE_ARCH}" in
++ # to ELF recently (or will in the future) and ABI.
++ case "$UNAME_MACHINE_ARCH" in
++ earm*)
++ os=netbsdelf
++ ;;
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+- eval $set_cc_for_build
++ set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ELF__
+ then
+@@ -197,44 +216,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ os=netbsd
+ ;;
+ esac
++ # Determine ABI tags.
++ case "$UNAME_MACHINE_ARCH" in
++ earm*)
++ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
++ ;;
++ esac
+ # The OS release
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+- case "${UNAME_VERSION}" in
++ case "$UNAME_VERSION" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+- echo "${machine}-${os}${release}"
++ echo "$machine-${os}${release}${abi-}"
+ exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
++ exit ;;
++ *:LibertyBSD:*:*)
++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
++ exit ;;
++ *:MidnightBSD:*:*)
++ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ exit ;;
+ *:ekkoBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ exit ;;
+ *:SolidBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ exit ;;
+ macppc:MirBSD:*:*)
+- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ exit ;;
+ *:MirBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
++ exit ;;
++ *:Sortix:*:*)
++ echo "$UNAME_MACHINE"-unknown-sortix
++ exit ;;
++ *:Redox:*:*)
++ echo "$UNAME_MACHINE"-unknown-redox
+ exit ;;
++ mips:OSF1:*.*)
++ echo mips-dec-osf1
++ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+@@ -251,63 +293,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+- UNAME_MACHINE="alpha" ;;
++ UNAME_MACHINE=alpha ;;
+ "EV4.5 (21064)")
+- UNAME_MACHINE="alpha" ;;
++ UNAME_MACHINE=alpha ;;
+ "LCA4 (21066/21068)")
+- UNAME_MACHINE="alpha" ;;
++ UNAME_MACHINE=alpha ;;
+ "EV5 (21164)")
+- UNAME_MACHINE="alphaev5" ;;
++ UNAME_MACHINE=alphaev5 ;;
+ "EV5.6 (21164A)")
+- UNAME_MACHINE="alphaev56" ;;
++ UNAME_MACHINE=alphaev56 ;;
+ "EV5.6 (21164PC)")
+- UNAME_MACHINE="alphapca56" ;;
++ UNAME_MACHINE=alphapca56 ;;
+ "EV5.7 (21164PC)")
+- UNAME_MACHINE="alphapca57" ;;
++ UNAME_MACHINE=alphapca57 ;;
+ "EV6 (21264)")
+- UNAME_MACHINE="alphaev6" ;;
++ UNAME_MACHINE=alphaev6 ;;
+ "EV6.7 (21264A)")
+- UNAME_MACHINE="alphaev67" ;;
++ UNAME_MACHINE=alphaev67 ;;
+ "EV6.8CB (21264C)")
+- UNAME_MACHINE="alphaev68" ;;
++ UNAME_MACHINE=alphaev68 ;;
+ "EV6.8AL (21264B)")
+- UNAME_MACHINE="alphaev68" ;;
++ UNAME_MACHINE=alphaev68 ;;
+ "EV6.8CX (21264D)")
+- UNAME_MACHINE="alphaev68" ;;
++ UNAME_MACHINE=alphaev68 ;;
+ "EV6.9A (21264/EV69A)")
+- UNAME_MACHINE="alphaev69" ;;
++ UNAME_MACHINE=alphaev69 ;;
+ "EV7 (21364)")
+- UNAME_MACHINE="alphaev7" ;;
++ UNAME_MACHINE=alphaev7 ;;
+ "EV7.9 (21364A)")
+- UNAME_MACHINE="alphaev79" ;;
++ UNAME_MACHINE=alphaev79 ;;
+ esac
+ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
+- Alpha\ *:Windows_NT*:*)
+- # How do we know it's Interix rather than the generic POSIX subsystem?
+- # Should we change UNAME_MACHINE based on the output of uname instead
+- # of the specific Alpha model?
+- echo alpha-pc-interix
+- exit ;;
+- 21064:Windows_NT:50:3)
+- echo alpha-dec-winnt3.5
+- exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+- echo ${UNAME_MACHINE}-unknown-amigaos
++ echo "$UNAME_MACHINE"-unknown-amigaos
+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+- echo ${UNAME_MACHINE}-unknown-morphos
++ echo "$UNAME_MACHINE"-unknown-morphos
+ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+@@ -319,7 +352,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+- echo arm-acorn-riscix${UNAME_RELEASE}
++ echo arm-acorn-riscix"$UNAME_RELEASE"
+ exit ;;
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
+ echo arm-unknown-riscos
+@@ -346,38 +379,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+ s390x:SunOS:*:*)
+- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ exit ;;
+ sun4H:SunOS:5.*:*)
+- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+- echo i386-pc-auroraux${UNAME_RELEASE}
++ echo i386-pc-auroraux"$UNAME_RELEASE"
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- eval $set_cc_for_build
+- SUN_ARCH="i386"
++ set_cc_for_build
++ SUN_ARCH=i386
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+- SUN_ARCH="x86_64"
++ SUN_ARCH=x86_64
+ fi
+ fi
+- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ exit ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+@@ -386,25 +419,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+ exit ;;
+ sun3*:SunOS:*:*)
+- echo m68k-sun-sunos${UNAME_RELEASE}
++ echo m68k-sun-sunos"$UNAME_RELEASE"
+ exit ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+- echo m68k-sun-sunos${UNAME_RELEASE}
++ echo m68k-sun-sunos"$UNAME_RELEASE"
+ ;;
+ sun4)
+- echo sparc-sun-sunos${UNAME_RELEASE}
++ echo sparc-sun-sunos"$UNAME_RELEASE"
+ ;;
+ esac
+ exit ;;
+ aushp:SunOS:*:*)
+- echo sparc-auspex-sunos${UNAME_RELEASE}
++ echo sparc-auspex-sunos"$UNAME_RELEASE"
+ exit ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+@@ -415,44 +448,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint"$UNAME_RELEASE"
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint"$UNAME_RELEASE"
+ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint"$UNAME_RELEASE"
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+- echo m68k-milan-mint${UNAME_RELEASE}
++ echo m68k-milan-mint"$UNAME_RELEASE"
+ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+- echo m68k-hades-mint${UNAME_RELEASE}
++ echo m68k-hades-mint"$UNAME_RELEASE"
+ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+- echo m68k-unknown-mint${UNAME_RELEASE}
++ echo m68k-unknown-mint"$UNAME_RELEASE"
+ exit ;;
+ m68k:machten:*:*)
+- echo m68k-apple-machten${UNAME_RELEASE}
++ echo m68k-apple-machten"$UNAME_RELEASE"
+ exit ;;
+ powerpc:machten:*:*)
+- echo powerpc-apple-machten${UNAME_RELEASE}
++ echo powerpc-apple-machten"$UNAME_RELEASE"
+ exit ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit ;;
+ RISC*:ULTRIX:*:*)
+- echo mips-dec-ultrix${UNAME_RELEASE}
++ echo mips-dec-ultrix"$UNAME_RELEASE"
+ exit ;;
+ VAX*:ULTRIX*:*:*)
+- echo vax-dec-ultrix${UNAME_RELEASE}
++ echo vax-dec-ultrix"$UNAME_RELEASE"
+ exit ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+- echo clipper-intergraph-clix${UNAME_RELEASE}
++ echo clipper-intergraph-clix"$UNAME_RELEASE"
+ exit ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ set_cc_for_build
++ sed 's/^ //' << EOF > "$dummy.c"
+ #ifdef __cplusplus
+ #include /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+@@ -461,23 +494,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ #endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c &&
+- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+- SYSTEM_NAME=`$dummy $dummyarg` &&
++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
++ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+ { echo "$SYSTEM_NAME"; exit; }
+- echo mips-mips-riscos${UNAME_RELEASE}
++ echo mips-mips-riscos"$UNAME_RELEASE"
+ exit ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+@@ -503,17 +536,17 @@ EOF
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+ then
+- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+- [ ${TARGET_BINARY_INTERFACE}x = x ]
++ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
++ [ "$TARGET_BINARY_INTERFACE"x = x ]
+ then
+- echo m88k-dg-dgux${UNAME_RELEASE}
++ echo m88k-dg-dgux"$UNAME_RELEASE"
+ else
+- echo m88k-dg-dguxbcs${UNAME_RELEASE}
++ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+ fi
+ else
+- echo i586-dg-dgux${UNAME_RELEASE}
++ echo i586-dg-dgux"$UNAME_RELEASE"
+ fi
+ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+@@ -530,7 +563,7 @@ EOF
+ echo m68k-tektronix-bsd
+ exit ;;
+ *:IRIX*:*:*)
+- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+ exit ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+@@ -542,14 +575,14 @@ EOF
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ fi
+- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+ exit ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ set_cc_for_build
++ sed 's/^ //' << EOF > "$dummy.c"
+ #include
+
+ main()
+@@ -560,7 +593,7 @@ EOF
+ exit(0);
+ }
+ EOF
+- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+ then
+ echo "$SYSTEM_NAME"
+ else
+@@ -574,26 +607,27 @@ EOF
+ exit ;;
+ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
++ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+- if [ -x /usr/bin/oslevel ] ; then
+- IBM_REV=`/usr/bin/oslevel`
++ if [ -x /usr/bin/lslpp ] ; then
++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ else
+- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ fi
+- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+ exit ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit ;;
+- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+ echo romp-ibm-bsd4.4
+ exit ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
++ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
+ exit ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+@@ -608,28 +642,28 @@ EOF
+ echo m68k-hp-bsd4.4
+ exit ;;
+ 9000/[34678]??:HP-UX:*:*)
+- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+- case "${UNAME_MACHINE}" in
+- 9000/31? ) HP_ARCH=m68000 ;;
+- 9000/[34]?? ) HP_ARCH=m68k ;;
++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++ case "$UNAME_MACHINE" in
++ 9000/31?) HP_ARCH=m68000 ;;
++ 9000/[34]??) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+- case "${sc_cpu_version}" in
+- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++ case "$sc_cpu_version" in
++ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
++ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+- case "${sc_kernel_bits}" in
+- 32) HP_ARCH="hppa2.0n" ;;
+- 64) HP_ARCH="hppa2.0w" ;;
+- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
++ case "$sc_kernel_bits" in
++ 32) HP_ARCH=hppa2.0n ;;
++ 64) HP_ARCH=hppa2.0w ;;
++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+- if [ "${HP_ARCH}" = "" ]; then
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ if [ "$HP_ARCH" = "" ]; then
++ set_cc_for_build
++ sed 's/^ //' << EOF > "$dummy.c"
+
+ #define _HPUX_SOURCE
+ #include
+@@ -662,13 +696,13 @@ EOF
+ exit (0);
+ }
+ EOF
+- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+- if [ ${HP_ARCH} = "hppa2.0w" ]
++ if [ "$HP_ARCH" = hppa2.0w ]
+ then
+- eval $set_cc_for_build
++ set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+@@ -679,23 +713,23 @@ EOF
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep -q __LP64__
+ then
+- HP_ARCH="hppa2.0w"
++ HP_ARCH=hppa2.0w
+ else
+- HP_ARCH="hppa64"
++ HP_ARCH=hppa64
+ fi
+ fi
+- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+ exit ;;
+ ia64:HP-UX:*:*)
+- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+- echo ia64-hp-hpux${HPUX_REV}
++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++ echo ia64-hp-hpux"$HPUX_REV"
+ exit ;;
+ 3050*:HI-UX:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ set_cc_for_build
++ sed 's/^ //' << EOF > "$dummy.c"
+ #include
+ int
+ main ()
+@@ -720,11 +754,11 @@ EOF
+ exit (0);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo unknown-hitachi-hiuxwe2
+ exit ;;
+- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+ echo hppa1.1-hp-bsd
+ exit ;;
+ 9000/8??:4.3bsd:*:*)
+@@ -733,7 +767,7 @@ EOF
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit ;;
+- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+ echo hppa1.1-hp-osf
+ exit ;;
+ hp8??:OSF1:*:*)
+@@ -741,9 +775,9 @@ EOF
+ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+- echo ${UNAME_MACHINE}-unknown-osf1mk
++ echo "$UNAME_MACHINE"-unknown-osf1mk
+ else
+- echo ${UNAME_MACHINE}-unknown-osf1
++ echo "$UNAME_MACHINE"-unknown-osf1
+ fi
+ exit ;;
+ parisc*:Lites*:*:*)
+@@ -768,127 +802,120 @@ EOF
+ echo c4-convex-bsd
+ exit ;;
+ CRAY*Y-MP:*:*:*)
+- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*[A-Z]90:*:*:*)
+- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*TS:*:*:*)
+- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*T3E:*:*:*)
+- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*SV1:*:*:*)
+- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ *:UNICOS/mp:*:*)
+- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+ exit ;;
+ sparc*:BSD/OS:*:*)
+- echo sparc-unknown-bsdi${UNAME_RELEASE}
++ echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ exit ;;
+ *:BSD/OS:*:*)
+- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
++ exit ;;
++ arm:FreeBSD:*:*)
++ UNAME_PROCESSOR=`uname -p`
++ set_cc_for_build
++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP
++ then
++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
++ else
++ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
++ fi
+ exit ;;
+ *:FreeBSD:*:*)
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+- case ${UNAME_PROCESSOR} in
++ case "$UNAME_PROCESSOR" in
+ amd64)
+- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+- *)
+- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ UNAME_PROCESSOR=x86_64 ;;
++ i386)
++ UNAME_PROCESSOR=i586 ;;
+ esac
++ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ exit ;;
+ i*:CYGWIN*:*)
+- echo ${UNAME_MACHINE}-pc-cygwin
++ echo "$UNAME_MACHINE"-pc-cygwin
+ exit ;;
+ *:MINGW64*:*)
+- echo ${UNAME_MACHINE}-pc-mingw64
++ echo "$UNAME_MACHINE"-pc-mingw64
+ exit ;;
+ *:MINGW*:*)
+- echo ${UNAME_MACHINE}-pc-mingw32
+- exit ;;
+- i*:MSYS*:*)
+- echo ${UNAME_MACHINE}-pc-msys
++ echo "$UNAME_MACHINE"-pc-mingw32
+ exit ;;
+- i*:windows32*:*)
+- # uname -m includes "-pc" on this system.
+- echo ${UNAME_MACHINE}-mingw32
++ *:MSYS*:*)
++ echo "$UNAME_MACHINE"-pc-msys
+ exit ;;
+ i*:PW*:*)
+- echo ${UNAME_MACHINE}-pc-pw32
++ echo "$UNAME_MACHINE"-pc-pw32
+ exit ;;
+ *:Interix*:*)
+- case ${UNAME_MACHINE} in
++ case "$UNAME_MACHINE" in
+ x86)
+- echo i586-pc-interix${UNAME_RELEASE}
++ echo i586-pc-interix"$UNAME_RELEASE"
+ exit ;;
+ authenticamd | genuineintel | EM64T)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
++ echo x86_64-unknown-interix"$UNAME_RELEASE"
+ exit ;;
+ IA64)
+- echo ia64-unknown-interix${UNAME_RELEASE}
++ echo ia64-unknown-interix"$UNAME_RELEASE"
+ exit ;;
+ esac ;;
+- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+- echo i${UNAME_MACHINE}-pc-mks
+- exit ;;
+- 8664:Windows_NT:*)
+- echo x86_64-pc-mks
+- exit ;;
+- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+- # How do we know it's Interix rather than the generic POSIX subsystem?
+- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+- # UNAME_MACHINE based on the output of uname instead of i386?
+- echo i586-pc-interix
+- exit ;;
+ i*:UWIN*:*)
+- echo ${UNAME_MACHINE}-pc-uwin
++ echo "$UNAME_MACHINE"-pc-uwin
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+- echo x86_64-unknown-cygwin
+- exit ;;
+- p*:CYGWIN*:*)
+- echo powerpcle-unknown-cygwin
++ echo x86_64-pc-cygwin
+ exit ;;
+ prep*:SunOS:5.*:*)
+- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+ exit ;;
+- i*86:Minix:*:*)
+- echo ${UNAME_MACHINE}-pc-minix
++ *:Minix:*:*)
++ echo "$UNAME_MACHINE"-unknown-minix
+ exit ;;
+ aarch64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -901,58 +928,64 @@ EOF
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ arm*:Linux:*:*)
+- eval $set_cc_for_build
++ set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ cris:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ exit ;;
+ crisv32:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
++ exit ;;
++ e2k:Linux:*:*)
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ frv:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ hexagon:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ i*86:Linux:*:*)
+- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++ exit ;;
++ k1om:Linux:*:*)
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ set_cc_for_build
++ sed 's/^ //' << EOF > "$dummy.c"
+ #undef CPU
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
+@@ -966,64 +999,70 @@ EOF
+ #endif
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
++ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+ ;;
+- or1k:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ mips64el:Linux:*:*)
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++ exit ;;
++ openrisc*:Linux:*:*)
++ echo or1k-unknown-linux-"$LIBC"
+ exit ;;
+- or32:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ or32:Linux:*:* | or1k*:Linux:*:*)
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ padre:Linux:*:*)
+- echo sparc-unknown-linux-${LIBC}
++ echo sparc-unknown-linux-"$LIBC"
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-${LIBC}
++ echo hppa64-unknown-linux-"$LIBC"
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+- *) echo hppa-unknown-linux-${LIBC} ;;
++ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
++ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
++ *) echo hppa-unknown-linux-"$LIBC" ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-${LIBC}
++ echo powerpc64-unknown-linux-"$LIBC"
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-unknown-linux-${LIBC}
++ echo powerpc-unknown-linux-"$LIBC"
+ exit ;;
+ ppc64le:Linux:*:*)
+- echo powerpc64le-unknown-linux-${LIBC}
++ echo powerpc64le-unknown-linux-"$LIBC"
+ exit ;;
+ ppcle:Linux:*:*)
+- echo powerpcle-unknown-linux-${LIBC}
++ echo powerpcle-unknown-linux-"$LIBC"
++ exit ;;
++ riscv32:Linux:*:* | riscv64:Linux:*:*)
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ tile*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+ exit ;;
+ x86_64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1037,34 +1076,34 @@ EOF
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+- echo ${UNAME_MACHINE}-pc-os2-emx
++ echo "$UNAME_MACHINE"-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+- echo ${UNAME_MACHINE}-unknown-stop
++ echo "$UNAME_MACHINE"-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+- echo ${UNAME_MACHINE}-unknown-atheos
++ echo "$UNAME_MACHINE"-unknown-atheos
+ exit ;;
+ i*86:syllable:*:*)
+- echo ${UNAME_MACHINE}-pc-syllable
++ echo "$UNAME_MACHINE"-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+- echo i386-unknown-lynxos${UNAME_RELEASE}
++ echo i386-unknown-lynxos"$UNAME_RELEASE"
+ exit ;;
+ i*86:*DOS:*:*)
+- echo ${UNAME_MACHINE}-pc-msdosdjgpp
++ echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ exit ;;
+- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++ i*86:*:4.*:*)
++ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ else
+- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ fi
+ exit ;;
+ i*86:*:5:[678]*)
+@@ -1074,12 +1113,12 @@ EOF
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+@@ -1089,9 +1128,9 @@ EOF
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ else
+- echo ${UNAME_MACHINE}-pc-sysv32
++ echo "$UNAME_MACHINE"-pc-sysv32
+ fi
+ exit ;;
+ pc:*:*:*)
+@@ -1099,7 +1138,7 @@ EOF
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+- # prints for the "djgpp" host, or else GDB configury will decide that
++ # prints for the "djgpp" host, or else GDB configure will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+ exit ;;
+@@ -1111,9 +1150,9 @@ EOF
+ exit ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
++ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
+ fi
+ exit ;;
+ mini*:CTIX:SYS*5:*)
+@@ -1133,9 +1172,9 @@ EOF
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
+@@ -1144,28 +1183,28 @@ EOF
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+- echo m68k-unknown-lynxos${UNAME_RELEASE}
++ echo m68k-unknown-lynxos"$UNAME_RELEASE"
+ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+- echo sparc-unknown-lynxos${UNAME_RELEASE}
++ echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ exit ;;
+ rs6000:LynxOS:2.*:*)
+- echo rs6000-unknown-lynxos${UNAME_RELEASE}
++ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+- echo powerpc-unknown-lynxos${UNAME_RELEASE}
++ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+- echo mips-dde-sysv${UNAME_RELEASE}
++ echo mips-dde-sysv"$UNAME_RELEASE"
+ exit ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+@@ -1176,7 +1215,7 @@ EOF
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+- echo ${UNAME_MACHINE}-sni-sysv4
++ echo "$UNAME_MACHINE"-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+@@ -1196,23 +1235,23 @@ EOF
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
+- echo ${UNAME_MACHINE}-stratus-vos
++ echo "$UNAME_MACHINE"-stratus-vos
+ exit ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+ exit ;;
+ mc68*:A/UX:*:*)
+- echo m68k-apple-aux${UNAME_RELEASE}
++ echo m68k-apple-aux"$UNAME_RELEASE"
+ exit ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+- echo mips-nec-sysv${UNAME_RELEASE}
++ echo mips-nec-sysv"$UNAME_RELEASE"
+ else
+- echo mips-unknown-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv"$UNAME_RELEASE"
+ fi
+ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+@@ -1231,67 +1270,93 @@ EOF
+ echo x86_64-unknown-haiku
+ exit ;;
+ SX-4:SUPER-UX:*:*)
+- echo sx4-nec-superux${UNAME_RELEASE}
++ echo sx4-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-5:SUPER-UX:*:*)
+- echo sx5-nec-superux${UNAME_RELEASE}
++ echo sx5-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-6:SUPER-UX:*:*)
+- echo sx6-nec-superux${UNAME_RELEASE}
++ echo sx6-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-7:SUPER-UX:*:*)
+- echo sx7-nec-superux${UNAME_RELEASE}
++ echo sx7-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+- echo sx8-nec-superux${UNAME_RELEASE}
++ echo sx8-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+- echo sx8r-nec-superux${UNAME_RELEASE}
++ echo sx8r-nec-superux"$UNAME_RELEASE"
++ exit ;;
++ SX-ACE:SUPER-UX:*:*)
++ echo sxace-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ Power*:Rhapsody:*:*)
+- echo powerpc-apple-rhapsody${UNAME_RELEASE}
++ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+ exit ;;
+ *:Rhapsody:*:*)
+- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+- eval $set_cc_for_build
++ set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- case $UNAME_PROCESSOR in
+- i386) UNAME_PROCESSOR=x86_64 ;;
+- powerpc) UNAME_PROCESSOR=powerpc64 ;;
+- esac
++ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ case $UNAME_PROCESSOR in
++ i386) UNAME_PROCESSOR=x86_64 ;;
++ powerpc) UNAME_PROCESSOR=powerpc64 ;;
++ esac
++ fi
++ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
++ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_PPC >/dev/null
++ then
++ UNAME_PROCESSOR=powerpc
++ fi
+ fi
++ elif test "$UNAME_PROCESSOR" = i386 ; then
++ # Avoid executing cc on OS X 10.9, as it ships with a stub
++ # that puts up a graphical alert prompting to install
++ # developer tools. Any system running Mac OS X 10.7 or
++ # later (Darwin 11 and later) is required to have a 64-bit
++ # processor. This is not true of the ARM version of Darwin
++ # that Apple uses in portable devices.
++ UNAME_PROCESSOR=x86_64
+ fi
+- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+- if test "$UNAME_PROCESSOR" = "x86"; then
++ if test "$UNAME_PROCESSOR" = x86; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+ fi
+- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+ exit ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit ;;
+- NEO-?:NONSTOP_KERNEL:*:*)
+- echo neo-tandem-nsk${UNAME_RELEASE}
++ NEO-*:NONSTOP_KERNEL:*:*)
++ echo neo-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSE-*:NONSTOP_KERNEL:*:*)
+- echo nse-tandem-nsk${UNAME_RELEASE}
++ echo nse-tandem-nsk"$UNAME_RELEASE"
++ exit ;;
++ NSR-*:NONSTOP_KERNEL:*:*)
++ echo nsr-tandem-nsk"$UNAME_RELEASE"
++ exit ;;
++ NSV-*:NONSTOP_KERNEL:*:*)
++ echo nsv-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+- NSR-?:NONSTOP_KERNEL:*:*)
+- echo nsr-tandem-nsk${UNAME_RELEASE}
++ NSX-*:NONSTOP_KERNEL:*:*)
++ echo nsx-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+@@ -1300,18 +1365,19 @@ EOF
+ echo bs2000-siemens-sysv
+ exit ;;
+ DS/*:UNIX_System_V:*:*)
+- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+ exit ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+- if test "$cputype" = "386"; then
++ # shellcheck disable=SC2154
++ if test "$cputype" = 386; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+- echo ${UNAME_MACHINE}-unknown-plan9
++ echo "$UNAME_MACHINE"-unknown-plan9
+ exit ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+@@ -1332,14 +1398,14 @@ EOF
+ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+- echo mips-sei-seiux${UNAME_RELEASE}
++ echo mips-sei-seiux"$UNAME_RELEASE"
+ exit ;;
+ *:DragonFly:*:*)
+- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+- case "${UNAME_MACHINE}" in
++ case "$UNAME_MACHINE" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+@@ -1348,182 +1414,51 @@ EOF
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+ exit ;;
+ i*86:rdos:*:*)
+- echo ${UNAME_MACHINE}-pc-rdos
++ echo "$UNAME_MACHINE"-pc-rdos
+ exit ;;
+ i*86:AROS:*:*)
+- echo ${UNAME_MACHINE}-pc-aros
++ echo "$UNAME_MACHINE"-pc-aros
+ exit ;;
+ x86_64:VMkernel:*:*)
+- echo ${UNAME_MACHINE}-unknown-esx
++ echo "$UNAME_MACHINE"-unknown-esx
++ exit ;;
++ amd64:Isilon\ OneFS:*:*)
++ echo x86_64-unknown-onefs
++ exit ;;
++ *:Unleashed:*:*)
++ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+ exit ;;
+ esac
+
+-eval $set_cc_for_build
+-cat >$dummy.c <
+-# include
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+- I don't know.... */
+- printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include
+- printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+- "4"
+-#else
+- ""
+-#endif
+- ); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+- printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+- printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+- int version;
+- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+- if (version < 4)
+- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+- else
+- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+- exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+- printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+- printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+- printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+- printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+- printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+- printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+- struct utsname un;
+-
+- uname(&un);
+-
+- if (strncmp(un.version, "V2", 2) == 0) {
+- printf ("i386-sequent-ptx2\n"); exit (0);
+- }
+- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+- printf ("i386-sequent-ptx1\n"); exit (0);
+- }
+- printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-# include
+-# if defined (BSD)
+-# if BSD == 43
+- printf ("vax-dec-bsd4.3\n"); exit (0);
+-# else
+-# if BSD == 199006
+- printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-# else
+- printf ("vax-dec-bsd\n"); exit (0);
+-# endif
+-# endif
+-# else
+- printf ("vax-dec-bsd\n"); exit (0);
+-# endif
+-# else
+- printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
++echo "$0: unable to guess system type" >&2
+
+-#if defined (alliant) && defined (i860)
+- printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
++ mips:Linux | mips64:Linux)
++ # If we got here on MIPS GNU/Linux, output extra information.
++ cat >&2 </dev/null && SYSTEM_NAME=`$dummy` &&
+- { echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+- case `getsysinfo -f cpu_type` in
+- c1*)
+- echo c1-convex-bsd
+- exit ;;
+- c2*)
+- if getsysinfo -f scalar_acc
+- then echo c32-convex-bsd
+- else echo c2-convex-bsd
+- fi
+- exit ;;
+- c34*)
+- echo c34-convex-bsd
+- exit ;;
+- c38*)
+- echo c38-convex-bsd
+- exit ;;
+- c4*)
+- echo c4-convex-bsd
+- exit ;;
+- esac
+-fi
++ ;;
++esac
+
+ cat >&2 < in order to provide the needed
+-information to handle your system.
++If $0 has already been updated, send the following data and any
++information you think might be pertinent to config-patches@gnu.org to
++provide the necessary information to handle your system.
+
+ config.guess timestamp = $timestamp
+
+@@ -1542,16 +1477,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
+ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+-UNAME_MACHINE = ${UNAME_MACHINE}
+-UNAME_RELEASE = ${UNAME_RELEASE}
+-UNAME_SYSTEM = ${UNAME_SYSTEM}
+-UNAME_VERSION = ${UNAME_VERSION}
++UNAME_MACHINE = "$UNAME_MACHINE"
++UNAME_RELEASE = "$UNAME_RELEASE"
++UNAME_SYSTEM = "$UNAME_SYSTEM"
++UNAME_VERSION = "$UNAME_VERSION"
+ EOF
+
+ exit 1
+
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+diff --git a/config/gnu/config.sub b/config/gnu/config.sub
+index 8b612ab89..3b4c7624b 100755
+--- a/config/gnu/config.sub
++++ b/config/gnu/config.sub
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-# Copyright 1992-2013 Free Software Foundation, Inc.
++# Copyright 1992-2019 Free Software Foundation, Inc.
+
+-timestamp='2013-04-24'
++timestamp='2019-01-05'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -15,7 +15,7 @@ timestamp='2013-04-24'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see .
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -25,7 +25,7 @@ timestamp='2013-04-24'
+ # of the GNU General Public License, version 3 ("GPLv3").
+
+
+-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to .
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -33,7 +33,7 @@ timestamp='2013-04-24'
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
+ # You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+@@ -53,12 +53,11 @@ timestamp='2013-04-24'
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+ usage="\
+-Usage: $0 [OPTION] CPU-MFR-OPSYS
+- $0 [OPTION] ALIAS
++Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+
+ Canonicalize a configuration name.
+
+-Operation modes:
++Options:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+@@ -68,7 +67,7 @@ Report bugs and patches to ."
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2019 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -90,12 +89,12 @@ while test $# -gt 0 ; do
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+- echo "$me: invalid option $1$help"
++ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+- echo $1
++ echo "$1"
+ exit ;;
+
+ * )
+@@ -111,1209 +110,1164 @@ case $# in
+ exit 1;;
+ esac
+
+-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+-# Here we must recognize all the valid KERNEL-OS combinations.
+-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+-case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+- knetbsd*-gnu* | netbsd*-gnu* | \
+- kopensolaris*-gnu* | \
+- storm-chaos* | os2-emx* | rtmk-nova*)
+- os=-$maybe_os
+- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+- ;;
+- android-linux)
+- os=-linux-android
+- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+- ;;
+- *)
+- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+- if [ $basic_machine != $1 ]
+- then os=`echo $1 | sed 's/.*-/-/'`
+- else os=; fi
+- ;;
+-esac
++# Split fields of configuration type
++# shellcheck disable=SC2162
++IFS="-" read field1 field2 field3 field4 <&2
++ exit 1
+ ;;
+- -ptx*)
+- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
++ *-*-*-*)
++ basic_machine=$field1-$field2
++ os=$field3-$field4
+ ;;
+- -windowsnt*)
+- os=`echo $os | sed -e 's/windowsnt/winnt/'`
++ *-*-*)
++ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
++ # parts
++ maybe_os=$field2-$field3
++ case $maybe_os in
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
++ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
++ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
++ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
++ | storm-chaos* | os2-emx* | rtmk-nova*)
++ basic_machine=$field1
++ os=$maybe_os
++ ;;
++ android-linux)
++ basic_machine=$field1-unknown
++ os=linux-android
++ ;;
++ *)
++ basic_machine=$field1-$field2
++ os=$field3
++ ;;
++ esac
+ ;;
+- -psos*)
+- os=-psos
++ *-*)
++ # A lone config we happen to match not fitting any pattern
++ case $field1-$field2 in
++ decstation-3100)
++ basic_machine=mips-dec
++ os=
++ ;;
++ *-*)
++ # Second component is usually, but not always the OS
++ case $field2 in
++ # Prevent following clause from handling this valid os
++ sun*os*)
++ basic_machine=$field1
++ os=$field2
++ ;;
++ # Manufacturers
++ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
++ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
++ | unicom* | ibm* | next | hp | isi* | apollo | altos* \
++ | convergent* | ncr* | news | 32* | 3600* | 3100* \
++ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
++ | ultra | tti* | harris | dolphin | highlevel | gould \
++ | cbm | ns | masscomp | apple | axis | knuth | cray \
++ | microblaze* | sim | cisco \
++ | oki | wec | wrs | winbond)
++ basic_machine=$field1-$field2
++ os=
++ ;;
++ *)
++ basic_machine=$field1
++ os=$field2
++ ;;
++ esac
++ ;;
++ esac
+ ;;
+- -mint | -mint[0-9]*)
+- basic_machine=m68k-atari
+- os=-mint
++ *)
++ # Convert single-component short-hands not valid as part of
++ # multi-component configurations.
++ case $field1 in
++ 386bsd)
++ basic_machine=i386-pc
++ os=bsd
++ ;;
++ a29khif)
++ basic_machine=a29k-amd
++ os=udi
++ ;;
++ adobe68k)
++ basic_machine=m68010-adobe
++ os=scout
++ ;;
++ alliant)
++ basic_machine=fx80-alliant
++ os=
++ ;;
++ altos | altos3068)
++ basic_machine=m68k-altos
++ os=
++ ;;
++ am29k)
++ basic_machine=a29k-none
++ os=bsd
++ ;;
++ amdahl)
++ basic_machine=580-amdahl
++ os=sysv
++ ;;
++ amiga)
++ basic_machine=m68k-unknown
++ os=
++ ;;
++ amigaos | amigados)
++ basic_machine=m68k-unknown
++ os=amigaos
++ ;;
++ amigaunix | amix)
++ basic_machine=m68k-unknown
++ os=sysv4
++ ;;
++ apollo68)
++ basic_machine=m68k-apollo
++ os=sysv
++ ;;
++ apollo68bsd)
++ basic_machine=m68k-apollo
++ os=bsd
++ ;;
++ aros)
++ basic_machine=i386-pc
++ os=aros
++ ;;
++ aux)
++ basic_machine=m68k-apple
++ os=aux
++ ;;
++ balance)
++ basic_machine=ns32k-sequent
++ os=dynix
++ ;;
++ blackfin)
++ basic_machine=bfin-unknown
++ os=linux
++ ;;
++ cegcc)
++ basic_machine=arm-unknown
++ os=cegcc
++ ;;
++ convex-c1)
++ basic_machine=c1-convex
++ os=bsd
++ ;;
++ convex-c2)
++ basic_machine=c2-convex
++ os=bsd
++ ;;
++ convex-c32)
++ basic_machine=c32-convex
++ os=bsd
++ ;;
++ convex-c34)
++ basic_machine=c34-convex
++ os=bsd
++ ;;
++ convex-c38)
++ basic_machine=c38-convex
++ os=bsd
++ ;;
++ cray)
++ basic_machine=j90-cray
++ os=unicos
++ ;;
++ crds | unos)
++ basic_machine=m68k-crds
++ os=
++ ;;
++ da30)
++ basic_machine=m68k-da30
++ os=
++ ;;
++ decstation | pmax | pmin | dec3100 | decstatn)
++ basic_machine=mips-dec
++ os=
++ ;;
++ delta88)
++ basic_machine=m88k-motorola
++ os=sysv3
++ ;;
++ dicos)
++ basic_machine=i686-pc
++ os=dicos
++ ;;
++ djgpp)
++ basic_machine=i586-pc
++ os=msdosdjgpp
++ ;;
++ ebmon29k)
++ basic_machine=a29k-amd
++ os=ebmon
++ ;;
++ es1800 | OSE68k | ose68k | ose | OSE)
++ basic_machine=m68k-ericsson
++ os=ose
++ ;;
++ gmicro)
++ basic_machine=tron-gmicro
++ os=sysv
++ ;;
++ go32)
++ basic_machine=i386-pc
++ os=go32
++ ;;
++ h8300hms)
++ basic_machine=h8300-hitachi
++ os=hms
++ ;;
++ h8300xray)
++ basic_machine=h8300-hitachi
++ os=xray
++ ;;
++ h8500hms)
++ basic_machine=h8500-hitachi
++ os=hms
++ ;;
++ harris)
++ basic_machine=m88k-harris
++ os=sysv3
++ ;;
++ hp300)
++ basic_machine=m68k-hp
++ ;;
++ hp300bsd)
++ basic_machine=m68k-hp
++ os=bsd
++ ;;
++ hp300hpux)
++ basic_machine=m68k-hp
++ os=hpux
++ ;;
++ hppaosf)
++ basic_machine=hppa1.1-hp
++ os=osf
++ ;;
++ hppro)
++ basic_machine=hppa1.1-hp
++ os=proelf
++ ;;
++ i386mach)
++ basic_machine=i386-mach
++ os=mach
++ ;;
++ vsta)
++ basic_machine=i386-pc
++ os=vsta
++ ;;
++ isi68 | isi)
++ basic_machine=m68k-isi
++ os=sysv
++ ;;
++ m68knommu)
++ basic_machine=m68k-unknown
++ os=linux
++ ;;
++ magnum | m3230)
++ basic_machine=mips-mips
++ os=sysv
++ ;;
++ merlin)
++ basic_machine=ns32k-utek
++ os=sysv
++ ;;
++ mingw64)
++ basic_machine=x86_64-pc
++ os=mingw64
++ ;;
++ mingw32)
++ basic_machine=i686-pc
++ os=mingw32
++ ;;
++ mingw32ce)
++ basic_machine=arm-unknown
++ os=mingw32ce
++ ;;
++ monitor)
++ basic_machine=m68k-rom68k
++ os=coff
++ ;;
++ morphos)
++ basic_machine=powerpc-unknown
++ os=morphos
++ ;;
++ moxiebox)
++ basic_machine=moxie-unknown
++ os=moxiebox
++ ;;
++ msdos)
++ basic_machine=i386-pc
++ os=msdos
++ ;;
++ msys)
++ basic_machine=i686-pc
++ os=msys
++ ;;
++ mvs)
++ basic_machine=i370-ibm
++ os=mvs
++ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=nacl
++ ;;
++ ncr3000)
++ basic_machine=i486-ncr
++ os=sysv4
++ ;;
++ netbsd386)
++ basic_machine=i386-pc
++ os=netbsd
++ ;;
++ netwinder)
++ basic_machine=armv4l-rebel
++ os=linux
++ ;;
++ news | news700 | news800 | news900)
++ basic_machine=m68k-sony
++ os=newsos
++ ;;
++ news1000)
++ basic_machine=m68030-sony
++ os=newsos
++ ;;
++ necv70)
++ basic_machine=v70-nec
++ os=sysv
++ ;;
++ nh3000)
++ basic_machine=m68k-harris
++ os=cxux
++ ;;
++ nh[45]000)
++ basic_machine=m88k-harris
++ os=cxux
++ ;;
++ nindy960)
++ basic_machine=i960-intel
++ os=nindy
++ ;;
++ mon960)
++ basic_machine=i960-intel
++ os=mon960
++ ;;
++ nonstopux)
++ basic_machine=mips-compaq
++ os=nonstopux
++ ;;
++ os400)
++ basic_machine=powerpc-ibm
++ os=os400
++ ;;
++ OSE68000 | ose68000)
++ basic_machine=m68000-ericsson
++ os=ose
++ ;;
++ os68k)
++ basic_machine=m68k-none
++ os=os68k
++ ;;
++ paragon)
++ basic_machine=i860-intel
++ os=osf
++ ;;
++ parisc)
++ basic_machine=hppa-unknown
++ os=linux
++ ;;
++ pw32)
++ basic_machine=i586-unknown
++ os=pw32
++ ;;
++ rdos | rdos64)
++ basic_machine=x86_64-pc
++ os=rdos
++ ;;
++ rdos32)
++ basic_machine=i386-pc
++ os=rdos
++ ;;
++ rom68k)
++ basic_machine=m68k-rom68k
++ os=coff
++ ;;
++ sa29200)
++ basic_machine=a29k-amd
++ os=udi
++ ;;
++ sei)
++ basic_machine=mips-sei
++ os=seiux
++ ;;
++ sequent)
++ basic_machine=i386-sequent
++ os=
++ ;;
++ sps7)
++ basic_machine=m68k-bull
++ os=sysv2
++ ;;
++ st2000)
++ basic_machine=m68k-tandem
++ os=
++ ;;
++ stratus)
++ basic_machine=i860-stratus
++ os=sysv4
++ ;;
++ sun2)
++ basic_machine=m68000-sun
++ os=
++ ;;
++ sun2os3)
++ basic_machine=m68000-sun
++ os=sunos3
++ ;;
++ sun2os4)
++ basic_machine=m68000-sun
++ os=sunos4
++ ;;
++ sun3)
++ basic_machine=m68k-sun
++ os=
++ ;;
++ sun3os3)
++ basic_machine=m68k-sun
++ os=sunos3
++ ;;
++ sun3os4)
++ basic_machine=m68k-sun
++ os=sunos4
++ ;;
++ sun4)
++ basic_machine=sparc-sun
++ os=
++ ;;
++ sun4os3)
++ basic_machine=sparc-sun
++ os=sunos3
++ ;;
++ sun4os4)
++ basic_machine=sparc-sun
++ os=sunos4
++ ;;
++ sun4sol2)
++ basic_machine=sparc-sun
++ os=solaris2
++ ;;
++ sun386 | sun386i | roadrunner)
++ basic_machine=i386-sun
++ os=
++ ;;
++ sv1)
++ basic_machine=sv1-cray
++ os=unicos
++ ;;
++ symmetry)
++ basic_machine=i386-sequent
++ os=dynix
++ ;;
++ t3e)
++ basic_machine=alphaev5-cray
++ os=unicos
++ ;;
++ t90)
++ basic_machine=t90-cray
++ os=unicos
++ ;;
++ toad1)
++ basic_machine=pdp10-xkl
++ os=tops20
++ ;;
++ tpf)
++ basic_machine=s390x-ibm
++ os=tpf
++ ;;
++ udi29k)
++ basic_machine=a29k-amd
++ os=udi
++ ;;
++ ultra3)
++ basic_machine=a29k-nyu
++ os=sym1
++ ;;
++ v810 | necv810)
++ basic_machine=v810-nec
++ os=none
++ ;;
++ vaxv)
++ basic_machine=vax-dec
++ os=sysv
++ ;;
++ vms)
++ basic_machine=vax-dec
++ os=vms
++ ;;
++ vxworks960)
++ basic_machine=i960-wrs
++ os=vxworks
++ ;;
++ vxworks68)
++ basic_machine=m68k-wrs
++ os=vxworks
++ ;;
++ vxworks29k)
++ basic_machine=a29k-wrs
++ os=vxworks
++ ;;
++ xbox)
++ basic_machine=i686-pc
++ os=mingw32
++ ;;
++ ymp)
++ basic_machine=ymp-cray
++ os=unicos
++ ;;
++ *)
++ basic_machine=$1
++ os=
++ ;;
++ esac
+ ;;
+ esac
+
+-# Decode aliases for certain CPU-COMPANY combinations.
++# Decode 1-component or ad-hoc basic machines
+ case $basic_machine in
+- # Recognize the basic CPU types without company name.
+- # Some are omitted here because they have special meanings below.
+- 1750a | 580 \
+- | a29k \
+- | aarch64 | aarch64_be \
+- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+- | am33_2.0 \
+- | arc | arceb \
+- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+- | avr | avr32 \
+- | be32 | be64 \
+- | bfin \
+- | c4x | clipper \
+- | d10v | d30v | dlx | dsp16xx \
+- | epiphany \
+- | fido | fr30 | frv \
+- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+- | hexagon \
+- | i370 | i860 | i960 | ia64 \
+- | ip2k | iq2000 \
+- | le32 | le64 \
+- | lm32 \
+- | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+- | mips | mipsbe | mipseb | mipsel | mipsle \
+- | mips16 \
+- | mips64 | mips64el \
+- | mips64octeon | mips64octeonel \
+- | mips64orion | mips64orionel \
+- | mips64r5900 | mips64r5900el \
+- | mips64vr | mips64vrel \
+- | mips64vr4100 | mips64vr4100el \
+- | mips64vr4300 | mips64vr4300el \
+- | mips64vr5000 | mips64vr5000el \
+- | mips64vr5900 | mips64vr5900el \
+- | mipsisa32 | mipsisa32el \
+- | mipsisa32r2 | mipsisa32r2el \
+- | mipsisa64 | mipsisa64el \
+- | mipsisa64r2 | mipsisa64r2el \
+- | mipsisa64sb1 | mipsisa64sb1el \
+- | mipsisa64sr71k | mipsisa64sr71kel \
+- | mipsr5900 | mipsr5900el \
+- | mipstx39 | mipstx39el \
+- | mn10200 | mn10300 \
+- | moxie \
+- | mt \
+- | msp430 \
+- | nds32 | nds32le | nds32be \
+- | nios | nios2 | nios2eb | nios2el \
+- | ns16k | ns32k \
+- | open8 \
+- | or1k | or32 \
+- | pdp10 | pdp11 | pj | pjl \
+- | powerpc | powerpc64 | powerpc64le | powerpcle \
+- | pyramid \
+- | rl78 | rx \
+- | score \
+- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+- | sh64 | sh64le \
+- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+- | spu \
+- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+- | ubicom32 \
+- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+- | we32k \
+- | x86 | xc16x | xstormy16 | xtensa \
+- | z8k | z80)
+- basic_machine=$basic_machine-unknown
+- ;;
+- c54x)
+- basic_machine=tic54x-unknown
+- ;;
+- c55x)
+- basic_machine=tic55x-unknown
+- ;;
+- c6x)
+- basic_machine=tic6x-unknown
+- ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+- basic_machine=$basic_machine-unknown
+- os=-none
+- ;;
+- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+- ;;
+- ms1)
+- basic_machine=mt-unknown
++ # Here we handle the default manufacturer of certain CPU types. It is in
++ # some cases the only manufacturer, in others, it is the most popular.
++ w89k)
++ cpu=hppa1.1
++ vendor=winbond
+ ;;
+-
+- strongarm | thumb | xscale)
+- basic_machine=arm-unknown
++ op50n)
++ cpu=hppa1.1
++ vendor=oki
+ ;;
+- xgate)
+- basic_machine=$basic_machine-unknown
+- os=-none
++ op60c)
++ cpu=hppa1.1
++ vendor=oki
+ ;;
+- xscaleeb)
+- basic_machine=armeb-unknown
++ ibm*)
++ cpu=i370
++ vendor=ibm
+ ;;
+-
+- xscaleel)
+- basic_machine=armel-unknown
++ orion105)
++ cpu=clipper
++ vendor=highlevel
+ ;;
+-
+- # We use `pc' rather than `unknown'
+- # because (1) that's what they normally are, and
+- # (2) the word "unknown" tends to confuse beginning users.
+- i*86 | x86_64)
+- basic_machine=$basic_machine-pc
+- ;;
+- # Object if more than one company name word.
+- *-*-*)
+- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+- exit 1
++ mac | mpw | mac-mpw)
++ cpu=m68k
++ vendor=apple
+ ;;
+- # Recognize the basic CPU types with company name.
+- 580-* \
+- | a29k-* \
+- | aarch64-* | aarch64_be-* \
+- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+- | avr-* | avr32-* \
+- | be32-* | be64-* \
+- | bfin-* | bs2000-* \
+- | c[123]* | c30-* | [cjt]90-* | c4x-* \
+- | clipper-* | craynv-* | cydra-* \
+- | d10v-* | d30v-* | dlx-* \
+- | elxsi-* \
+- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+- | h8300-* | h8500-* \
+- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+- | hexagon-* \
+- | i*86-* | i860-* | i960-* | ia64-* \
+- | ip2k-* | iq2000-* \
+- | le32-* | le64-* \
+- | lm32-* \
+- | m32c-* | m32r-* | m32rle-* \
+- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+- | microblaze-* | microblazeel-* \
+- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+- | mips16-* \
+- | mips64-* | mips64el-* \
+- | mips64octeon-* | mips64octeonel-* \
+- | mips64orion-* | mips64orionel-* \
+- | mips64r5900-* | mips64r5900el-* \
+- | mips64vr-* | mips64vrel-* \
+- | mips64vr4100-* | mips64vr4100el-* \
+- | mips64vr4300-* | mips64vr4300el-* \
+- | mips64vr5000-* | mips64vr5000el-* \
+- | mips64vr5900-* | mips64vr5900el-* \
+- | mipsisa32-* | mipsisa32el-* \
+- | mipsisa32r2-* | mipsisa32r2el-* \
+- | mipsisa64-* | mipsisa64el-* \
+- | mipsisa64r2-* | mipsisa64r2el-* \
+- | mipsisa64sb1-* | mipsisa64sb1el-* \
+- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+- | mipsr5900-* | mipsr5900el-* \
+- | mipstx39-* | mipstx39el-* \
+- | mmix-* \
+- | mt-* \
+- | msp430-* \
+- | nds32-* | nds32le-* | nds32be-* \
+- | nios-* | nios2-* | nios2eb-* | nios2el-* \
+- | none-* | np1-* | ns16k-* | ns32k-* \
+- | open8-* \
+- | orion-* \
+- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+- | pyramid-* \
+- | rl78-* | romp-* | rs6000-* | rx-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+- | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+- | tahoe-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+- | tile*-* \
+- | tron-* \
+- | ubicom32-* \
+- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+- | vax-* \
+- | we32k-* \
+- | x86-* | x86_64-* | xc16x-* | xps100-* \
+- | xstormy16-* | xtensa*-* \
+- | ymp-* \
+- | z8k-* | z80-*)
+- ;;
+- # Recognize the basic CPU types without company name, with glob match.
+- xtensa*)
+- basic_machine=$basic_machine-unknown
++ pmac | pmac-mpw)
++ cpu=powerpc
++ vendor=apple
+ ;;
++
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+- 386bsd)
+- basic_machine=i386-unknown
+- os=-bsd
+- ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+- basic_machine=m68000-att
++ cpu=m68000
++ vendor=att
+ ;;
+ 3b*)
+- basic_machine=we32k-att
+- ;;
+- a29khif)
+- basic_machine=a29k-amd
+- os=-udi
+- ;;
+- abacus)
+- basic_machine=abacus-unknown
+- ;;
+- adobe68k)
+- basic_machine=m68010-adobe
+- os=-scout
+- ;;
+- alliant | fx80)
+- basic_machine=fx80-alliant
+- ;;
+- altos | altos3068)
+- basic_machine=m68k-altos
+- ;;
+- am29k)
+- basic_machine=a29k-none
+- os=-bsd
+- ;;
+- amd64)
+- basic_machine=x86_64-pc
+- ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- amdahl)
+- basic_machine=580-amdahl
+- os=-sysv
+- ;;
+- amiga | amiga-*)
+- basic_machine=m68k-unknown
+- ;;
+- amigaos | amigados)
+- basic_machine=m68k-unknown
+- os=-amigaos
+- ;;
+- amigaunix | amix)
+- basic_machine=m68k-unknown
+- os=-sysv4
+- ;;
+- apollo68)
+- basic_machine=m68k-apollo
+- os=-sysv
+- ;;
+- apollo68bsd)
+- basic_machine=m68k-apollo
+- os=-bsd
+- ;;
+- aros)
+- basic_machine=i386-pc
+- os=-aros
+- ;;
+- aux)
+- basic_machine=m68k-apple
+- os=-aux
+- ;;
+- balance)
+- basic_machine=ns32k-sequent
+- os=-dynix
+- ;;
+- blackfin)
+- basic_machine=bfin-unknown
+- os=-linux
+- ;;
+- blackfin-*)
+- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+- os=-linux
++ cpu=we32k
++ vendor=att
+ ;;
+ bluegene*)
+- basic_machine=powerpc-ibm
+- os=-cnk
+- ;;
+- c54x-*)
+- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- c55x-*)
+- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- c6x-*)
+- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- c90)
+- basic_machine=c90-cray
+- os=-unicos
+- ;;
+- cegcc)
+- basic_machine=arm-unknown
+- os=-cegcc
+- ;;
+- convex-c1)
+- basic_machine=c1-convex
+- os=-bsd
+- ;;
+- convex-c2)
+- basic_machine=c2-convex
+- os=-bsd
+- ;;
+- convex-c32)
+- basic_machine=c32-convex
+- os=-bsd
+- ;;
+- convex-c34)
+- basic_machine=c34-convex
+- os=-bsd
+- ;;
+- convex-c38)
+- basic_machine=c38-convex
+- os=-bsd
+- ;;
+- cray | j90)
+- basic_machine=j90-cray
+- os=-unicos
+- ;;
+- craynv)
+- basic_machine=craynv-cray
+- os=-unicosmp
+- ;;
+- cr16 | cr16-*)
+- basic_machine=cr16-unknown
+- os=-elf
+- ;;
+- crds | unos)
+- basic_machine=m68k-crds
+- ;;
+- crisv32 | crisv32-* | etraxfs*)
+- basic_machine=crisv32-axis
+- ;;
+- cris | cris-* | etrax*)
+- basic_machine=cris-axis
+- ;;
+- crx)
+- basic_machine=crx-unknown
+- os=-elf
+- ;;
+- da30 | da30-*)
+- basic_machine=m68k-da30
+- ;;
+- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+- basic_machine=mips-dec
++ cpu=powerpc
++ vendor=ibm
++ os=cnk
+ ;;
+ decsystem10* | dec10*)
+- basic_machine=pdp10-dec
+- os=-tops10
++ cpu=pdp10
++ vendor=dec
++ os=tops10
+ ;;
+ decsystem20* | dec20*)
+- basic_machine=pdp10-dec
+- os=-tops20
++ cpu=pdp10
++ vendor=dec
++ os=tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+- basic_machine=m68k-motorola
+- ;;
+- delta88)
+- basic_machine=m88k-motorola
+- os=-sysv3
+- ;;
+- dicos)
+- basic_machine=i686-pc
+- os=-dicos
++ cpu=m68k
++ vendor=motorola
+ ;;
+- djgpp)
+- basic_machine=i586-pc
+- os=-msdosdjgpp
+- ;;
+- dpx20 | dpx20-*)
+- basic_machine=rs6000-bull
+- os=-bosx
+- ;;
+- dpx2* | dpx2*-bull)
+- basic_machine=m68k-bull
+- os=-sysv3
+- ;;
+- ebmon29k)
+- basic_machine=a29k-amd
+- os=-ebmon
+- ;;
+- elxsi)
+- basic_machine=elxsi-elxsi
+- os=-bsd
++ dpx2*)
++ cpu=m68k
++ vendor=bull
++ os=sysv3
+ ;;
+ encore | umax | mmax)
+- basic_machine=ns32k-encore
++ cpu=ns32k
++ vendor=encore
+ ;;
+- es1800 | OSE68k | ose68k | ose | OSE)
+- basic_machine=m68k-ericsson
+- os=-ose
++ elxsi)
++ cpu=elxsi
++ vendor=elxsi
++ os=${os:-bsd}
+ ;;
+ fx2800)
+- basic_machine=i860-alliant
++ cpu=i860
++ vendor=alliant
+ ;;
+ genix)
+- basic_machine=ns32k-ns
+- ;;
+- gmicro)
+- basic_machine=tron-gmicro
+- os=-sysv
+- ;;
+- go32)
+- basic_machine=i386-pc
+- os=-go32
++ cpu=ns32k
++ vendor=ns
+ ;;
+ h3050r* | hiux*)
+- basic_machine=hppa1.1-hitachi
+- os=-hiuxwe2
+- ;;
+- h8300hms)
+- basic_machine=h8300-hitachi
+- os=-hms
+- ;;
+- h8300xray)
+- basic_machine=h8300-hitachi
+- os=-xray
+- ;;
+- h8500hms)
+- basic_machine=h8500-hitachi
+- os=-hms
+- ;;
+- harris)
+- basic_machine=m88k-harris
+- os=-sysv3
+- ;;
+- hp300-*)
+- basic_machine=m68k-hp
+- ;;
+- hp300bsd)
+- basic_machine=m68k-hp
+- os=-bsd
+- ;;
+- hp300hpux)
+- basic_machine=m68k-hp
+- os=-hpux
++ cpu=hppa1.1
++ vendor=hitachi
++ os=hiuxwe2
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+- basic_machine=hppa1.0-hp
++ cpu=hppa1.0
++ vendor=hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+- basic_machine=m68000-hp
++ cpu=m68000
++ vendor=hp
+ ;;
+ hp9k3[2-9][0-9])
+- basic_machine=m68k-hp
++ cpu=m68k
++ vendor=hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+- basic_machine=hppa1.0-hp
++ cpu=hppa1.0
++ vendor=hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+- basic_machine=hppa1.1-hp
++ cpu=hppa1.1
++ vendor=hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+- basic_machine=hppa1.1-hp
++ cpu=hppa1.1
++ vendor=hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+- basic_machine=hppa1.1-hp
++ cpu=hppa1.1
++ vendor=hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+- basic_machine=hppa1.1-hp
++ cpu=hppa1.1
++ vendor=hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+- basic_machine=hppa1.0-hp
+- ;;
+- hppa-next)
+- os=-nextstep3
+- ;;
+- hppaosf)
+- basic_machine=hppa1.1-hp
+- os=-osf
+- ;;
+- hppro)
+- basic_machine=hppa1.1-hp
+- os=-proelf
+- ;;
+- i370-ibm* | ibm*)
+- basic_machine=i370-ibm
++ cpu=hppa1.0
++ vendor=hp
+ ;;
+ i*86v32)
+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+- os=-sysv32
++ cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ vendor=pc
++ os=sysv32
+ ;;
+ i*86v4*)
+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+- os=-sysv4
++ cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ vendor=pc
++ os=sysv4
+ ;;
+ i*86v)
+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+- os=-sysv
++ cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ vendor=pc
++ os=sysv
+ ;;
+ i*86sol2)
+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+- os=-solaris2
++ cpu=`echo "$1" | sed -e 's/86.*/86/'`
++ vendor=pc
++ os=solaris2
+ ;;
+- i386mach)
+- basic_machine=i386-mach
+- os=-mach
+- ;;
+- i386-vsta | vsta)
+- basic_machine=i386-unknown
+- os=-vsta
++ j90 | j90-cray)
++ cpu=j90
++ vendor=cray
++ os=${os:-unicos}
+ ;;
+ iris | iris4d)
+- basic_machine=mips-sgi
++ cpu=mips
++ vendor=sgi
+ case $os in
+- -irix*)
++ irix*)
+ ;;
+ *)
+- os=-irix4
++ os=irix4
+ ;;
+ esac
+ ;;
+- isi68 | isi)
+- basic_machine=m68k-isi
+- os=-sysv
+- ;;
+- m68knommu)
+- basic_machine=m68k-unknown
+- os=-linux
+- ;;
+- m68knommu-*)
+- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+- os=-linux
+- ;;
+- m88k-omron*)
+- basic_machine=m88k-omron
+- ;;
+- magnum | m3230)
+- basic_machine=mips-mips
+- os=-sysv
+- ;;
+- merlin)
+- basic_machine=ns32k-utek
+- os=-sysv
+- ;;
+- microblaze*)
+- basic_machine=microblaze-xilinx
+- ;;
+- mingw64)
+- basic_machine=x86_64-pc
+- os=-mingw64
+- ;;
+- mingw32)
+- basic_machine=i386-pc
+- os=-mingw32
+- ;;
+- mingw32ce)
+- basic_machine=arm-unknown
+- os=-mingw32ce
+- ;;
+ miniframe)
+- basic_machine=m68000-convergent
+- ;;
+- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+- basic_machine=m68k-atari
+- os=-mint
+- ;;
+- mips3*-*)
+- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+- ;;
+- mips3*)
+- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+- ;;
+- monitor)
+- basic_machine=m68k-rom68k
+- os=-coff
+- ;;
+- morphos)
+- basic_machine=powerpc-unknown
+- os=-morphos
+- ;;
+- msdos)
+- basic_machine=i386-pc
+- os=-msdos
+- ;;
+- ms1-*)
+- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+- ;;
+- msys)
+- basic_machine=i386-pc
+- os=-msys
+- ;;
+- mvs)
+- basic_machine=i370-ibm
+- os=-mvs
+- ;;
+- nacl)
+- basic_machine=le32-unknown
+- os=-nacl
+- ;;
+- ncr3000)
+- basic_machine=i486-ncr
+- os=-sysv4
++ cpu=m68000
++ vendor=convergent
+ ;;
+- netbsd386)
+- basic_machine=i386-unknown
+- os=-netbsd
+- ;;
+- netwinder)
+- basic_machine=armv4l-rebel
+- os=-linux
+- ;;
+- news | news700 | news800 | news900)
+- basic_machine=m68k-sony
+- os=-newsos
+- ;;
+- news1000)
+- basic_machine=m68030-sony
+- os=-newsos
++ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
++ cpu=m68k
++ vendor=atari
++ os=mint
+ ;;
+ news-3600 | risc-news)
+- basic_machine=mips-sony
+- os=-newsos
+- ;;
+- necv70)
+- basic_machine=v70-nec
+- os=-sysv
++ cpu=mips
++ vendor=sony
++ os=newsos
+ ;;
+- next | m*-next )
+- basic_machine=m68k-next
++ next | m*-next)
++ cpu=m68k
++ vendor=next
+ case $os in
+- -nextstep* )
++ nextstep* )
+ ;;
+- -ns2*)
+- os=-nextstep2
++ ns2*)
++ os=nextstep2
+ ;;
+ *)
+- os=-nextstep3
++ os=nextstep3
+ ;;
+ esac
+ ;;
+- nh3000)
+- basic_machine=m68k-harris
+- os=-cxux
+- ;;
+- nh[45]000)
+- basic_machine=m88k-harris
+- os=-cxux
+- ;;
+- nindy960)
+- basic_machine=i960-intel
+- os=-nindy
+- ;;
+- mon960)
+- basic_machine=i960-intel
+- os=-mon960
+- ;;
+- nonstopux)
+- basic_machine=mips-compaq
+- os=-nonstopux
+- ;;
+ np1)
+- basic_machine=np1-gould
+- ;;
+- neo-tandem)
+- basic_machine=neo-tandem
+- ;;
+- nse-tandem)
+- basic_machine=nse-tandem
+- ;;
+- nsr-tandem)
+- basic_machine=nsr-tandem
++ cpu=np1
++ vendor=gould
+ ;;
+ op50n-* | op60c-*)
+- basic_machine=hppa1.1-oki
+- os=-proelf
+- ;;
+- openrisc | openrisc-*)
+- basic_machine=or32-unknown
+- ;;
+- os400)
+- basic_machine=powerpc-ibm
+- os=-os400
+- ;;
+- OSE68000 | ose68000)
+- basic_machine=m68000-ericsson
+- os=-ose
+- ;;
+- os68k)
+- basic_machine=m68k-none
+- os=-os68k
++ cpu=hppa1.1
++ vendor=oki
++ os=proelf
+ ;;
+ pa-hitachi)
+- basic_machine=hppa1.1-hitachi
+- os=-hiuxwe2
+- ;;
+- paragon)
+- basic_machine=i860-intel
+- os=-osf
+- ;;
+- parisc)
+- basic_machine=hppa-unknown
+- os=-linux
+- ;;
+- parisc-*)
+- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+- os=-linux
++ cpu=hppa1.1
++ vendor=hitachi
++ os=hiuxwe2
+ ;;
+ pbd)
+- basic_machine=sparc-tti
++ cpu=sparc
++ vendor=tti
+ ;;
+ pbb)
+- basic_machine=m68k-tti
+- ;;
+- pc532 | pc532-*)
+- basic_machine=ns32k-pc532
+- ;;
+- pc98)
+- basic_machine=i386-pc
++ cpu=m68k
++ vendor=tti
+ ;;
+- pc98-*)
+- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- pentium | p5 | k5 | k6 | nexgen | viac3)
+- basic_machine=i586-pc
+- ;;
+- pentiumpro | p6 | 6x86 | athlon | athlon_*)
+- basic_machine=i686-pc
+- ;;
+- pentiumii | pentium2 | pentiumiii | pentium3)
+- basic_machine=i686-pc
+- ;;
+- pentium4)
+- basic_machine=i786-pc
+- ;;
+- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- pentiumpro-* | p6-* | 6x86-* | athlon-*)
+- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- pentium4-*)
+- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++ pc532)
++ cpu=ns32k
++ vendor=pc532
+ ;;
+ pn)
+- basic_machine=pn-gould
+- ;;
+- power) basic_machine=power-ibm
++ cpu=pn
++ vendor=gould
+ ;;
+- ppc | ppcbe) basic_machine=powerpc-unknown
+- ;;
+- ppc-* | ppcbe-*)
+- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- ppcle | powerpclittle | ppc-le | powerpc-little)
+- basic_machine=powerpcle-unknown
+- ;;
+- ppcle-* | powerpclittle-*)
+- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- ppc64) basic_machine=powerpc64-unknown
+- ;;
+- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+- basic_machine=powerpc64le-unknown
+- ;;
+- ppc64le-* | powerpc64little-*)
+- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++ power)
++ cpu=power
++ vendor=ibm
+ ;;
+ ps2)
+- basic_machine=i386-ibm
+- ;;
+- pw32)
+- basic_machine=i586-unknown
+- os=-pw32
+- ;;
+- rdos | rdos64)
+- basic_machine=x86_64-pc
+- os=-rdos
+- ;;
+- rdos32)
+- basic_machine=i386-pc
+- os=-rdos
+- ;;
+- rom68k)
+- basic_machine=m68k-rom68k
+- os=-coff
++ cpu=i386
++ vendor=ibm
+ ;;
+ rm[46]00)
+- basic_machine=mips-siemens
++ cpu=mips
++ vendor=siemens
+ ;;
+ rtpc | rtpc-*)
+- basic_machine=romp-ibm
+- ;;
+- s390 | s390-*)
+- basic_machine=s390-ibm
+- ;;
+- s390x | s390x-*)
+- basic_machine=s390x-ibm
+- ;;
+- sa29200)
+- basic_machine=a29k-amd
+- os=-udi
++ cpu=romp
++ vendor=ibm
+ ;;
+- sb1)
+- basic_machine=mipsisa64sb1-unknown
++ sde)
++ cpu=mipsisa32
++ vendor=sde
++ os=${os:-elf}
+ ;;
+- sb1el)
+- basic_machine=mipsisa64sb1el-unknown
++ simso-wrs)
++ cpu=sparclite
++ vendor=wrs
++ os=vxworks
+ ;;
+- sde)
+- basic_machine=mipsisa32-sde
+- os=-elf
++ tower | tower-32)
++ cpu=m68k
++ vendor=ncr
+ ;;
+- sei)
+- basic_machine=mips-sei
+- os=-seiux
++ vpp*|vx|vx-*)
++ cpu=f301
++ vendor=fujitsu
+ ;;
+- sequent)
+- basic_machine=i386-sequent
++ w65)
++ cpu=w65
++ vendor=wdc
+ ;;
+- sh)
+- basic_machine=sh-hitachi
+- os=-hms
++ w89k-*)
++ cpu=hppa1.1
++ vendor=winbond
++ os=proelf
+ ;;
+- sh5el)
+- basic_machine=sh5le-unknown
++ none)
++ cpu=none
++ vendor=none
+ ;;
+- sh64)
+- basic_machine=sh64-unknown
++ leon|leon[3-9])
++ cpu=sparc
++ vendor=$basic_machine
+ ;;
+- sparclite-wrs | simso-wrs)
+- basic_machine=sparclite-wrs
+- os=-vxworks
++ leon-*|leon[3-9]-*)
++ cpu=sparc
++ vendor=`echo "$basic_machine" | sed 's/-.*//'`
+ ;;
+- sps7)
+- basic_machine=m68k-bull
+- os=-sysv2
++
++ *-*)
++ # shellcheck disable=SC2162
++ IFS="-" read cpu vendor <&2
+- exit 1
++ # Recognize the canonical CPU types that are allowed with any
++ # company name.
++ case $cpu in
++ 1750a | 580 \
++ | a29k \
++ | aarch64 | aarch64_be \
++ | abacus \
++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
++ | alphapca5[67] | alpha64pca5[67] \
++ | am33_2.0 \
++ | amdgcn \
++ | arc | arceb \
++ | arm | arm[lb]e | arme[lb] | armv* \
++ | avr | avr32 \
++ | asmjs \
++ | ba \
++ | be32 | be64 \
++ | bfin | bs2000 \
++ | c[123]* | c30 | [cjt]90 | c4x \
++ | c8051 | clipper | craynv | csky | cydra \
++ | d10v | d30v | dlx | dsp16xx \
++ | e2k | elxsi | epiphany \
++ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
++ | h8300 | h8500 \
++ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
++ | i370 | i*86 | i860 | i960 | ia16 | ia64 \
++ | ip2k | iq2000 \
++ | k1om \
++ | le32 | le64 \
++ | lm32 \
++ | m32c | m32r | m32rle \
++ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
++ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
++ | m88110 | m88k | maxq | mb | mcore | mep | metag \
++ | microblaze | microblazeel \
++ | mips | mipsbe | mipseb | mipsel | mipsle \
++ | mips16 \
++ | mips64 | mips64eb | mips64el \
++ | mips64octeon | mips64octeonel \
++ | mips64orion | mips64orionel \
++ | mips64r5900 | mips64r5900el \
++ | mips64vr | mips64vrel \
++ | mips64vr4100 | mips64vr4100el \
++ | mips64vr4300 | mips64vr4300el \
++ | mips64vr5000 | mips64vr5000el \
++ | mips64vr5900 | mips64vr5900el \
++ | mipsisa32 | mipsisa32el \
++ | mipsisa32r2 | mipsisa32r2el \
++ | mipsisa32r6 | mipsisa32r6el \
++ | mipsisa64 | mipsisa64el \
++ | mipsisa64r2 | mipsisa64r2el \
++ | mipsisa64r6 | mipsisa64r6el \
++ | mipsisa64sb1 | mipsisa64sb1el \
++ | mipsisa64sr71k | mipsisa64sr71kel \
++ | mipsr5900 | mipsr5900el \
++ | mipstx39 | mipstx39el \
++ | mmix \
++ | mn10200 | mn10300 \
++ | moxie \
++ | mt \
++ | msp430 \
++ | nds32 | nds32le | nds32be \
++ | nfp \
++ | nios | nios2 | nios2eb | nios2el \
++ | none | np1 | ns16k | ns32k | nvptx \
++ | open8 \
++ | or1k* \
++ | or32 \
++ | orion \
++ | picochip \
++ | pdp10 | pdp11 | pj | pjl | pn | power \
++ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
++ | pru \
++ | pyramid \
++ | riscv | riscv32 | riscv64 \
++ | rl78 | romp | rs6000 | rx \
++ | score \
++ | sh | shl \
++ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
++ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
++ | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
++ | spu \
++ | tahoe \
++ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
++ | tron \
++ | ubicom32 \
++ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
++ | vax \
++ | visium \
++ | w65 | wasm32 \
++ | we32k \
++ | x86 | x86_64 | xc16x | xgate | xps100 \
++ | xstormy16 | xtensa* \
++ | ymp \
++ | z8k | z80)
++ ;;
++
++ *)
++ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
++ exit 1
++ ;;
++ esac
+ ;;
+ esac
+
+ # Here we canonicalize certain aliases for manufacturers.
+-case $basic_machine in
+- *-digital*)
+- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++case $vendor in
++ digital*)
++ vendor=dec
+ ;;
+- *-commodore*)
+- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++ commodore*)
++ vendor=cbm
+ ;;
+ *)
+ ;;
+@@ -1321,197 +1275,246 @@ esac
+
+ # Decode manufacturer-specific aliases for certain operating systems.
+
+-if [ x"$os" != x"" ]
++if [ x$os != x ]
+ then
+ case $os in
+- # First match some system type aliases
+- # that might get confused with valid system types.
+- # -solaris* is a basic system type, with this one exception.
+- -auroraux)
+- os=-auroraux
++ # First match some system type aliases that might get confused
++ # with valid system types.
++ # solaris* is a basic system type, with this one exception.
++ auroraux)
++ os=auroraux
+ ;;
+- -solaris1 | -solaris1.*)
+- os=`echo $os | sed -e 's|solaris1|sunos4|'`
++ bluegene*)
++ os=cnk
+ ;;
+- -solaris)
+- os=-solaris2
++ solaris1 | solaris1.*)
++ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+- -svr4*)
+- os=-sysv4
++ solaris)
++ os=solaris2
+ ;;
+- -unixware*)
+- os=-sysv4.2uw
++ unixware*)
++ os=sysv4.2uw
+ ;;
+- -gnu/linux*)
++ gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+- # First accept the basic system types.
++ # es1800 is here to avoid being matched by es* (a different OS)
++ es1800*)
++ os=ose
++ ;;
++ # Some version numbers need modification
++ chorusos*)
++ os=chorusos
++ ;;
++ isc)
++ os=isc2.2
++ ;;
++ sco6)
++ os=sco5v6
++ ;;
++ sco5)
++ os=sco3.2v5
++ ;;
++ sco4)
++ os=sco3.2v4
++ ;;
++ sco3.2.[4-9]*)
++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
++ ;;
++ sco3.2v[4-9]* | sco5v6*)
++ # Don't forget version if it is 3.2v4 or newer.
++ ;;
++ scout)
++ # Don't match below
++ ;;
++ sco*)
++ os=sco3.2v2
++ ;;
++ psos*)
++ os=psos
++ ;;
++ # Now accept the basic system types.
+ # The portable systems comes first.
+- # Each alternative MUST END IN A *, to match a version number.
+- # -sysv* is not here because it comes later, after sysvr4.
+- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+- | -sym* | -kopensolaris* | -plan9* \
+- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+- | -aos* | -aros* \
+- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+- | -bitrig* | -openbsd* | -solidbsd* \
+- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+- | -uxpv* | -beos* | -mpeix* | -udk* \
+- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++ # Each alternative MUST end in a * to match a version number.
++ # sysv* is not here because it comes later, after sysvr4.
++ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
++ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
++ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
++ | sym* | kopensolaris* | plan9* \
++ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
++ | aos* | aros* | cloudabi* | sortix* \
++ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
++ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
++ | knetbsd* | mirbsd* | netbsd* \
++ | bitrig* | openbsd* | solidbsd* | libertybsd* \
++ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
++ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
++ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
++ | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
++ | chorusrdb* | cegcc* | glidix* \
++ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
++ | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
++ | linux-newlib* | linux-musl* | linux-uclibc* \
++ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
++ | interix* | uwin* | mks* | rhapsody* | darwin* \
++ | openstep* | oskit* | conix* | pw32* | nonstopux* \
++ | storm-chaos* | tops10* | tenex* | tops20* | its* \
++ | os2* | vos* | palmos* | uclinux* | nucleus* \
++ | morphos* | superux* | rtmk* | windiss* \
++ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
++ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
++ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
++ | midnightbsd* | amdhsa* | unleashed* | emscripten*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+- -qnx*)
+- case $basic_machine in
+- x86-* | i*86-*)
++ qnx*)
++ case $cpu in
++ x86 | i*86)
+ ;;
+ *)
+- os=-nto$os
++ os=nto-$os
+ ;;
+ esac
+ ;;
+- -nto-qnx*)
++ hiux*)
++ os=hiuxwe2
+ ;;
+- -nto*)
+- os=`echo $os | sed -e 's|nto|nto-qnx|'`
++ nto-qnx*)
+ ;;
+- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++ nto*)
++ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+- -mac*)
+- os=`echo $os | sed -e 's|mac|macos|'`
++ sim | xray | os68k* | v88r* \
++ | windows* | osx | abug | netware* | os9* \
++ | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
+ ;;
+- -linux-dietlibc)
+- os=-linux-dietlibc
++ linux-dietlibc)
++ os=linux-dietlibc
+ ;;
+- -linux*)
++ linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+- -sunos5*)
+- os=`echo $os | sed -e 's|sunos5|solaris2|'`
++ lynx*178)
++ os=lynxos178
++ ;;
++ lynx*5)
++ os=lynxos5
+ ;;
+- -sunos6*)
+- os=`echo $os | sed -e 's|sunos6|solaris3|'`
++ lynx*)
++ os=lynxos
+ ;;
+- -opened*)
+- os=-openedition
++ mac*)
++ os=`echo "$os" | sed -e 's|mac|macos|'`
+ ;;
+- -os400*)
+- os=-os400
++ opened*)
++ os=openedition
+ ;;
+- -wince*)
+- os=-wince
++ os400*)
++ os=os400
+ ;;
+- -osfrose*)
+- os=-osfrose
++ sunos5*)
++ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+ ;;
+- -osf*)
+- os=-osf
++ sunos6*)
++ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+ ;;
+- -utek*)
+- os=-bsd
++ wince*)
++ os=wince
+ ;;
+- -dynix*)
+- os=-bsd
++ utek*)
++ os=bsd
+ ;;
+- -acis*)
+- os=-aos
++ dynix*)
++ os=bsd
+ ;;
+- -atheos*)
+- os=-atheos
++ acis*)
++ os=aos
+ ;;
+- -syllable*)
+- os=-syllable
++ atheos*)
++ os=atheos
+ ;;
+- -386bsd)
+- os=-bsd
++ syllable*)
++ os=syllable
+ ;;
+- -ctix* | -uts*)
+- os=-sysv
++ 386bsd)
++ os=bsd
+ ;;
+- -nova*)
+- os=-rtmk-nova
++ ctix* | uts*)
++ os=sysv
+ ;;
+- -ns2 )
+- os=-nextstep2
++ nova*)
++ os=rtmk-nova
+ ;;
+- -nsk*)
+- os=-nsk
++ ns2)
++ os=nextstep2
++ ;;
++ nsk*)
++ os=nsk
+ ;;
+ # Preserve the version number of sinix5.
+- -sinix5.*)
++ sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+- -sinix*)
+- os=-sysv4
++ sinix*)
++ os=sysv4
+ ;;
+- -tpf*)
+- os=-tpf
++ tpf*)
++ os=tpf
+ ;;
+- -triton*)
+- os=-sysv3
++ triton*)
++ os=sysv3
+ ;;
+- -oss*)
+- os=-sysv3
++ oss*)
++ os=sysv3
+ ;;
+- -svr4)
+- os=-sysv4
++ svr4*)
++ os=sysv4
+ ;;
+- -svr3)
+- os=-sysv3
++ svr3)
++ os=sysv3
+ ;;
+- -sysvr4)
+- os=-sysv4
++ sysvr4)
++ os=sysv4
+ ;;
+- # This must come after -sysvr4.
+- -sysv*)
++ # This must come after sysvr4.
++ sysv*)
+ ;;
+- -ose*)
+- os=-ose
++ ose*)
++ os=ose
+ ;;
+- -es1800*)
+- os=-ose
++ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
++ os=mint
+ ;;
+- -xenix)
+- os=-xenix
++ zvmoe)
++ os=zvmoe
+ ;;
+- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+- os=-mint
++ dicos*)
++ os=dicos
+ ;;
+- -aros*)
+- os=-aros
++ pikeos*)
++ # Until real need of OS specific support for
++ # particular features comes up, bare metal
++ # configurations are quite functional.
++ case $cpu in
++ arm*)
++ os=eabi
++ ;;
++ *)
++ os=elf
++ ;;
++ esac
+ ;;
+- -zvmoe)
+- os=-zvmoe
++ nacl*)
+ ;;
+- -dicos*)
+- os=-dicos
++ ios)
+ ;;
+- -nacl*)
++ none)
+ ;;
+- -none)
++ *-eabi)
+ ;;
+ *)
+- # Get rid of the `-' at the beginning of $os.
+- os=`echo $os | sed 's/[^-]*-//'`
+- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+ exit 1
+ ;;
+ esac
+@@ -1527,261 +1530,265 @@ else
+ # will signal an error saying that MANUFACTURER isn't an operating
+ # system, and we'll never get to this point.
+
+-case $basic_machine in
++case $cpu-$vendor in
+ score-*)
+- os=-elf
++ os=elf
+ ;;
+ spu-*)
+- os=-elf
++ os=elf
+ ;;
+ *-acorn)
+- os=-riscix1.2
++ os=riscix1.2
+ ;;
+ arm*-rebel)
+- os=-linux
++ os=linux
+ ;;
+ arm*-semi)
+- os=-aout
++ os=aout
+ ;;
+ c4x-* | tic4x-*)
+- os=-coff
++ os=coff
++ ;;
++ c8051-*)
++ os=elf
++ ;;
++ clipper-intergraph)
++ os=clix
+ ;;
+ hexagon-*)
+- os=-elf
++ os=elf
+ ;;
+ tic54x-*)
+- os=-coff
++ os=coff
+ ;;
+ tic55x-*)
+- os=-coff
++ os=coff
+ ;;
+ tic6x-*)
+- os=-coff
++ os=coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+- os=-tops20
++ os=tops20
+ ;;
+ pdp11-*)
+- os=-none
++ os=none
+ ;;
+ *-dec | vax-*)
+- os=-ultrix4.2
++ os=ultrix4.2
+ ;;
+ m68*-apollo)
+- os=-domain
++ os=domain
+ ;;
+ i386-sun)
+- os=-sunos4.0.2
++ os=sunos4.0.2
+ ;;
+ m68000-sun)
+- os=-sunos3
++ os=sunos3
+ ;;
+ m68*-cisco)
+- os=-aout
++ os=aout
+ ;;
+ mep-*)
+- os=-elf
++ os=elf
+ ;;
+ mips*-cisco)
+- os=-elf
++ os=elf
+ ;;
+ mips*-*)
+- os=-elf
+- ;;
+- or1k-*)
+- os=-elf
++ os=elf
+ ;;
+ or32-*)
+- os=-coff
++ os=coff
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+- os=-sysv3
++ os=sysv3
+ ;;
+ sparc-* | *-sun)
+- os=-sunos4.1.1
++ os=sunos4.1.1
+ ;;
+- *-be)
+- os=-beos
++ pru-*)
++ os=elf
+ ;;
+- *-haiku)
+- os=-haiku
++ *-be)
++ os=beos
+ ;;
+ *-ibm)
+- os=-aix
++ os=aix
+ ;;
+ *-knuth)
+- os=-mmixware
++ os=mmixware
+ ;;
+ *-wec)
+- os=-proelf
++ os=proelf
+ ;;
+ *-winbond)
+- os=-proelf
++ os=proelf
+ ;;
+ *-oki)
+- os=-proelf
++ os=proelf
+ ;;
+ *-hp)
+- os=-hpux
++ os=hpux
+ ;;
+ *-hitachi)
+- os=-hiux
++ os=hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+- os=-sysv
++ os=sysv
+ ;;
+ *-cbm)
+- os=-amigaos
++ os=amigaos
+ ;;
+ *-dg)
+- os=-dgux
++ os=dgux
+ ;;
+ *-dolphin)
+- os=-sysv3
++ os=sysv3
+ ;;
+ m68k-ccur)
+- os=-rtu
++ os=rtu
+ ;;
+ m88k-omron*)
+- os=-luna
++ os=luna
+ ;;
+- *-next )
+- os=-nextstep
++ *-next)
++ os=nextstep
+ ;;
+ *-sequent)
+- os=-ptx
++ os=ptx
+ ;;
+ *-crds)
+- os=-unos
++ os=unos
+ ;;
+ *-ns)
+- os=-genix
++ os=genix
+ ;;
+ i370-*)
+- os=-mvs
+- ;;
+- *-next)
+- os=-nextstep3
++ os=mvs
+ ;;
+ *-gould)
+- os=-sysv
++ os=sysv
+ ;;
+ *-highlevel)
+- os=-bsd
++ os=bsd
+ ;;
+ *-encore)
+- os=-bsd
++ os=bsd
+ ;;
+ *-sgi)
+- os=-irix
++ os=irix
+ ;;
+ *-siemens)
+- os=-sysv4
++ os=sysv4
+ ;;
+ *-masscomp)
+- os=-rtu
++ os=rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+- os=-uxpv
++ os=uxpv
+ ;;
+ *-rom68k)
+- os=-coff
++ os=coff
+ ;;
+ *-*bug)
+- os=-coff
++ os=coff
+ ;;
+ *-apple)
+- os=-macos
++ os=macos
+ ;;
+ *-atari*)
+- os=-mint
++ os=mint
++ ;;
++ *-wrs)
++ os=vxworks
+ ;;
+ *)
+- os=-none
++ os=none
+ ;;
+ esac
+ fi
+
+ # Here we handle the case where we know the os, and the CPU type, but not the
+ # manufacturer. We pick the logical manufacturer.
+-vendor=unknown
+-case $basic_machine in
+- *-unknown)
++case $vendor in
++ unknown)
+ case $os in
+- -riscix*)
++ riscix*)
+ vendor=acorn
+ ;;
+- -sunos*)
++ sunos*)
+ vendor=sun
+ ;;
+- -cnk*|-aix*)
++ cnk*|-aix*)
+ vendor=ibm
+ ;;
+- -beos*)
++ beos*)
+ vendor=be
+ ;;
+- -hpux*)
++ hpux*)
+ vendor=hp
+ ;;
+- -mpeix*)
++ mpeix*)
+ vendor=hp
+ ;;
+- -hiux*)
++ hiux*)
+ vendor=hitachi
+ ;;
+- -unos*)
++ unos*)
+ vendor=crds
+ ;;
+- -dgux*)
++ dgux*)
+ vendor=dg
+ ;;
+- -luna*)
++ luna*)
+ vendor=omron
+ ;;
+- -genix*)
++ genix*)
+ vendor=ns
+ ;;
+- -mvs* | -opened*)
++ clix*)
++ vendor=intergraph
++ ;;
++ mvs* | opened*)
+ vendor=ibm
+ ;;
+- -os400*)
++ os400*)
+ vendor=ibm
+ ;;
+- -ptx*)
++ ptx*)
+ vendor=sequent
+ ;;
+- -tpf*)
++ tpf*)
+ vendor=ibm
+ ;;
+- -vxsim* | -vxworks* | -windiss*)
++ vxsim* | vxworks* | windiss*)
+ vendor=wrs
+ ;;
+- -aux*)
++ aux*)
+ vendor=apple
+ ;;
+- -hms*)
++ hms*)
+ vendor=hitachi
+ ;;
+- -mpw* | -macos*)
++ mpw* | macos*)
+ vendor=apple
+ ;;
+- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+ vendor=atari
+ ;;
+- -vos*)
++ vos*)
+ vendor=stratus
+ ;;
+ esac
+- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+ esac
+
+-echo $basic_machine$os
++echo "$cpu-$vendor-$os"
+ exit
+
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+diff --git a/configure b/configure
+index 9a78a4554..00bb37bae 100755
+--- a/configure
++++ b/configure
+@@ -13415,6 +13415,8 @@ fi ;; #(
+ natdynlink=true ;; #(
+ aarch64-*-linux*) :
+ natdynlink=true ;; #(
++ riscv*-*-linux*) :
++ natdynlink=true ;; #(
+ *) :
+ ;;
+ esac
+@@ -13545,7 +13547,11 @@ fi; system=elf ;; #(
+ aarch64-*-linux*) :
+ arch=arm64; system=linux ;; #(
+ x86_64-*-cygwin*) :
+- arch=amd64; system=cygwin
++ arch=amd64; system=cygwin ;; #(
++ riscv32-*-linux*) :
++ arch=riscv; model=riscv32; system=linux ;; #(
++ riscv64-*-linux*) :
++ arch=riscv; model=riscv64; system=linux
+ ;; #(
+ *) :
+ ;;
+@@ -13801,7 +13807,7 @@ esac ;; #(
+ *,freebsd) :
+ default_as="${toolpref}as"
+ default_aspp="${toolpref}cc -c" ;; #(
+- amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd) :
++ amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd|riscv,*) :
+ default_as="${toolpref}as"
+ case $ocaml_cv_cc_vendor in #(
+ clang-*) :
+diff --git a/configure.ac b/configure.ac
+index 2227769e8..94b7e2b35 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -803,7 +803,8 @@ AS_IF([test x"$enable_shared" != "xno"],
+ [arm*-*-linux*], [natdynlink=true],
+ [arm*-*-freebsd*], [natdynlink=true],
+ [earm*-*-netbsd*], [natdynlink=true],
+- [aarch64-*-linux*], [natdynlink=true])])
++ [aarch64-*-linux*], [natdynlink=true],
++ [riscv*-*-linux*], [natdynlink=true])])
+
+ # Try to work around the Skylake/Kaby Lake processor bug.
+ AS_CASE(["$CC,$host"],
+@@ -898,7 +899,11 @@ AS_CASE([$host],
+ [aarch64-*-linux*],
+ [arch=arm64; system=linux],
+ [x86_64-*-cygwin*],
+- [arch=amd64; system=cygwin]
++ [arch=amd64; system=cygwin],
++ [riscv32-*-linux*],
++ [arch=riscv; model=riscv32; system=linux],
++ [riscv64-*-linux*],
++ [arch=riscv; model=riscv64; system=linux]
+ )
+
+ AS_IF([test x"$enable_native_compiler" = "xno"],
+@@ -1008,7 +1013,7 @@ AS_CASE(["$arch,$system"],
+ [*,freebsd],
+ [default_as="${toolpref}as"
+ default_aspp="${toolpref}cc -c"],
+- [amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd],
++ [amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd|riscv,*],
+ [default_as="${toolpref}as"
+ AS_CASE([$ocaml_cv_cc_vendor],
+ [clang-*], [default_aspp="${toolpref}clang -c -Wno-trigraphs"],
+diff --git a/runtime/caml/stack.h b/runtime/caml/stack.h
+index 0c4aab159..f2fdec554 100644
+--- a/runtime/caml/stack.h
++++ b/runtime/caml/stack.h
+@@ -70,6 +70,11 @@
+ #define Callback_link(sp) ((struct caml_context *)((sp) + 16))
+ #endif
+
++#ifdef TARGET_riscv /* FIXME FIXME */
++#define Saved_return_address(sp) *((intnat *)((sp) - 8))
++#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
++#endif
++
+ /* Structure of OCaml callback contexts */
+
+ struct caml_context {
+diff --git a/runtime/riscv.S b/runtime/riscv.S
new file mode 100644
-index 000000000..a82048efc
+index 000000000..d7e4e2d83
--- /dev/null
-+++ b/asmrun/riscv.S
++++ b/runtime/riscv.S
@@ -0,0 +1,424 @@
+/***********************************************************************/
+/* */
@@ -1276,7 +6175,7 @@ index 000000000..a82048efc
+/* */
+/* Nicolas Ojeda Bar */
+/* */
-+/* Copyright 1996 Institut National de Recherche en Informatique et */
++/* Copyright 2017 Institut National de Recherche en Informatique et */
+/* en Automatique. All rights reserved. This file is distributed */
+/* under the terms of the GNU Library General Public License, with */
+/* the special exception on linking described in file ../LICENSE. */
@@ -1309,460 +6208,391 @@ index 000000000..a82048efc
+ .option nopic
+#endif
+
-+ .section .text
++ .section .text
+/* Invoke the garbage collector. */
+
-+ .globl caml_system__code_begin
++ .globl caml_system__code_begin
+caml_system__code_begin:
+
-+ .align 2
-+ .globl caml_call_gc
-+ .type caml_call_gc, @function
++ .align 4
++ .globl caml_call_gc
++ .type caml_call_gc, @function
+caml_call_gc:
+ /* Record return address */
-+ store ra, caml_last_return_address, TMP0
++ store ra, caml_last_return_address, TMP0
+ /* Record lowest stack address */
-+ mv TMP1, sp
-+ store sp, caml_bottom_of_stack, TMP0
++ mv TMP1, sp
++ store sp, caml_bottom_of_stack, TMP0
+.Lcaml_call_gc:
-+ /* Set up stack space, saving return address */
++ /* Set up stack space, saving return address */
+ /* (1 reg for RA, 1 reg for FP, 21 allocatable int regs, 20 caller-save float regs) * 8 */
+ /* + 1 for alignment */
-+ addi sp, sp, -0x160
-+ mv s0, sp
-+ store ra, 0x8(sp)
-+ store s0, 0x0(sp)
++ addi sp, sp, -0x160
++ mv s0, sp
++ store ra, 0x8(sp)
++ store s0, 0x0(sp)
+ /* Save allocatable integer registers on the stack,
+ in the order given in proc.ml */
-+ store a0, 0x10(sp)
-+ store a1, 0x18(sp)
-+ store a2, 0x20(sp)
-+ store a3, 0x28(sp)
-+ store a4, 0x30(sp)
-+ store a5, 0x38(sp)
-+ store a6, 0x40(sp)
-+ store a7, 0x48(sp)
-+ store s2, 0x50(sp)
-+ store s3, 0x58(sp)
-+ store s4, 0x60(sp)
-+ store s5, 0x68(sp)
-+ store s6, 0x70(sp)
-+ store s7, 0x78(sp)
-+ store s8, 0x80(sp)
-+ store s9, 0x88(sp)
-+ store t2, 0x90(sp)
-+ store t3, 0x98(sp)
-+ store t4, 0xa0(sp)
-+ store t5, 0xa8(sp)
-+ store t6, 0xb0(sp)
++ store a0, 0x10(sp)
++ store a1, 0x18(sp)
++ store a2, 0x20(sp)
++ store a3, 0x28(sp)
++ store a4, 0x30(sp)
++ store a5, 0x38(sp)
++ store a6, 0x40(sp)
++ store a7, 0x48(sp)
++ store s2, 0x50(sp)
++ store s3, 0x58(sp)
++ store s4, 0x60(sp)
++ store s5, 0x68(sp)
++ store s6, 0x70(sp)
++ store s7, 0x78(sp)
++ store s8, 0x80(sp)
++ store s9, 0x88(sp)
++ store t2, 0x90(sp)
++ store t3, 0x98(sp)
++ store t4, 0xa0(sp)
++ store t5, 0xa8(sp)
++ store t6, 0xb0(sp)
+ /* Save caller-save floating-point registers on the stack
+ (callee-saves are preserved by caml_garbage_collection) */
-+ fsd ft0, 0xb8(sp)
-+ fsd ft1, 0xc0(sp)
-+ fsd ft2, 0xc8(sp)
-+ fsd ft3, 0xd0(sp)
-+ fsd ft4, 0xd8(sp)
-+ fsd ft5, 0xe0(sp)
-+ fsd ft6, 0xe8(sp)
-+ fsd ft7, 0xf0(sp)
-+ fsd fa0, 0xf8(sp)
-+ fsd fa1, 0x100(sp)
-+ fsd fa2, 0x108(sp)
-+ fsd fa3, 0x110(sp)
-+ fsd fa4, 0x118(sp)
-+ fsd fa5, 0x120(sp)
-+ fsd fa6, 0x128(sp)
-+ fsd fa7, 0x130(sp)
-+ fsd ft8, 0x138(sp)
-+ fsd ft9, 0x140(sp)
-+ fsd ft9, 0x148(sp)
-+ fsd ft10, 0x150(sp)
-+ fsd ft11, 0x158(sp)
++ fsd ft0, 0xb8(sp)
++ fsd ft1, 0xc0(sp)
++ fsd ft2, 0xc8(sp)
++ fsd ft3, 0xd0(sp)
++ fsd ft4, 0xd8(sp)
++ fsd ft5, 0xe0(sp)
++ fsd ft6, 0xe8(sp)
++ fsd ft7, 0xf0(sp)
++ fsd fa0, 0xf8(sp)
++ fsd fa1, 0x100(sp)
++ fsd fa2, 0x108(sp)
++ fsd fa3, 0x110(sp)
++ fsd fa4, 0x118(sp)
++ fsd fa5, 0x120(sp)
++ fsd fa6, 0x128(sp)
++ fsd fa7, 0x130(sp)
++ fsd ft8, 0x138(sp)
++ fsd ft9, 0x140(sp)
++ fsd ft9, 0x148(sp)
++ fsd ft10, 0x150(sp)
++ fsd ft11, 0x158(sp)
+ /* Store pointer to saved integer registers in caml_gc_regs */
-+ addi TMP1, sp, 16
-+ store TMP1, caml_gc_regs, TMP0
++ addi TMP1, sp, 16
++ store TMP1, caml_gc_regs, TMP0
+ /* Save current allocation pointer for debugging purposes */
-+ store ALLOC_PTR, caml_young_ptr, TMP0
++ store ALLOC_PTR, caml_young_ptr, TMP0
+ /* Save trap pointer in case an exception is raised during GC */
-+ store TRAP_PTR, caml_exception_pointer, TMP0
++ store TRAP_PTR, caml_exception_pointer, TMP0
+ /* Call the garbage collector */
-+ call caml_garbage_collection
++ call caml_garbage_collection
+ /* Restore registers */
-+ load a0, 0x10(sp)
-+ load a1, 0x18(sp)
-+ load a2, 0x20(sp)
-+ load a3, 0x28(sp)
-+ load a4, 0x30(sp)
-+ load a5, 0x38(sp)
-+ load a6, 0x40(sp)
-+ load a7, 0x48(sp)
-+ load s2, 0x50(sp)
-+ load s3, 0x58(sp)
-+ load s4, 0x60(sp)
-+ load s5, 0x68(sp)
-+ load s6, 0x70(sp)
-+ load s7, 0x78(sp)
-+ load s8, 0x80(sp)
-+ load s9, 0x88(sp)
-+ load t2, 0x90(sp)
-+ load t3, 0x98(sp)
-+ load t4, 0xa0(sp)
-+ load t5, 0xa8(sp)
-+ load t6, 0xb0(sp)
-+ fld ft0, 0xb8(sp)
-+ fld ft1, 0xc0(sp)
-+ fld ft2, 0xc8(sp)
-+ fld ft3, 0xd0(sp)
-+ fld ft4, 0xd8(sp)
-+ fld ft5, 0xe0(sp)
-+ fld ft6, 0xe8(sp)
-+ fld ft7, 0xf0(sp)
-+ fld fa0, 0xf8(sp)
-+ fld fa1, 0x100(sp)
-+ fld fa2, 0x108(sp)
-+ fld fa3, 0x110(sp)
-+ fld fa4, 0x118(sp)
-+ fld fa5, 0x120(sp)
-+ fld fa6, 0x128(sp)
-+ fld fa7, 0x130(sp)
-+ fld ft8, 0x138(sp)
-+ fld ft9, 0x140(sp)
-+ fld ft9, 0x148(sp)
-+ fld ft10, 0x150(sp)
-+ fld ft11, 0x158(sp)
++ load a0, 0x10(sp)
++ load a1, 0x18(sp)
++ load a2, 0x20(sp)
++ load a3, 0x28(sp)
++ load a4, 0x30(sp)
++ load a5, 0x38(sp)
++ load a6, 0x40(sp)
++ load a7, 0x48(sp)
++ load s2, 0x50(sp)
++ load s3, 0x58(sp)
++ load s4, 0x60(sp)
++ load s5, 0x68(sp)
++ load s6, 0x70(sp)
++ load s7, 0x78(sp)
++ load s8, 0x80(sp)
++ load s9, 0x88(sp)
++ load t2, 0x90(sp)
++ load t3, 0x98(sp)
++ load t4, 0xa0(sp)
++ load t5, 0xa8(sp)
++ load t6, 0xb0(sp)
++ fld ft0, 0xb8(sp)
++ fld ft1, 0xc0(sp)
++ fld ft2, 0xc8(sp)
++ fld ft3, 0xd0(sp)
++ fld ft4, 0xd8(sp)
++ fld ft5, 0xe0(sp)
++ fld ft6, 0xe8(sp)
++ fld ft7, 0xf0(sp)
++ fld fa0, 0xf8(sp)
++ fld fa1, 0x100(sp)
++ fld fa2, 0x108(sp)
++ fld fa3, 0x110(sp)
++ fld fa4, 0x118(sp)
++ fld fa5, 0x120(sp)
++ fld fa6, 0x128(sp)
++ fld fa7, 0x130(sp)
++ fld ft8, 0x138(sp)
++ fld ft9, 0x140(sp)
++ fld ft9, 0x148(sp)
++ fld ft10, 0x150(sp)
++ fld ft11, 0x158(sp)
+ /* Reload new allocation pointer and allocation limit */
-+ load ALLOC_PTR, caml_young_ptr
-+ load ALLOC_LIMIT, caml_young_limit
++ load ALLOC_PTR, caml_young_ptr
++ load ALLOC_LIMIT, caml_young_limit
+ /* Free stack space and return to caller */
-+ load ra, 0x8(sp)
-+ load s0, 0x0(sp)
-+ addi sp, sp, 0x160
++ load ra, 0x8(sp)
++ load s0, 0x0(sp)
++ addi sp, sp, 0x160
+ ret
-+ .size caml_call_gc, .-caml_call_gc
++ .size caml_call_gc, .-caml_call_gc
+
+/* Call a C function from OCaml */
+/* Function to call is in ARG */
+
-+ .align 2
-+ .globl caml_c_call
-+ .type caml_c_call, @function
++ .align 4
++ .globl caml_c_call
++ .type caml_c_call, @function
+caml_c_call:
+ /* Preserve return address in callee-save register s2 */
-+ mv s2, ra
++ mv s2, ra
+ /* Record lowest stack address and return address */
-+ store ra, caml_last_return_address, TMP0
-+ store sp, caml_bottom_of_stack, TMP0
++ store ra, caml_last_return_address, TMP0
++ store sp, caml_bottom_of_stack, TMP0
+ /* Make the exception handler alloc ptr available to the C code */
-+ store ALLOC_PTR, caml_young_ptr, TMP0
-+ store TRAP_PTR, caml_exception_pointer, TMP0
++ store ALLOC_PTR, caml_young_ptr, TMP0
++ store TRAP_PTR, caml_exception_pointer, TMP0
+ /* Call the function */
-+ jalr ARG
++ jalr ARG
+ /* Reload alloc ptr and alloc limit */
-+ load ALLOC_PTR, caml_young_ptr
-+ load TRAP_PTR, caml_exception_pointer
++ load ALLOC_PTR, caml_young_ptr
++ load ALLOC_LIMIT, caml_young_limit
+ /* Return */
-+ jr s2
-+ .size caml_c_call, .-caml_c_call
++ jr s2
++ .size caml_c_call, .-caml_c_call
+
+/* Raise an exception from OCaml */
-+ .align 2
-+ .globl caml_raise_exn
-+ .type caml_raise_exn, @function
++ .align 4
++ .globl caml_raise_exn
++ .type caml_raise_exn, @function
+caml_raise_exn:
+ /* Test if backtrace is active */
-+ load TMP1, caml_backtrace_active
-+ bnez TMP1, 2f
++ load TMP1, caml_backtrace_active
++ bnez TMP1, 2f
+1: /* Cut stack at current trap handler */
-+ mv sp, TRAP_PTR
++ mv sp, TRAP_PTR
+ /* Pop previous handler and jump to it */
-+ load TMP1, 8(sp)
-+ load TRAP_PTR, 0(sp)
-+ addi sp, sp, 16
-+ jr TMP1
++ load TMP1, 8(sp)
++ load TRAP_PTR, 0(sp)
++ addi sp, sp, 16
++ jr TMP1
+2: /* Preserve exception bucket in callee-save register s2 */
-+ mv s2, a0
++ mv s2, a0
+ /* Stash the backtrace */
-+ mv a1, ra
-+ mv a2, sp
-+ mv a3, TRAP_PTR
-+ call caml_stash_backtrace
++ mv a1, ra
++ mv a2, sp
++ mv a3, TRAP_PTR
++ call caml_stash_backtrace
+ /* Restore exception bucket and raise */
-+ mv a0, s2
-+ j 1b
-+ .size caml_raise_exn, .-caml_raise_exn
++ mv a0, s2
++ j 1b
++ .size caml_raise_exn, .-caml_raise_exn
+
-+ .globl caml_reraise_exn
-+ .type caml_reraise_exn, @function
++ .globl caml_reraise_exn
++ .type caml_reraise_exn, @function
+
+/* Raise an exception from C */
+
-+ .align 2
-+ .globl caml_raise_exception
-+ .type caml_raise_exception, @function
++ .align 4
++ .globl caml_raise_exception
++ .type caml_raise_exception, @function
+caml_raise_exception:
-+ load TRAP_PTR, caml_exception_pointer
-+ load ALLOC_PTR, caml_young_ptr
-+ load ALLOC_LIMIT, caml_young_limit
-+ load TMP1, caml_backtrace_active
-+ bnez TMP1, 2f
++ load TRAP_PTR, caml_exception_pointer
++ load ALLOC_PTR, caml_young_ptr
++ load ALLOC_LIMIT, caml_young_limit
++ load TMP1, caml_backtrace_active
++ bnez TMP1, 2f
+1: /* Cut stack at current trap handler */
-+ mv sp, TRAP_PTR
-+ load TMP1, 8(sp)
-+ load TRAP_PTR, 0(sp)
-+ addi sp, sp, 16
-+ jr TMP1
++ mv sp, TRAP_PTR
++ load TMP1, 8(sp)
++ load TRAP_PTR, 0(sp)
++ addi sp, sp, 16
++ jr TMP1
+2: /* Preserve exception bucket in callee-save register s2 */
-+ mv s2, a0
-+ load a1, caml_last_return_address
-+ load a2, caml_bottom_of_stack
-+ mv a3, TRAP_PTR
-+ call caml_stash_backtrace
-+ mv a0, s2
-+ j 1b
-+ .size caml_raise_exception, .-caml_raise_exception
++ mv s2, a0
++ load a1, caml_last_return_address
++ load a2, caml_bottom_of_stack
++ mv a3, TRAP_PTR
++ call caml_stash_backtrace
++ mv a0, s2
++ j 1b
++ .size caml_raise_exception, .-caml_raise_exception
+
+/* Start the OCaml program */
+
-+ .align 2
-+ .globl caml_start_program
-+ .type caml_start_program, @function
++ .align 4
++ .globl caml_start_program
++ .type caml_start_program, @function
+caml_start_program:
+
-+ la ARG, caml_program
++ la ARG, caml_program
+ /* Code shared with caml_callback* */
+ /* Address of OCaml code to call is in ARG */
+ /* Arguments to the OCaml code are in a0 ... a7 */
+.Ljump_to_caml:
-+ /* Set up stack frame and save callee-save registers */
-+ addi sp, sp, -0xd0
-+ store ra, 0xc0(sp)
-+ store s0, 0x0(sp)
-+ store s1, 0x8(sp)
-+ store s2, 0x10(sp)
-+ store s3, 0x18(sp)
-+ store s4, 0x20(sp)
-+ store s5, 0x28(sp)
-+ store s6, 0x30(sp)
-+ store s7, 0x38(sp)
-+ store s8, 0x40(sp)
-+ store s9, 0x48(sp)
-+ store s10, 0x50(sp)
-+ store s11, 0x58(sp)
-+ fsd fs0, 0x60(sp)
-+ fsd fs1, 0x68(sp)
-+ fsd fs2, 0x70(sp)
-+ fsd fs3, 0x78(sp)
-+ fsd fs4, 0x80(sp)
-+ fsd fs5, 0x88(sp)
-+ fsd fs6, 0x90(sp)
-+ fsd fs7, 0x98(sp)
-+ fsd fs8, 0xa0(sp)
-+ fsd fs9, 0xa8(sp)
-+ fsd fs10, 0xb0(sp)
-+ fsd fs11, 0xb8(sp)
-+ addi sp, sp, -32
++ /* Set up stack frame and save callee-save registers */
++ addi sp, sp, -0xd0
++ store ra, 0xc0(sp)
++ store s0, 0x0(sp)
++ store s1, 0x8(sp)
++ store s2, 0x10(sp)
++ store s3, 0x18(sp)
++ store s4, 0x20(sp)
++ store s5, 0x28(sp)
++ store s6, 0x30(sp)
++ store s7, 0x38(sp)
++ store s8, 0x40(sp)
++ store s9, 0x48(sp)
++ store s10, 0x50(sp)
++ store s11, 0x58(sp)
++ fsd fs0, 0x60(sp)
++ fsd fs1, 0x68(sp)
++ fsd fs2, 0x70(sp)
++ fsd fs3, 0x78(sp)
++ fsd fs4, 0x80(sp)
++ fsd fs5, 0x88(sp)
++ fsd fs6, 0x90(sp)
++ fsd fs7, 0x98(sp)
++ fsd fs8, 0xa0(sp)
++ fsd fs9, 0xa8(sp)
++ fsd fs10, 0xb0(sp)
++ fsd fs11, 0xb8(sp)
++ addi sp, sp, -32
+ /* Setup a callback link on the stack */
-+ load TMP1, caml_bottom_of_stack
-+ store TMP1, 0(sp)
-+ load TMP1, caml_last_return_address
-+ store TMP1, 8(sp)
-+ load TMP1, caml_gc_regs
-+ store TMP1, 16(sp)
-+ /* set up a trap frame */
-+ addi sp, sp, -16
-+ load TMP1, caml_exception_pointer
-+ store TMP1, 0(sp)
-+ lla TMP0, .Ltrap_handler
-+ store TMP0, 8(sp)
-+ mv TRAP_PTR, sp
-+ load ALLOC_PTR, caml_young_ptr
-+ load ALLOC_LIMIT, caml_young_limit
-+ store x0, caml_last_return_address, TMP0
-+ jalr ARG
-+.Lcaml_retaddr: /* pop trap frame, restoring caml_exception_pointer */
-+ load TMP1, 0(sp)
-+ store TMP1, caml_exception_pointer, TMP0
-+ addi sp, sp, 16
-+.Lreturn_result: /* pop callback link, restoring global variables */
-+ load TMP1, 0(sp)
-+ store TMP1, caml_bottom_of_stack, TMP0
-+ load TMP1, 8(sp)
-+ store TMP1, caml_last_return_address, TMP0
-+ load TMP1, 16(sp)
-+ store TMP1, caml_gc_regs, TMP0
-+ addi sp, sp, 32
-+ /* Update allocation pointer */
-+ store ALLOC_PTR, caml_young_ptr, TMP0
-+ /* reload callee-save registers and return */
-+ load ra, 0xc0(sp)
-+ load s0, 0x0(sp)
-+ load s1, 0x8(sp)
-+ load s2, 0x10(sp)
-+ load s3, 0x18(sp)
-+ load s4, 0x20(sp)
-+ load s5, 0x28(sp)
-+ load s6, 0x30(sp)
-+ load s7, 0x38(sp)
-+ load s8, 0x40(sp)
-+ load s9, 0x48(sp)
-+ load s10, 0x50(sp)
-+ load s11, 0x58(sp)
-+ fld fs0, 0x60(sp)
-+ fld fs1, 0x68(sp)
-+ fld fs2, 0x70(sp)
-+ fld fs3, 0x78(sp)
-+ fld fs4, 0x80(sp)
-+ fld fs5, 0x88(sp)
-+ fld fs6, 0x90(sp)
-+ fld fs7, 0x98(sp)
-+ fld fs8, 0xa0(sp)
-+ fld fs9, 0xa8(sp)
-+ fld fs10, 0xb0(sp)
-+ fld fs11, 0xb8(sp)
-+ addi sp, sp, 0xd0
-+ ret
++ load TMP1, caml_bottom_of_stack
++ store TMP1, 0(sp)
++ load TMP1, caml_last_return_address
++ store TMP1, 8(sp)
++ load TMP1, caml_gc_regs
++ store TMP1, 16(sp)
++ /* set up a trap frame */
++ addi sp, sp, -16
++ load TMP1, caml_exception_pointer
++ store TMP1, 0(sp)
++ lla TMP0, .Ltrap_handler
++ store TMP0, 8(sp)
++ mv TRAP_PTR, sp
++ load ALLOC_PTR, caml_young_ptr
++ load ALLOC_LIMIT, caml_young_limit
++ store x0, caml_last_return_address, TMP0
++ jalr ARG
++.Lcaml_retaddr: /* pop trap frame, restoring caml_exception_pointer */
++ load TMP1, 0(sp)
++ store TMP1, caml_exception_pointer, TMP0
++ addi sp, sp, 16
++.Lreturn_result: /* pop callback link, restoring global variables */
++ load TMP1, 0(sp)
++ store TMP1, caml_bottom_of_stack, TMP0
++ load TMP1, 8(sp)
++ store TMP1, caml_last_return_address, TMP0
++ load TMP1, 16(sp)
++ store TMP1, caml_gc_regs, TMP0
++ addi sp, sp, 32
++ /* Update allocation pointer */
++ store ALLOC_PTR, caml_young_ptr, TMP0
++ /* reload callee-save registers and return */
++ load ra, 0xc0(sp)
++ load s0, 0x0(sp)
++ load s1, 0x8(sp)
++ load s2, 0x10(sp)
++ load s3, 0x18(sp)
++ load s4, 0x20(sp)
++ load s5, 0x28(sp)
++ load s6, 0x30(sp)
++ load s7, 0x38(sp)
++ load s8, 0x40(sp)
++ load s9, 0x48(sp)
++ load s10, 0x50(sp)
++ load s11, 0x58(sp)
++ fld fs0, 0x60(sp)
++ fld fs1, 0x68(sp)
++ fld fs2, 0x70(sp)
++ fld fs3, 0x78(sp)
++ fld fs4, 0x80(sp)
++ fld fs5, 0x88(sp)
++ fld fs6, 0x90(sp)
++ fld fs7, 0x98(sp)
++ fld fs8, 0xa0(sp)
++ fld fs9, 0xa8(sp)
++ fld fs10, 0xb0(sp)
++ fld fs11, 0xb8(sp)
++ addi sp, sp, 0xd0
++ ret
+.Ltrap_handler:
-+ store TRAP_PTR, caml_exception_pointer, TMP0
-+ ori a0, a0, 2
-+ j .Lreturn_result
-+ .size caml_start_program, .-caml_start_program
++ store TRAP_PTR, caml_exception_pointer, TMP0
++ ori a0, a0, 2
++ j .Lreturn_result
++ .size caml_start_program, .-caml_start_program
+
+/* Callback from C to OCaml */
+
-+ .align 2
-+ .globl caml_callback_exn
-+ .type caml_callback_exn, @function
++ .align 4
++ .globl caml_callback_exn
++ .type caml_callback_exn, @function
+caml_callback_exn:
+ /* Initial shuffling of arguments (a0 = closure, a1 = first arg) */
-+ mv TMP1, a0
-+ mv a0, a1 /* a0 = first arg */
-+ mv a1, TMP1 /* a1 = closure environment */
-+ load ARG, 0(TMP1) /* code pointer */
-+ j .Ljump_to_caml
-+ .size caml_callback_exn, .-caml_callback_exn
++ mv TMP1, a0
++ mv a0, a1 /* a0 = first arg */
++ mv a1, TMP1 /* a1 = closure environment */
++ load ARG, 0(TMP1) /* code pointer */
++ j .Ljump_to_caml
++ .size caml_callback_exn, .-caml_callback_exn
+
-+ .align 2
-+ .globl caml_callback2_exn
-+ .type caml_callback2_exn, @function
++ .align 4
++ .globl caml_callback2_exn
++ .type caml_callback2_exn, @function
+caml_callback2_exn:
+ /* Initial shuffling of arguments (a0 = closure, a1 = arg1, a2 = arg2) */
-+ mv TMP1, a0
-+ mv a0, a1
-+ mv a1, a2
-+ mv a2, TMP1
-+ la ARG, caml_apply2
-+ j .Ljump_to_caml
-+ .size caml_callback2_exn, .-caml_callback2_exn
++ mv TMP1, a0
++ mv a0, a1
++ mv a1, a2
++ mv a2, TMP1
++ la ARG, caml_apply2
++ j .Ljump_to_caml
++ .size caml_callback2_exn, .-caml_callback2_exn
+
-+ .align 2
-+ .globl caml_callback3_exn
-+ .type caml_callback3_exn, @function
++ .align 4
++ .globl caml_callback3_exn
++ .type caml_callback3_exn, @function
+caml_callback3_exn:
+ /* Initial shuffling of argumnets */
+ /* (a0 = closure, a1 = arg1, a2 = arg2, a3 = arg3) */
-+ mv TMP1, a0
-+ mv a0, a1
-+ mv a1, a2
-+ mv a2, a3
-+ mv a3, TMP1
-+ la ARG, caml_apply3
-+ j .Ljump_to_caml
-+ .size caml_callback3_exn, .-caml_callback3_exn
++ mv TMP1, a0
++ mv a0, a1
++ mv a1, a2
++ mv a2, a3
++ mv a3, TMP1
++ la ARG, caml_apply3
++ j .Ljump_to_caml
++ .size caml_callback3_exn, .-caml_callback3_exn
+
-+ .align 2
-+ .globl caml_ml_array_bound_error
-+ .type caml_ml_array_bound_error, @function
++ .align 4
++ .globl caml_ml_array_bound_error
++ .type caml_ml_array_bound_error, @function
+caml_ml_array_bound_error:
+ /* Load address of [caml_array_bound_error] in ARG */
-+ la ARG, caml_array_bound_error
++ la ARG, caml_array_bound_error
+ /* Call that function */
-+ j caml_c_call
++ j caml_c_call
+
-+ .globl caml_system__code_end
++ .globl caml_system__code_end
+caml_system__code_end:
+
+/* GC roots for callback */
+
-+ .section .data
-+ .align 3
-+ .globl caml_system__frametable
-+ .type caml_system__frametable, @object
++ .section .data
++ .align 3
++ .globl caml_system__frametable
++ .type caml_system__frametable, @object
+caml_system__frametable:
-+ .quad 1 /* one descriptor */
-+ .quad .Lcaml_retaddr /* return address into callback */
-+ .short -1 /* negative frame size => use callback link */
-+ .short 0 /* no roots */
-+ .align 3
-+ .size caml_system__frametable, .-caml_system__frametable
-diff --git a/byterun/caml/stack.h b/byterun/caml/stack.h
-index 266863986..e198be0a6 100644
---- a/byterun/caml/stack.h
-+++ b/byterun/caml/stack.h
-@@ -70,6 +70,11 @@
- #define Callback_link(sp) ((struct caml_context *)((sp) + 16))
- #endif
-
-+#ifdef TARGET_riscv /* FIXME FIXME */
-+#define Saved_return_address(sp) *((intnat *)((sp) - 8))
-+#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
-+#endif
-+
- /* Structure of OCaml callback contexts */
-
- struct caml_context {
-diff --git a/config/gnu/config.guess b/config/gnu/config.guess
-index b79252d6b..8335398b2 100755
---- a/config/gnu/config.guess
-+++ b/config/gnu/config.guess
-@@ -2,7 +2,7 @@
- # Attempt to guess a canonical system name.
- # Copyright 1992-2013 Free Software Foundation, Inc.
-
--timestamp='2013-06-10'
-+timestamp='2016-10-23'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -1001,6 +1001,9 @@ EOF
- ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
- exit ;;
-+ riscv*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux
-+ exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
- exit ;;
-diff --git a/configure b/configure
-index 53f45f85b..cf5a4a02a 100755
---- a/configure
-+++ b/configure
-@@ -928,6 +928,7 @@ if $with_sharedlibs; then
- arm*-*-freebsd*) natdynlink=true;;
- earm*-*-netbsd*) natdynlink=true;;
- aarch64-*-linux*) natdynlink=true;;
-+ riscv*-*-linux*) natdynlink=true;;
- esac
- fi
-
-@@ -1004,6 +1005,8 @@ case "$target" in
- x86_64-*-mingw*) arch=amd64; system=mingw;;
- aarch64-*-linux*) arch=arm64; system=linux;;
- x86_64-*-cygwin*) arch=amd64; system=cygwin;;
-+ riscv32-*-linux*) arch=riscv; model=riscv32; system=linux;;
-+ riscv64-*-linux*) arch=riscv; model=riscv64; system=linux;;
- esac
-
- # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -1062,7 +1065,7 @@ case "$arch,$system" in
- aspp="${TOOLPREF}cc -c";;
- *,freebsd) as="${TOOLPREF}as"
- aspp="${TOOLPREF}cc -c";;
-- amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd)
-+ amd64,*|arm,*|arm64,*|i386,*|power,bsd*|power,netbsd|riscv,*)
- as="${TOOLPREF}as"
- case "$ccfamily" in
- clang-*)
++ .quad 1 /* one descriptor */
++ .quad .Lcaml_retaddr /* return address into callback */
++ .short -1 /* negative frame size => use callback link */
++ .short 0 /* no roots */
++ .align 3
++ .size caml_system__frametable, .-caml_system__frametable
--
-2.17.1
+2.22.0.rc3
diff --git a/programming/language/ocaml/ocaml/files/fedora/0008-riscv-Emit-debug-info.patch b/programming/language/ocaml/ocaml/files/fedora/0008-riscv-Emit-debug-info.patch
index 6d72833749..ff732cff66 100644
--- a/programming/language/ocaml/ocaml/files/fedora/0008-riscv-Emit-debug-info.patch
+++ b/programming/language/ocaml/ocaml/files/fedora/0008-riscv-Emit-debug-info.patch
@@ -1,14 +1,14 @@
-From af276d83f41cb9eb9f1e50a75a9be205c9b2fee6 Mon Sep 17 00:00:00 2001
+From 2f23a53b4aa1b672b3919cc021b83548f713b90a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones"
Date: Tue, 5 Jun 2018 19:48:08 +0000
-Subject: [PATCH 8/8] riscv: Emit debug info.
+Subject: [PATCH 5/5] riscv: Emit debug info.
---
asmcomp/riscv/emit.mlp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/asmcomp/riscv/emit.mlp b/asmcomp/riscv/emit.mlp
-index 718dca080..e42ee9770 100644
+index 88ea9f884..cc05aefe4 100644
--- a/asmcomp/riscv/emit.mlp
+++ b/asmcomp/riscv/emit.mlp
@@ -261,6 +261,7 @@ let tailrec_entry_point = ref 0
@@ -18,16 +18,16 @@ index 718dca080..e42ee9770 100644
+ emit_debug_info i.dbg;
match i.desc with
Lend -> ()
- | Lop(Imove | Ispill | Ireload) ->
-@@ -560,6 +561,7 @@ let fundecl fundecl =
- emit_stack_adjustment (-n);
- if !contains_calls then store_ra n;
- `{emit_label !tailrec_entry_point}:\n`;
+ | Lprologue ->
+@@ -556,6 +557,7 @@ let fundecl fundecl =
+ ` {emit_string code_space}\n`;
+ ` .align 2\n`;
+ `{emit_symbol fundecl.fun_name}:\n`;
+ emit_debug_info fundecl.fun_dbg;
emit_all fundecl.fun_body;
List.iter emit_call_gc !call_gc_sites;
List.iter emit_call_bound_error !bound_error_sites;
-@@ -619,6 +621,7 @@ let data l =
+@@ -615,6 +617,7 @@ let data l =
let begin_assembly() =
` .file \"\"\n`; (* PR#7073 *)
@@ -36,5 +36,5 @@ index 718dca080..e42ee9770 100644
let lbl_begin = Compilenv.make_symbol (Some "data_begin") in
` {emit_string data_space}\n`;
--
-2.17.1
+2.22.0.rc3
diff --git a/programming/language/ocaml/ocaml/pspec.xml b/programming/language/ocaml/ocaml/pspec.xml
index fb27fb0e35..42256b6f49 100644
--- a/programming/language/ocaml/ocaml/pspec.xml
+++ b/programming/language/ocaml/ocaml/pspec.xml
@@ -18,7 +18,7 @@
Error: Files /usr/lib/ocaml/facile/facile.cmxa and /usr/lib/ocaml/stdlib.cmxa
make inconsistent assumptions over implementation Printf
-->
- http://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz
+ http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.1.tar.xz
zlib-devel
ncurses-devel
@@ -27,12 +27,13 @@
fedora/0001-Don-t-add-rpaths-to-libraries.patch
- fedora/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch
+
fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch
+ fedora/0003-configure-Remove-incorrect-assumption-about-cross-co.patch
fedora/0004-Add-RISC-V-backend.patch
- fedora/0005-Copyright-untabify.patch
- fedora/0006-fix-caml_c_call-reload-caml_young_limit.patch
- fedora/0007-Adapt-to-4.07.patch
+
+
+
fedora/0008-riscv-Emit-debug-info.patch
@@ -51,8 +52,34 @@
/usr/share/man/
+
+
+ ocaml-compiler-libs
+
+ ocaml
+
+
+ /usr/lib/ocaml/compiler-libs/*.mli
+ /usr/lib/ocaml/compiler-libs/*.cmi
+ /usr/lib/ocaml/compiler-libs/*.cmo
+ /usr/lib/ocaml/compiler-libs/*.cma
+ /usr/lib/ocaml/compiler-libs/*.a
+ /usr/lib/ocaml/compiler-libs/*.cmxa
+ /usr/lib/ocaml/compiler-libs/*.cmx
+ /usr/lib/ocaml/compiler-libs/*.o
+ /usr/lib/ocaml/compiler-libs/*.cmt
+ /usr/lib/ocaml/compiler-libs/*.cmti
+
+
+
+ 2019-11-25
+ 4.08.1
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2018-07-29
4.07.0