DELETED CHANGES.md
Index: CHANGES.md
==================================================================
--- CHANGES.md
+++ CHANGES.md
@@ -1,40 +0,0 @@
-**fnc 0.2** 2021-09-04
-
-- fix iconv lib linking in macOS builds
-- use pkg-config for detecting ncurses libs
-- prune dead auto.def code
-- bypass pkg-config in configure script on macOS systems
-- major overhaul to use amalgamation build
-- add key bindings to jump to start and end of view
-- man page and documentation updates
-- improve diff of current checkout to always show local changes on disk
-- fix non-standard use of clang extension
-- update autosetup to version 0.7.0
-- add make (un)install rules
-- replace strsep() with self-rolled implementation to build on CentOS 6.5
-- fix bug where local changes only showed when diffing against current checkout
-- enhance timeline --commit|-c option to accept symbolic check-in names
-- add man page installation to make install target
-- plug small memory leak in cmd_diff() routine
-- fix screen rendering bug due to late deallocation of resources
-- improve multibyte to wide character conversion error handling/reporting
-- fix bug involving renamed files in diff view
-
-**fnc 0.1** 2021-08-28
-
-- initial commit of infrastructure for the timeline command
-- add branch names and tags to search criteria
-- enhance parsing of malformed RFC822 email addresses in commit usernames
-- display wiki page content of initial wiki commits
-- make display of technote and ticket commits more consistent with fossil(1) ui
-- fix bug where diff algorithm choked on binary files
-- add coloured output to diff view
-- replace BSD-specific getprogname() calls with libf API
-- enhance diff view to display more informative control artifact commits
-- add Linux support so we now build and run on OpenBSD, macOS, and Linux
-- wrap commit comments to the current view width
-- tailor help/usage output to the specified command
-- fix invalid memory read in diff routine
-- add support for repository fingerprint version 1
-- fix line wrap bug that truncated lines in fullscreen mode
-

Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -12,12 +12,16 @@
 clean-.: clean-fnc clean-src
 distclean-.: distclean-fnc distclean-src
 include shakenmake.make
 MAIN_MAKEFILES := $(PACKAGE.MAKEFILE) $(ShakeNMake.MAKEFILE) @AUTODEPS@
 
+
+define CALL.SUBDIR
+endef
 SUBDIRS := src fnc
 $(eval $(call ShakeNMake.CALL.SUBDIRS,$(SUBDIRS)))
+#$(eval $(call ShakeNMake.CALL.SUBDIR,src))
 subdir-fnc: subdir-src
 all: subdir-src subdir-fnc
 
 DISTCLEAN_FILES += config.make
 
@@ -30,10 +34,13 @@
 	@$(RM) $@
 	sed -e '1s/^/[\'$$'\n''/' -e '$$s/,$$/\'$$'\n'']/' $(compdb_dir)/*.o.json > $@+
 	@if test -s $@+; then mv $@+ $@; else $(RM) $@+; fi
 endif
 
+install: all
+	@echo 'No installation rules yet.'
+
 DISTCLEAN_FILES += Makefile config.log autosetup/jimsh0 \
 	$(wildcard compile_commands/*) compile_commands.json+
 
 # Reconfigure if needed
 ifeq ($(findstring clean,$(MAKECMDGOALS)),)

Index: auto.def
==================================================================
--- auto.def
+++ auto.def
@@ -11,12 +11,10 @@
 # autosetup interceps 'debug' and 'enable-debug' flags :/
 #    prefix:=[get-env HOME /usr/local] -> "Installation prefix."
 
 #cc-check-c11
 
-use wh-common
-wh-require-bash
 cc-check-sizeof "void *"
 
 if {![cc-check-includes zlib.h] ||
     ![cc-check-function-in-lib compress z]} {
     user-error "Missing functional zlib"
@@ -50,10 +48,20 @@
 if {![cc-check-c99]} {
     user-error "As of 2021-02-21, libfossil requires C99."
 }
 
 define CC_FLAG_C99 $CC_FLAG_C99
+
+########################################################################
+# A proxy for cc-check-function-in-lib which "undoes" any changes that
+# routine makes to the LIBS define.
+proc my-check-function-in-lib {function libs {otherlibs {}}} {
+    set _LIBS [get-define LIBS]
+    set found [cc-check-function-in-lib $function $libs $otherlibs]
+    define LIBS $_LIBS
+    return $found
+}
 
 # cc-check-functions getcwd fopen
 cc-check-functions opendir stat pipe inet_ntop getaddrinfo
 #msg-result [cc-check-functions lstat]
 
@@ -64,34 +72,122 @@
     # define _BSD_SOURCE 1
     # ^^^^ causes warning (-Werror breakage) with glibc >=2.20
     define _DEFAULT_SOURCE 1
     define _POSIX_C_SOURCE 200112L
 }
+
 
 # Find some tools
-cc-check-tools ar strip
-wh-bin-install
+cc-check-tools ar ranlib strip
 
 set extra_objs {}
 
 if {[find-an-executable cygpath] ne "" || $::tcl_platform(os)=="Windows NT"} {
   set cFlags {}
 } else {
   set cFlags {-fPIC}
 }
 
-if {![wh-check-ncurses]} {
-    user-error "Could not find a compatible ncurses/libpanel configuration."
-}
-
 if {[opt-bool no-debug]} {
     msg-result "Non-debug build."
     set cFlags "$cFlags -O2"
 } else {
     msg-result "Debug build enabled. Use --no-debug to build in non-debug mode."
     set cFlags "$cFlags -g -DDEBUG -O0"
 }
+
+
+set pcBin [find-an-executable pkg-config]
+if {"" eq $pcBin} {
+    puts {pkg-config not found, so making some guesses about
+available packages.}
+}
+########################################################################
+# Curses!
+set LIB_CURSES ""
+set CFLAGS_CURSES ""
+puts "Looking for \[n]curses..."
+if {"" ne $pcBin && $::tcl_platform(os)!="Darwin"} {
+# Some macOS pkg-config configurations alter library search paths, which make
+# the compiler unable to find lib iconv, so don't use pkg-config on macOS.
+    set np ""
+    foreach p {ncursesw ncurses} {
+        if {[catch {exec $pcBin --exists $p}]} {
+            continue
+        }
+        set np $p
+        puts "Using pkg-config curses package \[$p]"
+        break
+    }
+    if {"" ne $np} {
+        set ppanel ""
+        if {"ncursesw" eq $np} {
+            if {![catch {exec $pcBin --exists panelw}]} {
+                set ppanel panelw
+            }
+        }
+        if {"" eq $ppanel && ![catch {exec $pcBin --exists panel}]} {
+            set ppanel panel
+        }
+        set CFLAGS_CURSES [exec $pcBin --cflags $np]
+        set LIB_CURSES [exec $pcBin --libs $np]
+        if {"" eq $ppanel} {
+            # Apparently Mac brew has pkg-config for ncursesw but not
+            # panel/panelw, but hard-coding -lpanel seems to work on
+            # that platform.
+            append LIB_CURSES " -lpanel"
+        } else {
+            append LIB_CURSES " " [exec $pcBin --libs $ppanel]
+            # append CFLAGS_CURSES " " [exec $pcBin --cflags $ppanel]
+            # ^^^^ appending the panel cflags will end up duplicating
+            # at least one -D flag from $np's cflags, leading to
+            # "already defined" errors at compile-time. Sigh. Note, however,
+            # that $ppanel's cflags have flags which $np's do not, so we
+            # may need to include those flags anyway and manually perform
+            # surgery on the list to remove dupes. Sigh.
+        }
+    }
+}
+
+if {"" eq $LIB_CURSES} {
+    puts "Guessing curses location (will fail for exotic locations)..."
+    define HAVE_CURSES_H [cc-check-includes curses.h]
+    if {[get-define HAVE_CURSES_H]} {
+        # Linux has -lncurses, BSD -lcurses. Both have <curses.h>
+        msg-result "Found curses.h"
+        if {[my-check-function-in-lib waddnwstr ncursesw]} {
+            msg-result "Found -lncursesw"
+            set LIB_CURSES "-lncursesw -lpanelw"
+        } elseif {[my-check-function-in-lib initscr ncurses]} {
+            msg-result "Found -lncurses"
+            set LIB_CURSES "-lncurses -lpanel"
+        } elseif {[my-check-function-in-lib initscr curses]} {
+            msg-result "Found -lcurses"
+            set LIB_CURSES "-lcurses -lpanel"
+        }
+    }
+}
+if {"" eq $LIB_CURSES} {
+    user-error "!Curses! Foiled again!"
+} else {
+    puts {
+        ************************************************************
+        If your build fails due to missing functions such as
+        waddwstr(), make sure you have the ncursesW development
+        package installed. Some platforms combine the "w" and non-w
+        curses builds and some don't.
+
+        The package may have a name such as libncursesw5-dev or
+        some such.
+        ************************************************************
+    }
+}
+define LIB_CURSES $LIB_CURSES
+define CFLAGS_CURSES $CFLAGS_CURSES
+unset LIB_CURSES
+unset CFLAGS_CURSES
+
 
 puts "Checking for compile_commands.json support..."
 if {[cctest -lang c -cflags {/dev/null -MJ} -source {}]} {
     msg-result "Compiler supports compile_commands.json."
     define MAKE_COMPILATION_DB yes

Index: autosetup/README.autosetup
==================================================================
--- autosetup/README.autosetup
+++ autosetup/README.autosetup
@@ -1,11 +1,11 @@
-README.autosetup created by autosetup v0.7.0+
+README.autosetup created by autosetup v0.6.9
 
 This is the autosetup directory for a local install of autosetup.
 It contains autosetup, support files and loadable modules.
 
 *.tcl files in this directory are optional modules which
 can be loaded with the 'use' directive.
 
 *.auto files in this directory are auto-loaded.
 
-For more information, see http://msteveb.github.io/autosetup/
+For more information, see http://msteveb.github.com/autosetup/

Index: autosetup/autosetup
==================================================================
--- autosetup/autosetup
+++ autosetup/autosetup
@@ -4,11 +4,11 @@
 # vim:se syntax=tcl:
 # \
 dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@"
 
 # Note that the version has a trailing + on unreleased versions
-set autosetup(version) 0.7.0+
+set autosetup(version) 0.6.9
 
 # Can be set to 1 to debug early-init problems
 set autosetup(debug) [expr {"--debug" in $argv}]
 
 ##################################################################
@@ -91,17 +91,17 @@
 	# We simply parse anything that looks like an option
 	set autosetup(getopt) [getopt argv]
 
 	#"=Core Options:"
 	options-add {
-		help:=all       => "display help and options. Optional: module name, such as --help=system"
+		help:=local  => "display help and options. Optionally specify a module name, such as --help=system"
 		licence license => "display the autosetup license"
-		version         => "display the version of autosetup"
+		version      => "display the version of autosetup"
 		ref:=text manual:=text
 		reference:=text => "display the autosetup command reference. 'text', 'wiki', 'asciidoc' or 'markdown'"
-		debug           => "display debugging output as autosetup runs"
-		install:=.      => "install autosetup to the current or given directory"
+		debug        => "display debugging output as autosetup runs"
+		install:=.   => "install autosetup to the current or given directory"
 	}
 	if {$autosetup(installed)} {
 		# hidden options so we can produce a nice error
 		options-add {
 			sysinstall:path
@@ -202,30 +202,24 @@
 		}
 	}
 
 	autosetup_add_dep $autosetup(autodef)
 
-	# Add $argv to CONFIGURE_OPTS, but ignore duplicates and quote if needed
-	set configure_opts {}
+	define CONFIGURE_OPTS ""
 	foreach arg $autosetup(argv) {
-		set quoted [quote-if-needed $arg]
-		# O(n^2), but n will be small
-		if {$quoted ni $configure_opts} {
-			lappend configure_opts $quoted
-		}
-	}
-	define CONFIGURE_OPTS [join $configure_opts]
-	define AUTOREMAKE [quote-if-needed $autosetup(exe)]
+		define-append CONFIGURE_OPTS [quote-if-needed $arg]
+	}
+	define AUTOREMAKE [file-normalize $autosetup(exe)]
 	define-append AUTOREMAKE [get-define CONFIGURE_OPTS]
 
 
 	# Log how we were invoked
 	configlog "Invoked as: [getenv WRAPPER $::argv0] [quote-argv $autosetup(argv)]"
 	configlog "Tclsh: [info nameofexecutable]"
 
-	# Load auto.def as module "auto.def"
-	autosetup_load_module auto.def source $autosetup(autodef)
+	# Note that auto.def is *not* loaded in the global scope
+	source $autosetup(autodef)
 
 	# Could warn here if options {} was not specified
 
 	show-notices
 
@@ -346,12 +340,12 @@
 	}
 
 	if {![info exists result]} {
 		# No user-specified value. Has options-defaults been set?
 		foreach opt $names {
-			if {[dict exists $::autosetup(optdefault) $opt]} {
-				set result [dict get $autosetup(optdefault) $opt]
+			if {[dict exists $::autosetup(options-defaults) $opt]} {
+				set result [dict get $autosetup(options-defaults) $opt]
 			}
 		}
 	}
 
 	if {[info exists result]} {
@@ -379,11 +373,11 @@
 }
 
 # Parse the option definition in $opts and update
 # ::autosetup(setoptions) and ::autosetup(optionhelp) appropriately
 #
-proc options-add {opts} {
+proc options-add {opts {header ""}} {
 	global autosetup
 
 	# First weed out comment lines
 	set realopts {}
 	foreach line [split $opts \n] {
@@ -395,11 +389,12 @@
 
 	for {set i 0} {$i < [llength $opts]} {incr i} {
 		set opt [lindex $opts $i]
 		if {[string match =* $opt]} {
 			# This is a special heading
-			lappend autosetup(optionhelp) [list $opt $autosetup(module)]
+			lappend autosetup(optionhelp) $opt ""
+			set header {}
 			continue
 		}
 		unset -nocomplain defaultvalue equal value
 
 		#puts "i=$i, opt=$opt"
@@ -456,12 +451,12 @@
 			}
 		} else {
 			# String option.
 			lappend autosetup(options) $name
 
-			if {$equal ne "="} {
-				# Was the option given as "name:value=default"?
+			if {$colon eq ":"} {
+				# Was ":name=default" given?
 				# If so, set $value to the display name and $defaultvalue to the default
 				# (This is the preferred way to set a default value for a string option)
 				if {[regexp {^([^=]+)=(.*)$} $value -> value defaultvalue]} {
 					dict set autosetup(optdefault) $name $defaultvalue
 				}
@@ -471,13 +466,13 @@
 			if {[dict exists $autosetup(options-defaults) $name]} {
 				# A default was specified with options-defaults, so use it
 				set defaultvalue [dict get $autosetup(options-defaults) $name]
 				dict set autosetup(optdefault) $name $defaultvalue
 			} elseif {![info exists defaultvalue]} {
-				# No default value was given by value=default or options-defaults
-				# so use the value as the default when the plain option with no
-				# value is given (.e.g. just --opt instead of --opt=value)
+				# For backward compatibility, if ":name" was given, use name as both
+				# the display text and the default value, but only if the user
+				# specified the option without the value
 				set defaultvalue $value
 			}
 
 			if {$equal eq "="} {
 				# String option with optional value
@@ -511,23 +506,40 @@
 		# Now create the help for this option if appropriate
 		if {[lindex $opts $i+1] eq "=>"} {
 			set desc [lindex $opts $i+2]
 			if {[info exists defaultvalue]} {
 				set desc [string map [list @default@ $defaultvalue] $desc]
+			}
+			#string match \n* $desc
+			if {$header ne ""} {
+				lappend autosetup(optionhelp) $header ""
+				set header ""
 			}
 			# A multi-line description
-			lappend autosetup(optionhelp) [list $opthelp $autosetup(module) $desc]
+			lappend autosetup(optionhelp) $opthelp $desc
 			incr i 2
 		}
 	}
 }
 
 # @module-options optionlist
 #
-# Deprecated. Simply use 'options' from within a module.
+# Like 'options', but used within a module.
 proc module-options {opts} {
-	options $opts
+	set header ""
+	if {$::autosetup(showhelp) > 1 && [llength $opts]} {
+		set header "Module Options:"
+	}
+	options-add $opts $header
+
+	if {$::autosetup(showhelp)} {
+		# Ensure that the module isn't executed on --help
+		# We are running under eval or source, so use break
+		# to prevent further execution
+		#return -code break -level 2
+		return -code break
+	}
 }
 
 proc max {a b} {
 	expr {$a > $b ? $a : $b}
 }
@@ -552,53 +564,36 @@
 	if {$len} {
 		puts ""
 	}
 }
 
-# Display options (from $autosetup(optionhelp)) for modules that match
-# glob pattern $what
-proc options-show {what} {
-	set local 0
+proc options-show {} {
 	# Determine the max option width
 	set max 0
-	foreach help $::autosetup(optionhelp) {
-		lassign $help opt module desc
-		if {![string match $what $module]} {
-			continue
-		}
+	foreach {opt desc} $::autosetup(optionhelp) {
 		if {[string match =* $opt] || [string match \n* $desc]} {
 			continue
 		}
 		set max [max $max [string length $opt]]
 	}
-	set indent [string repeat " " [expr {$max+4}]]
+	set indent [string repeat " " [expr $max+4]]
 	set cols [getenv COLUMNS 80]
 	catch {
 		lassign [exec stty size] rows cols
 	}
 	incr cols -1
 	# Now output
-	foreach help $::autosetup(optionhelp) {
-		lassign $help opt module desc
-		if {![string match $what $module]} {
-			continue
-		}
-		if {$local == 0 && $module eq "auto.def"} {
-			puts "Local Options:"
-			incr local
-		}
+	foreach {opt desc} $::autosetup(optionhelp) {
 		if {[string match =* $opt]} {
-			# Output a special heading line"
 			puts [string range $opt 1 end]
 			continue
 		}
 		puts -nonewline "  [format %-${max}s $opt]"
 		if {[string match \n* $desc]} {
-			# Output a pre-formatted help description as-is
 			puts $desc
 		} else {
-			options-wrap-desc [string trim $desc] $cols "  " $indent [expr {$max+2}]
+			options-wrap-desc [string trim $desc] $cols "  " $indent [expr $max + 2]
 		}
 	}
 }
 
 # @options optionspec
@@ -613,20 +608,16 @@
 #
 # The default is 'name=0', meaning that the option is disabled by default.
 # If 'name=1' is used to make the option enabled by default, the description should reflect
 # that with text like "Disable support for ...".
 #
-# An argument option (one which takes a parameter) is of one of the following forms:
+# An argument option (one which takes a parameter) is of the form:
 #
-## name:value         => "Description of this option"
-## name:value=default => "Description of this option with a default value"
-## name:=value        => "Description of this option with an optional value"
+## name:[=]value  => "Description of this option"
 #
 # If the 'name:value' form is used, the value must be provided with the option (as '--name=myvalue').
-# If the 'name:value=default' form is used, the option has the given default value even if not
-# specified by the user.
-# If the 'name:=value' form is used, the value is optional and the given value is used
+# If the 'name:=value' form is used, the value is optional and the given value is used as the default
 # if it is not provided.
 #
 # The description may contain '@default@', in which case it will be replaced with the default
 # value for the option (taking into account defaults specified with 'options-defaults'.
 #
@@ -636,26 +627,23 @@
 # For example, '--disable-lfs' is an alias for '--disable=largefile':
 #
 ## lfs=1 largefile=1 => "Disable large file support"
 #
 proc options {optlist} {
-	global autosetup
-
-	options-add $optlist
-
-	if {$autosetup(showhelp)} {
-		# If --help, stop now to show help
-		return -code break
-	}
-
-	if {$autosetup(module) eq "auto.def"} {
-		# Check for invalid options
-		if {[opt-bool option-checking]} {
-			foreach o [dict keys $::autosetup(getopt)] {
-				if {$o ni $::autosetup(options)} {
-					user-error "Unknown option --$o"
-				}
+	# Allow options as a list or args
+	options-add $optlist "Local Options:"
+
+	if {$::autosetup(showhelp)} {
+		options-show
+		exit 0
+	}
+
+	# Check for invalid options
+	if {[opt-bool option-checking]} {
+		foreach o [dict keys $::autosetup(getopt)] {
+			if {$o ni $::autosetup(options)} {
+				user-error "Unknown option --$o"
 			}
 		}
 	}
 }
 
@@ -1183,13 +1171,12 @@
 	foreach m $args {
 		if {[info exists libmodule($m)]} {
 			continue
 		}
 		set libmodule($m) 1
-
 		if {[info exists modsource(${m}.tcl)]} {
-			autosetup_load_module $m eval $modsource(${m}.tcl)
+			automf_load eval $modsource(${m}.tcl)
 		} else {
 			set locs [list ${m}.tcl ${m}/init.tcl]
 			set found 0
 			foreach dir $dirs {
 				foreach loc $locs {
@@ -1205,11 +1192,11 @@
 			}
 			if {$found} {
 				# For the convenience of the "use" source, point to the directory
 				# it is being loaded from
 				set ::usedir [file dirname $source]
-				autosetup_load_module $m source $source
+				automf_load source $source
 				autosetup_add_dep $source
 			} else {
 				autosetup-error "use: No such module: $m"
 			}
 		}
@@ -1218,28 +1205,23 @@
 
 proc autosetup_load_auto_modules {} {
 	global autosetup modsource
 	# First load any embedded auto modules
 	foreach mod [array names modsource *.auto] {
-		autosetup_load_module $mod eval $modsource($mod)
+		automf_load eval $modsource($mod)
 	}
 	# Now any external auto modules
 	foreach file [glob -nocomplain $autosetup(libdir)/*.auto $autosetup(libdir)/*/*.auto] {
-		autosetup_load_module [file tail $file] source $file
+		automf_load source $file
 	}
 }
 
 # Load module source in the global scope by executing the given command
-proc autosetup_load_module {module args} {
-	global autosetup
-	set prev $autosetup(module)
-	set autosetup(module) $module
-
+proc automf_load {args} {
 	if {[catch [list uplevel #0 $args] msg opts] ni {0 2 3}} {
 		autosetup-full-error [error-dump $msg $opts $::autosetup(debug)]
 	}
-	set autosetup(module) $prev
 }
 
 # Initial settings
 set autosetup(exe) $::argv0
 set autosetup(istcl) 1
@@ -1247,11 +1229,10 @@
 set autosetup(installed) 0
 set autosetup(sysinstall) 0
 set autosetup(msg-checking) 0
 set autosetup(msg-quiet) 0
 set autosetup(inittypes) {}
-set autosetup(module) autosetup
 
 # Embedded modules are inserted below here
 set autosetup(installed) 1
 set autosetup(sysinstall) 0
 # ----- @module asciidoc-formatting.tcl -----
@@ -1451,28 +1432,28 @@
 proc autosetup_help {what} {
     use_pager
 
     puts "Usage: [file tail $::autosetup(exe)] \[options\] \[settings\]\n"
     puts "This is [autosetup_version], a build environment \"autoconfigurator\""
-    puts "See the documentation online at http://msteveb.github.io/autosetup/\n"
-
-    if {$what in {all local}} {
-        # Need to load auto.def now
-        if {[file exists $::autosetup(autodef)]} {
-            # Load auto.def as module "auto.def"
-            autosetup_load_module auto.def source $::autosetup(autodef)
-        }
-        if {$what eq "all"} {
-            set what *
-        } else {
-            set what auto.def
-        }
-    } else {
-        use $what
-        puts "Options for module $what:"
-    }
-    options-show $what
+    puts "See the documentation online at http://msteveb.github.com/autosetup/\n"
+
+    if {$what eq "local"} {
+        if {[file exists $::autosetup(autodef)]} {
+            # This relies on auto.def having a call to 'options'
+            # which will display options and quit
+            source $::autosetup(autodef)
+        } else {
+            options-show
+        }
+    } else {
+        incr ::autosetup(showhelp)
+        if {[catch {use $what}]} {
+            user-error "Unknown module: $what"
+        } else {
+            options-show
+        }
+    }
     exit 0
 }
 
 proc autosetup_show_license {} {
     global modsource autosetup
@@ -1928,11 +1909,11 @@
 *.tcl files in this directory are optional modules which
 can be loaded with the 'use' directive.
 
 *.auto files in this directory are auto-loaded.
 
-For more information, see http://msteveb.github.io/autosetup/
+For more information, see http://msteveb.github.com/autosetup/
 }
 	dputs "install: autosetup/README.autosetup"
 	writefile $target $readme
 }
 }

Index: autosetup/autosetup-config.guess
==================================================================
--- autosetup/autosetup-config.guess
+++ autosetup/autosetup-config.guess
@@ -1,12 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2021 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2021-06-03'
+timestamp='2018-03-08'
 
 # 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
@@ -27,22 +25,14 @@
 # of the GNU General Public License, version 3 ("GPLv3").
 #
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
-
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX.  However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
 Usage: $0 [OPTION]
@@ -58,11 +48,11 @@
 
 version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2018 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."
 
 help="
@@ -92,12 +82,11 @@
 if test $# != 0; then
   echo "$me: too many arguments$help" >&2
   exit 1
 fi
 
-# Just in case it came from the environment.
-GUESS=
+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
 # headache to deal with in a portable fashion.
@@ -105,94 +94,77 @@
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-tmp=
-# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
-
-set_cc_for_build() {
-    # prevent multiple calls if $tmp is already set
-    test "$tmp" && return 0
-    : "${TMPDIR=/tmp}"
-    # shellcheck disable=SC2039,SC3028
-    { 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
-}
+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= ;'
 
 # 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 ; then
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=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/*)
-	LIBC=unknown
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
 
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#elif defined(__GLIBC__)
-	LIBC=gnu
 	#else
-	#include <stdarg.h>
-	/* First heuristic to detect musl libc.  */
-	#ifdef __DEFINED_va_list
-	LIBC=musl
-	#endif
+	LIBC=gnu
 	#endif
 	EOF
-	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	eval "$cc_set_libc"
-
-	# Second heuristic to detect musl libc.
-	if [ "$LIBC" = unknown ] &&
-	   command -v ldd >/dev/null &&
-	   ldd --version 2>&1 | grep -q ^musl; then
-		LIBC=musl
-	fi
-
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	if [ "$LIBC" = unknown ]; then
-		LIBC=gnu
+	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*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
@@ -200,36 +172,36 @@
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
 	#
 	# 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=`(uname -p 2>/dev/null || \
-	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
-	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    "/sbin/$sysctl" 2>/dev/null || \
+	    "/usr/sbin/$sysctl" 2>/dev/null || \
 	    echo unknown)`
-	case $UNAME_MACHINE_ARCH in
-	    aarch64eb) machine=aarch64_be-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 ;;
 	    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="${arch}${endian}"-unknown
 		;;
-	    *) machine=$UNAME_MACHINE_ARCH-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) and ABI.
-	case $UNAME_MACHINE_ARCH in
+	case "$UNAME_MACHINE_ARCH" in
 	    earm*)
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		set_cc_for_build
+		eval "$set_cc_for_build"
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -241,11 +213,11 @@
 	    *)
 		os=netbsd
 		;;
 	esac
 	# Determine ABI tags.
-	case $UNAME_MACHINE_ARCH in
+	case "$UNAME_MACHINE_ARCH" in
 	    earm*)
 		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
 		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
 		;;
 	esac
@@ -252,11 +224,11 @@
 	# 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/[-_].*//' | cut -d. -f1,2`
@@ -263,61 +235,49 @@
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	GUESS=$machine-${os}${release}${abi-}
-	;;
+	echo "$machine-${os}${release}${abi}"
+	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
-	;;
-    *:SecBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+	exit ;;
     *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+	exit ;;
     *:MidnightBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+	exit ;;
     *:ekkoBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+	exit ;;
     *:SolidBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
-	;;
-    *:OS108:*:*)
-	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+	exit ;;
     macppc:MirBSD:*:*)
-	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
-	;;
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
     *:MirBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
     *:Sortix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-sortix
-	;;
-    *:Twizzler:*:*)
-	GUESS=$UNAME_MACHINE-unknown-twizzler
-	;;
+	echo "$UNAME_MACHINE"-unknown-sortix
+	exit ;;
     *:Redox:*:*)
-	GUESS=$UNAME_MACHINE-unknown-redox
-	;;
+	echo "$UNAME_MACHINE"-unknown-redox
+	exit ;;
     mips:OSF1:*.*)
-	GUESS=mips-dec-osf1
-	;;
+        echo mips-dec-osf1
+        exit ;;
     alpha:OSF1:*:*)
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
@@ -327,11 +287,11 @@
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case $ALPHA_CPU_TYPE in
+	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
 		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
 		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
@@ -364,171 +324,167 @@
 	# 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.
-	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
-	;;
+	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 ;;
     Amiga*:UNIX_System_V:4.0:*)
-	GUESS=m68k-unknown-sysv4
-	;;
+	echo m68k-unknown-sysv4
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
-	GUESS=$UNAME_MACHINE-unknown-amigaos
-	;;
+	echo "$UNAME_MACHINE"-unknown-amigaos
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
-	GUESS=$UNAME_MACHINE-unknown-morphos
-	;;
+	echo "$UNAME_MACHINE"-unknown-morphos
+	exit ;;
     *:OS/390:*:*)
-	GUESS=i370-ibm-openedition
-	;;
+	echo i370-ibm-openedition
+	exit ;;
     *:z/VM:*:*)
-	GUESS=s390-ibm-zvmoe
-	;;
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
-	GUESS=powerpc-ibm-os400
-	;;
+	echo powerpc-ibm-os400
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	GUESS=arm-acorn-riscix$UNAME_RELEASE
-	;;
+	echo arm-acorn-riscix"$UNAME_RELEASE"
+	exit ;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-	GUESS=arm-unknown-riscos
-	;;
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	GUESS=hppa1.1-hitachi-hiuxmpp
-	;;
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	case `(/bin/universe) 2>/dev/null` in
-	    att) GUESS=pyramid-pyramid-sysv3 ;;
-	    *)   GUESS=pyramid-pyramid-bsd   ;;
-	esac
-	;;
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
     NILE*:*:*:dcosx)
-	GUESS=pyramid-pyramid-svr4
-	;;
+	echo pyramid-pyramid-svr4
+	exit ;;
     DRS?6000:unix:4.0:6*)
-	GUESS=sparc-icl-nx6
-	;;
+	echo sparc-icl-nx6
+	exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) GUESS=sparc-icl-nx7 ;;
-	esac
-	;;
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
     s390x:SunOS:*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
-	;;
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	exit ;;
     sun4H:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=sparc-hal-solaris2$SUN_REL
-	;;
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=sparc-sun-solaris2$SUN_REL
-	;;
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	exit ;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	GUESS=i386-pc-auroraux$UNAME_RELEASE
-	;;
+	echo i386-pc-auroraux"$UNAME_RELEASE"
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	set_cc_for_build
+	eval "$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 test "$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) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH=x86_64
 	    fi
 	fi
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
-	;;
+	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.
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=sparc-sun-solaris3$SUN_REL
-	;;
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     sun4*:SunOS:*:*)
-	case `/usr/bin/arch -k` in
+	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
-	GUESS=sparc-sun-sunos$SUN_REL
-	;;
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+	exit ;;
     sun3*:SunOS:*:*)
-	GUESS=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
-	case `/bin/arch` in
+	case "`/bin/arch`" in
 	    sun3)
-		GUESS=m68k-sun-sunos$UNAME_RELEASE
+		echo m68k-sun-sunos"$UNAME_RELEASE"
 		;;
 	    sun4)
-		GUESS=sparc-sun-sunos$UNAME_RELEASE
+		echo sparc-sun-sunos"$UNAME_RELEASE"
 		;;
 	esac
-	;;
+	exit ;;
     aushp:SunOS:*:*)
-	GUESS=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
     # "atarist" or "atariste" at least should have a processor
     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
     # to the lowercase version "mint" (or "freemint").  Finally
     # the system name "TOS" denotes a system which is actually not
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	GUESS=m68k-milan-mint$UNAME_RELEASE
-	;;
+	echo m68k-milan-mint"$UNAME_RELEASE"
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	GUESS=m68k-hades-mint$UNAME_RELEASE
-	;;
+	echo m68k-hades-mint"$UNAME_RELEASE"
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	GUESS=m68k-unknown-mint$UNAME_RELEASE
-	;;
+	echo m68k-unknown-mint"$UNAME_RELEASE"
+	exit ;;
     m68k:machten:*:*)
-	GUESS=m68k-apple-machten$UNAME_RELEASE
-	;;
+	echo m68k-apple-machten"$UNAME_RELEASE"
+	exit ;;
     powerpc:machten:*:*)
-	GUESS=powerpc-apple-machten$UNAME_RELEASE
-	;;
+	echo powerpc-apple-machten"$UNAME_RELEASE"
+	exit ;;
     RISC*:Mach:*:*)
-	GUESS=mips-dec-mach_bsd4.3
-	;;
+	echo mips-dec-mach_bsd4.3
+	exit ;;
     RISC*:ULTRIX:*:*)
-	GUESS=mips-dec-ultrix$UNAME_RELEASE
-	;;
+	echo mips-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
     VAX*:ULTRIX*:*:*)
-	GUESS=vax-dec-ultrix$UNAME_RELEASE
-	;;
+	echo vax-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-	GUESS=clipper-intergraph-clix$UNAME_RELEASE
-	;;
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
@@ -550,83 +506,82 @@
 EOF
 	$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; }
-	GUESS=mips-mips-riscos$UNAME_RELEASE
-	;;
+	echo mips-mips-riscos"$UNAME_RELEASE"
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
-	GUESS=powerpc-motorola-powermax
-	;;
+	echo powerpc-motorola-powermax
+	exit ;;
     Motorola:*:4.3:PL8-*)
-	GUESS=powerpc-harris-powermax
-	;;
+	echo powerpc-harris-powermax
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	GUESS=powerpc-harris-powermax
-	;;
+	echo powerpc-harris-powermax
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
-	GUESS=powerpc-harris-powerunix
-	;;
+	echo powerpc-harris-powerunix
+	exit ;;
     m88k:CX/UX:7*:*)
-	GUESS=m88k-harris-cxux7
-	;;
+	echo m88k-harris-cxux7
+	exit ;;
     m88k:*:4*:R4*)
-	GUESS=m88k-motorola-sysv4
-	;;
+	echo m88k-motorola-sysv4
+	exit ;;
     m88k:*:3*:R3*)
-	GUESS=m88k-motorola-sysv3
-	;;
+	echo m88k-motorola-sysv3
+	exit ;;
     AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
-	then
-	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
-	       test "$TARGET_BINARY_INTERFACE"x = x
-	    then
-		GUESS=m88k-dg-dgux$UNAME_RELEASE
-	    else
-		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
-	    fi
-	else
-	    GUESS=i586-dg-dgux$UNAME_RELEASE
-	fi
-	;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	GUESS=m88k-dolphin-sysv3
-	;;
+	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+	then
+	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+	    then
+		echo m88k-dg-dgux"$UNAME_RELEASE"
+	    else
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+	    fi
+	else
+	    echo i586-dg-dgux"$UNAME_RELEASE"
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	GUESS=m88k-motorola-sysv3
-	;;
+	echo m88k-motorola-sysv3
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	GUESS=m88k-tektronix-sysv3
-	;;
+	echo m88k-tektronix-sysv3
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	GUESS=m68k-tektronix-bsd
-	;;
+	echo m68k-tektronix-bsd
+	exit ;;
     *:IRIX*:*:*)
-	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
-	GUESS=mips-sgi-irix$IRIX_REL
-	;;
+	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.
-	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
-	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-	GUESS=i386-ibm-aix
-	;;
+	echo i386-ibm-aix
+	exit ;;
     ia64:AIX:*:*)
-	if test -x /usr/bin/oslevel ; then
+	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
-	GUESS=$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
-		set_cc_for_build
+		eval "$set_cc_for_build"
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
 		main()
 			{
@@ -636,78 +591,78 @@
 			exit(0);
 			}
 EOF
 		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			GUESS=$SYSTEM_NAME
+			echo "$SYSTEM_NAME"
 		else
-			GUESS=rs6000-ibm-aix3.2.5
+			echo rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		GUESS=rs6000-ibm-aix3.2.4
+		echo rs6000-ibm-aix3.2.4
 	else
-		GUESS=rs6000-ibm-aix3.2
+		echo rs6000-ibm-aix3.2
 	fi
-	;;
+	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
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if test -x /usr/bin/lslpp ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
+	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
-	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
-	;;
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+	exit ;;
     *:AIX:*:*)
-	GUESS=rs6000-ibm-aix
-	;;
+	echo rs6000-ibm-aix
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-	GUESS=romp-ibm-bsd4.4
-	;;
+	echo romp-ibm-bsd4.4
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
-	;;                                  # report: romp-ibm BSD 4.3
+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-	GUESS=rs6000-bull-bosx
-	;;
+	echo rs6000-bull-bosx
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
-	GUESS=m68k-bull-sysv3
-	;;
+	echo m68k-bull-sysv3
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
-	GUESS=m68k-hp-bsd
-	;;
+	echo m68k-hp-bsd
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	GUESS=m68k-hp-bsd4.4
-	;;
+	echo m68k-hp-bsd4.4
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
-	case $UNAME_MACHINE in
+	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 test -x /usr/bin/getconf; then
+		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
+		    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
+			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 test "$HP_ARCH" = ""; then
-		    set_cc_for_build
+		if [ "$HP_ARCH" = "" ]; then
+		    eval "$set_cc_for_build"
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
 		#include <stdlib.h>
 		#include <unistd.h>
@@ -741,13 +696,13 @@
 EOF
 		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if test "$HP_ARCH" = hppa2.0w
+	if [ "$HP_ARCH" = hppa2.0w ]
 	then
-	    set_cc_for_build
+	    eval "$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
 	    # generating 64-bit code.  GNU and HP use different nomenclature:
 	    #
@@ -762,18 +717,18 @@
 		HP_ARCH=hppa2.0w
 	    else
 		HP_ARCH=hppa64
 	    fi
 	fi
-	GUESS=$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]*//'`
-	GUESS=ia64-hp-hpux$HPUX_REV
-	;;
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux"$HPUX_REV"
+	exit ;;
     3050*:HI-UX:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
 	main ()
 	{
@@ -797,186 +752,162 @@
 	  exit (0);
 	}
 EOF
 	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	GUESS=unknown-hitachi-hiuxwe2
-	;;
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
-	GUESS=hppa1.1-hp-bsd
-	;;
+	echo hppa1.1-hp-bsd
+	exit ;;
     9000/8??:4.3bsd:*:*)
-	GUESS=hppa1.0-hp-bsd
-	;;
+	echo hppa1.0-hp-bsd
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	GUESS=hppa1.0-hp-mpeix
-	;;
+	echo hppa1.0-hp-mpeix
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
-	GUESS=hppa1.1-hp-osf
-	;;
+	echo hppa1.1-hp-osf
+	exit ;;
     hp8??:OSF1:*:*)
-	GUESS=hppa1.0-hp-osf
-	;;
+	echo hppa1.0-hp-osf
+	exit ;;
     i*86:OSF1:*:*)
-	if test -x /usr/sbin/sysversion ; then
-	    GUESS=$UNAME_MACHINE-unknown-osf1mk
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo "$UNAME_MACHINE"-unknown-osf1mk
 	else
-	    GUESS=$UNAME_MACHINE-unknown-osf1
+	    echo "$UNAME_MACHINE"-unknown-osf1
 	fi
-	;;
+	exit ;;
     parisc*:Lites*:*:*)
-	GUESS=hppa1.1-hp-lites
-	;;
+	echo hppa1.1-hp-lites
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	GUESS=c1-convex-bsd
-	;;
+	echo c1-convex-bsd
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
 	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	GUESS=c34-convex-bsd
-	;;
+	echo c34-convex-bsd
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	GUESS=c38-convex-bsd
-	;;
+	echo c38-convex-bsd
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	GUESS=c4-convex-bsd
-	;;
+	echo c4-convex-bsd
+	exit ;;
     CRAY*Y-MP:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=ymp-cray-unicos$CRAY_REL
-	;;
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	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:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=t90-cray-unicos$CRAY_REL
-	;;
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*T3E:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=alphaev5-cray-unicosmk$CRAY_REL
-	;;
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*SV1:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=sv1-cray-unicos$CRAY_REL
-	;;
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     *:UNICOS/mp:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
-	GUESS=craynv-cray-unicosmp$CRAY_REL
-	;;
+	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/ /_/'`
-	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
-	;;
+	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/ /_/'`
-	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
-	;;
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+	exit ;;
     sparc*:BSD/OS:*:*)
-	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
-	;;
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
     *:BSD/OS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
-	;;
-    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
-	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
-	else
-	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
-	fi
-	;;
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case $UNAME_PROCESSOR in
+	case "$UNAME_PROCESSOR" in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
 	    i386)
 		UNAME_PROCESSOR=i586 ;;
 	esac
-	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
-	;;
+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+	exit ;;
     i*:CYGWIN*:*)
-	GUESS=$UNAME_MACHINE-pc-cygwin
-	;;
+	echo "$UNAME_MACHINE"-pc-cygwin
+	exit ;;
     *:MINGW64*:*)
-	GUESS=$UNAME_MACHINE-pc-mingw64
-	;;
+	echo "$UNAME_MACHINE"-pc-mingw64
+	exit ;;
     *:MINGW*:*)
-	GUESS=$UNAME_MACHINE-pc-mingw32
-	;;
+	echo "$UNAME_MACHINE"-pc-mingw32
+	exit ;;
     *:MSYS*:*)
-	GUESS=$UNAME_MACHINE-pc-msys
-	;;
+	echo "$UNAME_MACHINE"-pc-msys
+	exit ;;
     i*:PW*:*)
-	GUESS=$UNAME_MACHINE-pc-pw32
-	;;
+	echo "$UNAME_MACHINE"-pc-pw32
+	exit ;;
     *:Interix*:*)
-	case $UNAME_MACHINE in
+	case "$UNAME_MACHINE" in
 	    x86)
-		GUESS=i586-pc-interix$UNAME_RELEASE
-		;;
+		echo i586-pc-interix"$UNAME_RELEASE"
+		exit ;;
 	    authenticamd | genuineintel | EM64T)
-		GUESS=x86_64-unknown-interix$UNAME_RELEASE
-		;;
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
 	    IA64)
-		GUESS=ia64-unknown-interix$UNAME_RELEASE
-		;;
+		echo ia64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
 	esac ;;
     i*:UWIN*:*)
-	GUESS=$UNAME_MACHINE-pc-uwin
-	;;
+	echo "$UNAME_MACHINE"-pc-uwin
+	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	GUESS=x86_64-pc-cygwin
-	;;
+	echo x86_64-unknown-cygwin
+	exit ;;
     prep*:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=powerpcle-unknown-solaris2$SUN_REL
-	;;
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
-	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
-	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
-	;;
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
-	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
-	;;
-    *:Minix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-minix
-	;;
+	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
+	exit ;;
     aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
 	  PCA57) UNAME_MACHINE=alphapca56 ;;
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
@@ -983,288 +914,246 @@
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     arm*:Linux:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    GUESS=$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
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
 	    else
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
 	    fi
 	fi
-	;;
+	exit ;;
     avr32*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     cris:Linux:*:*)
-	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
     crisv32:Linux:*:*)
-	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
     e2k:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     frv:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     hexagon:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     i*86:Linux:*:*)
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
     ia64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     k1om:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     m32r*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     m68*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	set_cc_for_build
-	IS_GLIBC=0
-	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef mips
-	#undef mipsel
-	#undef mips64
-	#undef mips64el
-	#if ${IS_GLIBC} && defined(_ABI64)
-	LIBCABI=gnuabi64
-	#else
-	#if ${IS_GLIBC} && defined(_ABIN32)
-	LIBCABI=gnuabin32
-	#else
-	LIBCABI=${LIBC}
-	#endif
-	#endif
-
-	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-	CPU=mipsisa64r6
-	#else
-	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-	CPU=mipsisa32r6
-	#else
-	#if defined(__mips64)
-	CPU=mips64
-	#else
-	CPU=mips
-	#endif
-	#endif
-	#endif
-
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	MIPS_ENDIAN=el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	MIPS_ENDIAN=
+	CPU=${UNAME_MACHINE}
 	#else
-	MIPS_ENDIAN=
+	CPU=
 	#endif
 	#endif
 EOF
-	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
-	eval "$cc_set_vars"
-	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
 	;;
     mips64el:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     openrisc*:Linux:*:*)
-	GUESS=or1k-unknown-linux-$LIBC
-	;;
+	echo or1k-unknown-linux-"$LIBC"
+	exit ;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     padre:Linux:*:*)
-	GUESS=sparc-unknown-linux-$LIBC
-	;;
+	echo sparc-unknown-linux-"$LIBC"
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	GUESS=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*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
-	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
-	  *)    GUESS=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:*:*)
-	GUESS=powerpc64-unknown-linux-$LIBC
-	;;
+	echo powerpc64-unknown-linux-"$LIBC"
+	exit ;;
     ppc:Linux:*:*)
-	GUESS=powerpc-unknown-linux-$LIBC
-	;;
+	echo powerpc-unknown-linux-"$LIBC"
+	exit ;;
     ppc64le:Linux:*:*)
-	GUESS=powerpc64le-unknown-linux-$LIBC
-	;;
+	echo powerpc64le-unknown-linux-"$LIBC"
+	exit ;;
     ppcle:Linux:*:*)
-	GUESS=powerpcle-unknown-linux-$LIBC
-	;;
-    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo powerpcle-unknown-linux-"$LIBC"
+	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+	exit ;;
     sh64*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     sh*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     tile*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     vax:Linux:*:*)
-	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+	exit ;;
     x86_64:Linux:*:*)
-	set_cc_for_build
-	LIBCABI=$LIBC
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_X32 >/dev/null
-	    then
-		LIBCABI=${LIBC}x32
-	    fi
-	fi
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
-	;;
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
     xtensa*:Linux:*:*)
-	GUESS=$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.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	GUESS=i386-sequent-sysv4
-	;;
+	echo i386-sequent-sysv4
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# 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.
-	GUESS=$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.
-	GUESS=$UNAME_MACHINE-pc-os2-emx
-	;;
+	echo "$UNAME_MACHINE"-pc-os2-emx
+	exit ;;
     i*86:XTS-300:*:STOP)
-	GUESS=$UNAME_MACHINE-unknown-stop
-	;;
+	echo "$UNAME_MACHINE"-unknown-stop
+	exit ;;
     i*86:atheos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-atheos
-	;;
+	echo "$UNAME_MACHINE"-unknown-atheos
+	exit ;;
     i*86:syllable:*:*)
-	GUESS=$UNAME_MACHINE-pc-syllable
-	;;
+	echo "$UNAME_MACHINE"-pc-syllable
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	GUESS=i386-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     i*86:*DOS:*:*)
-	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
-	;;
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+	exit ;;
     i*86:*:4.*:*)
 	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
 	else
-		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
 	fi
-	;;
+	exit ;;
     i*86:*:5:[678]*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	GUESS=$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' </usr/options/cb.name`
-		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
 	elif /bin/uname -X 2>/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
 		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
 		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
 	else
-		GUESS=$UNAME_MACHINE-pc-sysv32
+		echo "$UNAME_MACHINE"-pc-sysv32
 	fi
-	;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
 	# 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 configure will decide that
 	# this is a cross-build.
-	GUESS=i586-pc-msdosdjgpp
-	;;
+	echo i586-pc-msdosdjgpp
+	exit ;;
     Intel:Mach:3*:*)
-	GUESS=i386-pc-mach3
-	;;
+	echo i386-pc-mach3
+	exit ;;
     paragon:*:*:*)
-	GUESS=i860-intel-osf1
-	;;
+	echo i860-intel-osf1
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  GUESS=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.
-	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
 	fi
-	;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	GUESS=m68010-convergent-sysv
-	;;
+	echo m68010-convergent-sysv
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
-	GUESS=m68k-convergent-sysv
-	;;
+	echo m68k-convergent-sysv
+	exit ;;
     M680?0:D-NIX:5.3:*)
-	GUESS=m68k-diab-dnix
-	;;
+	echo m68k-diab-dnix
+	exit ;;
     M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
@@ -1285,405 +1174,253 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	    && { 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; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
-	GUESS=m68k-atari-sysv4
-	;;
+	echo m68k-atari-sysv4
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
-	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     rs6000:LynxOS:2.*:*)
-	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
-	GUESS=mips-dde-sysv$UNAME_RELEASE
-	;;
+	echo mips-dde-sysv"$UNAME_RELEASE"
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
-	GUESS=mips-sni-sysv4
-	;;
+	echo mips-sni-sysv4
+	exit ;;
     RM*:SINIX-*:*:*)
-	GUESS=mips-sni-sysv4
-	;;
+	echo mips-sni-sysv4
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		GUESS=$UNAME_MACHINE-sni-sysv4
+		echo "$UNAME_MACHINE"-sni-sysv4
 	else
-		GUESS=ns32k-sni-sysv
+		echo ns32k-sni-sysv
 	fi
-	;;
+	exit ;;
     PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	GUESS=i586-unisys-sysv4
-	;;
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	GUESS=hppa1.1-stratus-sysv4
-	;;
+	echo hppa1.1-stratus-sysv4
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	GUESS=i860-stratus-sysv4
-	;;
+	echo i860-stratus-sysv4
+	exit ;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	GUESS=$UNAME_MACHINE-stratus-vos
-	;;
+	echo "$UNAME_MACHINE"-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	GUESS=hppa1.1-stratus-vos
-	;;
+	echo hppa1.1-stratus-vos
+	exit ;;
     mc68*:A/UX:*:*)
-	GUESS=m68k-apple-aux$UNAME_RELEASE
-	;;
+	echo m68k-apple-aux"$UNAME_RELEASE"
+	exit ;;
     news*:NEWS-OS:6*:*)
-	GUESS=mips-sony-newsos6
-	;;
+	echo mips-sony-newsos6
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if test -d /usr/nec; then
-		GUESS=mips-nec-sysv$UNAME_RELEASE
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv"$UNAME_RELEASE"
 	else
-		GUESS=mips-unknown-sysv$UNAME_RELEASE
+		echo mips-unknown-sysv"$UNAME_RELEASE"
 	fi
-	;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	GUESS=powerpc-be-beos
-	;;
+	echo powerpc-be-beos
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	GUESS=powerpc-apple-beos
-	;;
+	echo powerpc-apple-beos
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	GUESS=i586-pc-beos
-	;;
+	echo i586-pc-beos
+	exit ;;
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	GUESS=i586-pc-haiku
-	;;
+	echo i586-pc-haiku
+	exit ;;
     x86_64:Haiku:*:*)
-	GUESS=x86_64-unknown-haiku
-	;;
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
-	GUESS=sx4-nec-superux$UNAME_RELEASE
-	;;
+	echo sx4-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-5:SUPER-UX:*:*)
-	GUESS=sx5-nec-superux$UNAME_RELEASE
-	;;
+	echo sx5-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-6:SUPER-UX:*:*)
-	GUESS=sx6-nec-superux$UNAME_RELEASE
-	;;
+	echo sx6-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-7:SUPER-UX:*:*)
-	GUESS=sx7-nec-superux$UNAME_RELEASE
-	;;
+	echo sx7-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-8:SUPER-UX:*:*)
-	GUESS=sx8-nec-superux$UNAME_RELEASE
-	;;
+	echo sx8-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-8R:SUPER-UX:*:*)
-	GUESS=sx8r-nec-superux$UNAME_RELEASE
-	;;
+	echo sx8r-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-ACE:SUPER-UX:*:*)
-	GUESS=sxace-nec-superux$UNAME_RELEASE
-	;;
+	echo sxace-nec-superux"$UNAME_RELEASE"
+	exit ;;
     Power*:Rhapsody:*:*)
-	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
-	;;
+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
     *:Rhapsody:*:*)
-	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
-	;;
-    arm64:Darwin:*:*)
-	GUESS=aarch64-apple-darwin$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	if command -v xcode-select > /dev/null 2> /dev/null && \
-		! xcode-select --print-path > /dev/null 2> /dev/null ; then
-	    # Avoid executing cc if there is no toolchain installed as
-	    # cc will be a stub that puts up a graphical alert
-	    # prompting the user to install developer tools.
-	    CC_FOR_BUILD=no_compiler_found
-	else
-	    set_cc_for_build
-	fi
-	if test "$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
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval "$set_cc_for_build"
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	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
-	    # uname -m returns i386 or x86_64
-	    UNAME_PROCESSOR=$UNAME_MACHINE
+	    # 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
-	GUESS=$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
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
-	;;
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+	exit ;;
     *:QNX:*:4*)
-	GUESS=i386-pc-qnx
-	;;
+	echo i386-pc-qnx
+	exit ;;
     NEO-*:NONSTOP_KERNEL:*:*)
-	GUESS=neo-tandem-nsk$UNAME_RELEASE
-	;;
+	echo neo-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
-	GUESS=nse-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nse-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSR-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsr-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSV-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsv-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSX-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsx-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     *:NonStop-UX:*:*)
-	GUESS=mips-compaq-nonstopux
-	;;
+	echo mips-compaq-nonstopux
+	exit ;;
     BS2000:POSIX*:*:*)
-	GUESS=bs2000-siemens-sysv
-	;;
+	echo bs2000-siemens-sysv
+	exit ;;
     DS/*:UNIX_System_V:*:*)
-	GUESS=$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
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
-	elif test "x${cputype-}" != x; then
-	    UNAME_MACHINE=$cputype
+	else
+	    UNAME_MACHINE="$cputype"
 	fi
-	GUESS=$UNAME_MACHINE-unknown-plan9
-	;;
+	echo "$UNAME_MACHINE"-unknown-plan9
+	exit ;;
     *:TOPS-10:*:*)
-	GUESS=pdp10-unknown-tops10
-	;;
+	echo pdp10-unknown-tops10
+	exit ;;
     *:TENEX:*:*)
-	GUESS=pdp10-unknown-tenex
-	;;
+	echo pdp10-unknown-tenex
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	GUESS=pdp10-dec-tops20
-	;;
+	echo pdp10-dec-tops20
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	GUESS=pdp10-xkl-tops20
-	;;
+	echo pdp10-xkl-tops20
+	exit ;;
     *:TOPS-20:*:*)
-	GUESS=pdp10-unknown-tops20
-	;;
+	echo pdp10-unknown-tops20
+	exit ;;
     *:ITS:*:*)
-	GUESS=pdp10-unknown-its
-	;;
+	echo pdp10-unknown-its
+	exit ;;
     SEI:*:*:SEIUX)
-	GUESS=mips-sei-seiux$UNAME_RELEASE
-	;;
+	echo mips-sei-seiux"$UNAME_RELEASE"
+	exit ;;
     *:DragonFly:*:*)
-	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
-	;;
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+	exit ;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case $UNAME_MACHINE in
-	    A*) GUESS=alpha-dec-vms ;;
-	    I*) GUESS=ia64-dec-vms ;;
-	    V*) GUESS=vax-dec-vms ;;
+	case "$UNAME_MACHINE" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
 	esac ;;
     *:XENIX:*:SysV)
-	GUESS=i386-pc-xenix
-	;;
+	echo i386-pc-xenix
+	exit ;;
     i*86:skyos:*:*)
-	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
-	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
-	;;
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+	exit ;;
     i*86:rdos:*:*)
-	GUESS=$UNAME_MACHINE-pc-rdos
-	;;
-    *:AROS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-aros
-	;;
+	echo "$UNAME_MACHINE"-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo "$UNAME_MACHINE"-pc-aros
+	exit ;;
     x86_64:VMkernel:*:*)
-	GUESS=$UNAME_MACHINE-unknown-esx
-	;;
+	echo "$UNAME_MACHINE"-unknown-esx
+	exit ;;
     amd64:Isilon\ OneFS:*:*)
-	GUESS=x86_64-unknown-onefs
-	;;
-    *:Unleashed:*:*)
-	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
-	;;
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
-# Do we have a guess based on uname results?
-if test "x$GUESS" != x; then
-    echo "$GUESS"
-    exit
-fi
-
-# No uname command or uname output not recognized.
-set_cc_for_build
-cat > "$dummy.c" <<EOF
-#ifdef _SEQUENT_
-#include <sys/types.h>
-#include <sys/utsname.h>
-#endif
-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#include <signal.h>
-#if defined(_SIZE_T_) || defined(SIGLOST)
-#include <sys/utsname.h>
-#endif
-#endif
-#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 <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-  "4"
-#else
-  ""
-#endif
-  ); exit (0);
-#endif
-#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 <sys/param.h>
-#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
-#if defined(_SIZE_T_) || defined(SIGLOST)
-  struct utsname un;
-  uname (&un);
-  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-#endif
-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#if defined(_SIZE_T_) || defined(SIGLOST)
-  struct utsname *un;
-  uname (&un);
-  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
-#else
-  printf ("mips-dec-ultrix\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 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; }
-
 echo "$0: unable to guess system type" >&2
 
-case $UNAME_MACHINE:$UNAME_SYSTEM in
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
     mips:Linux | mips64:Linux)
 	# If we got here on MIPS GNU/Linux, output extra information.
 	cat >&2 <<EOF
 
 NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
@@ -1696,21 +1433,13 @@
 
 This script (version $timestamp), has failed to recognize the
 operating system you are using. If your script is old, overwrite *all*
 copies of config.guess and config.sub with the latest versions from:
 
-  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-EOF
-
-our_year=`echo $timestamp | sed 's,-.*,,'`
-thisyear=`date +%Y`
-# shellcheck disable=SC2003
-script_age=`expr "$thisyear" - "$our_year"`
-if test "$script_age" -lt 3 ; then
-   cat >&2 <<EOF
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 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.
 
@@ -1734,15 +1463,14 @@
 UNAME_MACHINE = "$UNAME_MACHINE"
 UNAME_RELEASE = "$UNAME_RELEASE"
 UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
-fi
 
 exit 1
 
 # Local variables:
 # eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:

Index: autosetup/autosetup-config.sub
==================================================================
--- autosetup/autosetup-config.sub
+++ autosetup/autosetup-config.sub
@@ -1,12 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2021 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2021-07-03'
+timestamp='2018-03-08'
 
 # 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
@@ -33,11 +31,11 @@
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+# 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
 # that are meaningful with *any* GNU software.
 # Each package is responsible for reporting which valid configurations
@@ -50,17 +48,10 @@
 #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 # or in some cases, the newer four-part form:
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX.  However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
 Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
@@ -74,11 +65,11 @@
 Report bugs and patches to <config-patches@gnu.org>."
 
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2018 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."
 
 help="
@@ -96,11 +87,11 @@
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help" >&2
+       echo "$me: invalid option $1$help"
        exit 1 ;;
 
     *local*)
        # First pass through any local machine types.
        echo "$1"
@@ -117,1391 +108,1431 @@
  1) ;;
  *) echo "$me: too many arguments$help" >&2
     exit 1;;
 esac
 
-# Split fields of configuration type
-# shellcheck disable=SC2162
-IFS="-" read field1 field2 field3 field4 <<EOF
-$1
-EOF
-
-# Separate into logical components for further validation
-case $1 in
-	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
-		exit 1
-		;;
-	*-*-*-*)
-		basic_machine=$field1-$field2
-		basic_os=$field3-$field4
-		;;
-	*-*-*)
-		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-		# parts
-		maybe_os=$field2-$field3
-		case $maybe_os in
-			nto-qnx* | linux-* | 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
-				basic_os=$maybe_os
-				;;
-			android-linux)
-				basic_machine=$field1-unknown
-				basic_os=linux-android
-				;;
-			*)
-				basic_machine=$field1-$field2
-				basic_os=$field3
-				;;
-		esac
-		;;
-	*-*)
-		# A lone config we happen to match not fitting any pattern
-		case $field1-$field2 in
-			decstation-3100)
-				basic_machine=mips-dec
-				basic_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
-						basic_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
-						basic_os=
-						;;
-					*)
-						basic_machine=$field1
-						basic_os=$field2
-						;;
-				esac
-			;;
-		esac
-		;;
-	*)
-		# Convert single-component short-hands not valid as part of
-		# multi-component configurations.
-		case $field1 in
-			386bsd)
-				basic_machine=i386-pc
-				basic_os=bsd
-				;;
-			a29khif)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			adobe68k)
-				basic_machine=m68010-adobe
-				basic_os=scout
-				;;
-			alliant)
-				basic_machine=fx80-alliant
-				basic_os=
-				;;
-			altos | altos3068)
-				basic_machine=m68k-altos
-				basic_os=
-				;;
-			am29k)
-				basic_machine=a29k-none
-				basic_os=bsd
-				;;
-			amdahl)
-				basic_machine=580-amdahl
-				basic_os=sysv
-				;;
-			amiga)
-				basic_machine=m68k-unknown
-				basic_os=
-				;;
-			amigaos | amigados)
-				basic_machine=m68k-unknown
-				basic_os=amigaos
-				;;
-			amigaunix | amix)
-				basic_machine=m68k-unknown
-				basic_os=sysv4
-				;;
-			apollo68)
-				basic_machine=m68k-apollo
-				basic_os=sysv
-				;;
-			apollo68bsd)
-				basic_machine=m68k-apollo
-				basic_os=bsd
-				;;
-			aros)
-				basic_machine=i386-pc
-				basic_os=aros
-				;;
-			aux)
-				basic_machine=m68k-apple
-				basic_os=aux
-				;;
-			balance)
-				basic_machine=ns32k-sequent
-				basic_os=dynix
-				;;
-			blackfin)
-				basic_machine=bfin-unknown
-				basic_os=linux
-				;;
-			cegcc)
-				basic_machine=arm-unknown
-				basic_os=cegcc
-				;;
-			convex-c1)
-				basic_machine=c1-convex
-				basic_os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				basic_os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				basic_os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				basic_os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				basic_os=bsd
-				;;
-			cray)
-				basic_machine=j90-cray
-				basic_os=unicos
-				;;
-			crds | unos)
-				basic_machine=m68k-crds
-				basic_os=
-				;;
-			da30)
-				basic_machine=m68k-da30
-				basic_os=
-				;;
-			decstation | pmax | pmin | dec3100 | decstatn)
-				basic_machine=mips-dec
-				basic_os=
-				;;
-			delta88)
-				basic_machine=m88k-motorola
-				basic_os=sysv3
-				;;
-			dicos)
-				basic_machine=i686-pc
-				basic_os=dicos
-				;;
-			djgpp)
-				basic_machine=i586-pc
-				basic_os=msdosdjgpp
-				;;
-			ebmon29k)
-				basic_machine=a29k-amd
-				basic_os=ebmon
-				;;
-			es1800 | OSE68k | ose68k | ose | OSE)
-				basic_machine=m68k-ericsson
-				basic_os=ose
-				;;
-			gmicro)
-				basic_machine=tron-gmicro
-				basic_os=sysv
-				;;
-			go32)
-				basic_machine=i386-pc
-				basic_os=go32
-				;;
-			h8300hms)
-				basic_machine=h8300-hitachi
-				basic_os=hms
-				;;
-			h8300xray)
-				basic_machine=h8300-hitachi
-				basic_os=xray
-				;;
-			h8500hms)
-				basic_machine=h8500-hitachi
-				basic_os=hms
-				;;
-			harris)
-				basic_machine=m88k-harris
-				basic_os=sysv3
-				;;
-			hp300 | hp300hpux)
-				basic_machine=m68k-hp
-				basic_os=hpux
-				;;
-			hp300bsd)
-				basic_machine=m68k-hp
-				basic_os=bsd
-				;;
-			hppaosf)
-				basic_machine=hppa1.1-hp
-				basic_os=osf
-				;;
-			hppro)
-				basic_machine=hppa1.1-hp
-				basic_os=proelf
-				;;
-			i386mach)
-				basic_machine=i386-mach
-				basic_os=mach
-				;;
-			isi68 | isi)
-				basic_machine=m68k-isi
-				basic_os=sysv
-				;;
-			m68knommu)
-				basic_machine=m68k-unknown
-				basic_os=linux
-				;;
-			magnum | m3230)
-				basic_machine=mips-mips
-				basic_os=sysv
-				;;
-			merlin)
-				basic_machine=ns32k-utek
-				basic_os=sysv
-				;;
-			mingw64)
-				basic_machine=x86_64-pc
-				basic_os=mingw64
-				;;
-			mingw32)
-				basic_machine=i686-pc
-				basic_os=mingw32
-				;;
-			mingw32ce)
-				basic_machine=arm-unknown
-				basic_os=mingw32ce
-				;;
-			monitor)
-				basic_machine=m68k-rom68k
-				basic_os=coff
-				;;
-			morphos)
-				basic_machine=powerpc-unknown
-				basic_os=morphos
-				;;
-			moxiebox)
-				basic_machine=moxie-unknown
-				basic_os=moxiebox
-				;;
-			msdos)
-				basic_machine=i386-pc
-				basic_os=msdos
-				;;
-			msys)
-				basic_machine=i686-pc
-				basic_os=msys
-				;;
-			mvs)
-				basic_machine=i370-ibm
-				basic_os=mvs
-				;;
-			nacl)
-				basic_machine=le32-unknown
-				basic_os=nacl
-				;;
-			ncr3000)
-				basic_machine=i486-ncr
-				basic_os=sysv4
-				;;
-			netbsd386)
-				basic_machine=i386-pc
-				basic_os=netbsd
-				;;
-			netwinder)
-				basic_machine=armv4l-rebel
-				basic_os=linux
-				;;
-			news | news700 | news800 | news900)
-				basic_machine=m68k-sony
-				basic_os=newsos
-				;;
-			news1000)
-				basic_machine=m68030-sony
-				basic_os=newsos
-				;;
-			necv70)
-				basic_machine=v70-nec
-				basic_os=sysv
-				;;
-			nh3000)
-				basic_machine=m68k-harris
-				basic_os=cxux
-				;;
-			nh[45]000)
-				basic_machine=m88k-harris
-				basic_os=cxux
-				;;
-			nindy960)
-				basic_machine=i960-intel
-				basic_os=nindy
-				;;
-			mon960)
-				basic_machine=i960-intel
-				basic_os=mon960
-				;;
-			nonstopux)
-				basic_machine=mips-compaq
-				basic_os=nonstopux
-				;;
-			os400)
-				basic_machine=powerpc-ibm
-				basic_os=os400
-				;;
-			OSE68000 | ose68000)
-				basic_machine=m68000-ericsson
-				basic_os=ose
-				;;
-			os68k)
-				basic_machine=m68k-none
-				basic_os=os68k
-				;;
-			paragon)
-				basic_machine=i860-intel
-				basic_os=osf
-				;;
-			parisc)
-				basic_machine=hppa-unknown
-				basic_os=linux
-				;;
-			psp)
-				basic_machine=mipsallegrexel-sony
-				basic_os=psp
-				;;
-			pw32)
-				basic_machine=i586-unknown
-				basic_os=pw32
-				;;
-			rdos | rdos64)
-				basic_machine=x86_64-pc
-				basic_os=rdos
-				;;
-			rdos32)
-				basic_machine=i386-pc
-				basic_os=rdos
-				;;
-			rom68k)
-				basic_machine=m68k-rom68k
-				basic_os=coff
-				;;
-			sa29200)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			sei)
-				basic_machine=mips-sei
-				basic_os=seiux
-				;;
-			sequent)
-				basic_machine=i386-sequent
-				basic_os=
-				;;
-			sps7)
-				basic_machine=m68k-bull
-				basic_os=sysv2
-				;;
-			st2000)
-				basic_machine=m68k-tandem
-				basic_os=
-				;;
-			stratus)
-				basic_machine=i860-stratus
-				basic_os=sysv4
-				;;
-			sun2)
-				basic_machine=m68000-sun
-				basic_os=
-				;;
-			sun2os3)
-				basic_machine=m68000-sun
-				basic_os=sunos3
-				;;
-			sun2os4)
-				basic_machine=m68000-sun
-				basic_os=sunos4
-				;;
-			sun3)
-				basic_machine=m68k-sun
-				basic_os=
-				;;
-			sun3os3)
-				basic_machine=m68k-sun
-				basic_os=sunos3
-				;;
-			sun3os4)
-				basic_machine=m68k-sun
-				basic_os=sunos4
-				;;
-			sun4)
-				basic_machine=sparc-sun
-				basic_os=
-				;;
-			sun4os3)
-				basic_machine=sparc-sun
-				basic_os=sunos3
-				;;
-			sun4os4)
-				basic_machine=sparc-sun
-				basic_os=sunos4
-				;;
-			sun4sol2)
-				basic_machine=sparc-sun
-				basic_os=solaris2
-				;;
-			sun386 | sun386i | roadrunner)
-				basic_machine=i386-sun
-				basic_os=
-				;;
-			sv1)
-				basic_machine=sv1-cray
-				basic_os=unicos
-				;;
-			symmetry)
-				basic_machine=i386-sequent
-				basic_os=dynix
-				;;
-			t3e)
-				basic_machine=alphaev5-cray
-				basic_os=unicos
-				;;
-			t90)
-				basic_machine=t90-cray
-				basic_os=unicos
-				;;
-			toad1)
-				basic_machine=pdp10-xkl
-				basic_os=tops20
-				;;
-			tpf)
-				basic_machine=s390x-ibm
-				basic_os=tpf
-				;;
-			udi29k)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			ultra3)
-				basic_machine=a29k-nyu
-				basic_os=sym1
-				;;
-			v810 | necv810)
-				basic_machine=v810-nec
-				basic_os=none
-				;;
-			vaxv)
-				basic_machine=vax-dec
-				basic_os=sysv
-				;;
-			vms)
-				basic_machine=vax-dec
-				basic_os=vms
-				;;
-			vsta)
-				basic_machine=i386-pc
-				basic_os=vsta
-				;;
-			vxworks960)
-				basic_machine=i960-wrs
-				basic_os=vxworks
-				;;
-			vxworks68)
-				basic_machine=m68k-wrs
-				basic_os=vxworks
-				;;
-			vxworks29k)
-				basic_machine=a29k-wrs
-				basic_os=vxworks
-				;;
-			xbox)
-				basic_machine=i686-pc
-				basic_os=mingw32
-				;;
-			ymp)
-				basic_machine=ymp-cray
-				basic_os=unicos
-				;;
-			*)
-				basic_machine=$1
-				basic_os=
-				;;
-		esac
-		;;
-esac
-
-# Decode 1-component or ad-hoc basic machines
+# 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* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
+  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
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -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*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
-	# 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
-		;;
-	op50n)
-		cpu=hppa1.1
-		vendor=oki
-		;;
-	op60c)
-		cpu=hppa1.1
-		vendor=oki
-		;;
-	ibm*)
-		cpu=i370
-		vendor=ibm
-		;;
-	orion105)
-		cpu=clipper
-		vendor=highlevel
-		;;
-	mac | mpw | mac-mpw)
-		cpu=m68k
-		vendor=apple
-		;;
-	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.
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		cpu=m68000
-		vendor=att
-		;;
-	3b*)
-		cpu=we32k
-		vendor=att
-		;;
-	bluegene*)
-		cpu=powerpc
-		vendor=ibm
-		basic_os=cnk
-		;;
-	decsystem10* | dec10*)
-		cpu=pdp10
-		vendor=dec
-		basic_os=tops10
-		;;
-	decsystem20* | dec20*)
-		cpu=pdp10
-		vendor=dec
-		basic_os=tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		cpu=m68k
-		vendor=motorola
-		;;
-	dpx2*)
-		cpu=m68k
-		vendor=bull
-		basic_os=sysv3
-		;;
-	encore | umax | mmax)
-		cpu=ns32k
-		vendor=encore
-		;;
-	elxsi)
-		cpu=elxsi
-		vendor=elxsi
-		basic_os=${basic_os:-bsd}
-		;;
-	fx2800)
-		cpu=i860
-		vendor=alliant
-		;;
-	genix)
-		cpu=ns32k
-		vendor=ns
-		;;
-	h3050r* | hiux*)
-		cpu=hppa1.1
-		vendor=hitachi
-		basic_os=hiuxwe2
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		cpu=m68000
-		vendor=hp
-		;;
-	hp9k3[2-9][0-9])
-		cpu=m68k
-		vendor=hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-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
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		cpu=hppa1.1
-		vendor=hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		cpu=hppa1.0
-		vendor=hp
-		;;
-	i*86v32)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv32
-		;;
-	i*86v4*)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv4
-		;;
-	i*86v)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv
-		;;
-	i*86sol2)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=solaris2
-		;;
-	j90 | j90-cray)
-		cpu=j90
-		vendor=cray
-		basic_os=${basic_os:-unicos}
-		;;
-	iris | iris4d)
-		cpu=mips
-		vendor=sgi
-		case $basic_os in
-		    irix*)
-			;;
-		    *)
-			basic_os=irix4
-			;;
-		esac
-		;;
-	miniframe)
-		cpu=m68000
-		vendor=convergent
-		;;
-	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		cpu=m68k
-		vendor=atari
-		basic_os=mint
-		;;
-	news-3600 | risc-news)
-		cpu=mips
-		vendor=sony
-		basic_os=newsos
-		;;
-	next | m*-next)
-		cpu=m68k
-		vendor=next
-		case $basic_os in
-		    openstep*)
-		        ;;
-		    nextstep*)
-			;;
-		    ns2*)
-		      basic_os=nextstep2
-			;;
-		    *)
-		      basic_os=nextstep3
-			;;
-		esac
-		;;
-	np1)
-		cpu=np1
-		vendor=gould
-		;;
-	op50n-* | op60c-*)
-		cpu=hppa1.1
-		vendor=oki
-		basic_os=proelf
-		;;
-	pa-hitachi)
-		cpu=hppa1.1
-		vendor=hitachi
-		basic_os=hiuxwe2
-		;;
-	pbd)
-		cpu=sparc
-		vendor=tti
-		;;
-	pbb)
-		cpu=m68k
-		vendor=tti
-		;;
-	pc532)
-		cpu=ns32k
-		vendor=pc532
-		;;
-	pn)
-		cpu=pn
-		vendor=gould
-		;;
-	power)
-		cpu=power
-		vendor=ibm
-		;;
-	ps2)
-		cpu=i386
-		vendor=ibm
-		;;
-	rm[46]00)
-		cpu=mips
-		vendor=siemens
-		;;
-	rtpc | rtpc-*)
-		cpu=romp
-		vendor=ibm
-		;;
-	sde)
-		cpu=mipsisa32
-		vendor=sde
-		basic_os=${basic_os:-elf}
-		;;
-	simso-wrs)
-		cpu=sparclite
-		vendor=wrs
-		basic_os=vxworks
-		;;
-	tower | tower-32)
-		cpu=m68k
-		vendor=ncr
-		;;
-	vpp*|vx|vx-*)
-		cpu=f301
-		vendor=fujitsu
-		;;
-	w65)
-		cpu=w65
-		vendor=wdc
-		;;
-	w89k-*)
-		cpu=hppa1.1
-		vendor=winbond
-		basic_os=proelf
-		;;
-	none)
-		cpu=none
-		vendor=none
+	# 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 \
+	| ba \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia16 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| 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 \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]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 \
+	| visium \
+	| wasm32 \
+	| 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
 		;;
 	leon|leon[3-9])
-		cpu=sparc
-		vendor=$basic_machine
+		basic_machine=sparc-$basic_machine
 		;;
-	leon-*|leon[3-9]-*)
-		cpu=sparc
-		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
 		;;
 
-	*-*)
-		# shellcheck disable=SC2162
-		IFS="-" read cpu vendor <<EOF
-$basic_machine
-EOF
+	xscaleel)
+		basic_machine=armel-unknown
 		;;
+
 	# 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)
-		cpu=$basic_machine
-		vendor=pc
-		;;
-	# These rules are duplicated from below for sake of the special case above;
-	# i.e. things that normalized to x86 arches should also default to "pc"
-	pc98)
-		cpu=i386
-		vendor=pc
-		;;
-	x64 | amd64)
-		cpu=x86_64
-		vendor=pc
-		;;
-	# Recognize the basic CPU types without company name.
-	*)
-		cpu=$basic_machine
-		vendor=unknown
-		;;
-esac
-
-unset -v basic_machine
-
-# Decode basic machines in the full and proper CPU-Company form.
-case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	craynv-unknown)
-		vendor=cray
-		basic_os=${basic_os:-unicosmp}
-		;;
-	c90-unknown | c90-cray)
-		vendor=cray
-		basic_os=${Basic_os:-unicos}
-		;;
-	fx80-unknown)
-		vendor=alliant
-		;;
-	romp-unknown)
-		vendor=ibm
-		;;
-	mmix-unknown)
-		vendor=knuth
-		;;
-	microblaze-unknown | microblazeel-unknown)
-		vendor=xilinx
-		;;
-	rs6000-unknown)
-		vendor=ibm
-		;;
-	vax-unknown)
-		vendor=dec
-		;;
-	pdp11-unknown)
-		vendor=dec
-		;;
-	we32k-unknown)
-		vendor=att
-		;;
-	cydra-unknown)
-		vendor=cydrome
-		;;
-	i370-ibm*)
-		vendor=ibm
-		;;
-	orion-unknown)
-		vendor=highlevel
-		;;
-	xps-unknown | xps100-unknown)
-		cpu=xps100
-		vendor=honeywell
-		;;
-
-	# Here we normalize CPU types with a missing or matching vendor
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
-		basic_os=${basic_os:-bosx}
-		;;
-
-	# Here we normalize CPU types irrespective of the vendor
+	  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
+		;;
+	# 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-* \
+	| ba-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| e2k-* | elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| 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-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
+	| pyramid-* \
+	| riscv32-* | riscv64-* \
+	| 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-* \
+	| visium-* \
+	| wasm32-* \
+	| 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
+		;;
+	# 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-pc
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-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-*)
-		cpu=x86_64
+		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
+		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
 		;;
 	blackfin-*)
-		cpu=bfin
-		basic_os=linux
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
 		;;
 	c54x-*)
-		cpu=tic54x
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		cpu=tic55x
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		cpu=tic6x
+		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
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-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
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2*)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
 		;;
 	e500v[12]-*)
-		cpu=powerpc
-		basic_os=${basic_os}"spe"
-		;;
-	mips3*-*)
-		cpu=mips64
-		;;
-	ms1-*)
-		cpu=mt
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	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
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-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
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
 		;;
 	m68knommu-*)
-		cpu=m68k
-		basic_os=linux
-		;;
-	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-		cpu=s12z
-		;;
-	openrisc-*)
-		cpu=or32
-		;;
-	parisc-*)
-		cpu=hppa
-		basic_os=linux
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		cpu=i586
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
-		cpu=i686
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		cpu=i686
-		;;
-	pentium4-*)
-		cpu=i786
-		;;
-	pc98-*)
-		cpu=i386
-		;;
-	ppc-* | ppcbe-*)
-		cpu=powerpc
-		;;
-	ppcle-* | powerpclittle-*)
-		cpu=powerpcle
-		;;
-	ppc64-*)
-		cpu=powerpc64
-		;;
-	ppc64le-* | powerpc64little-*)
-		cpu=powerpc64le
-		;;
-	sb1-*)
-		cpu=mipsisa64sb1
-		;;
-	sb1el-*)
-		cpu=mipsisa64sb1el
-		;;
-	sh5e[lb]-*)
-		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
-		;;
-	spur-*)
-		cpu=spur
-		;;
-	strongarm-* | thumb-*)
-		cpu=arm
-		;;
-	tx39-*)
-		cpu=mipstx39
-		;;
-	tx39el-*)
-		cpu=mipstx39el
-		;;
-	x64-*)
-		cpu=x86_64
-		;;
-	xscale-* | xscalee[bl]-*)
-		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
-		;;
-	arm64-*)
-		cpu=aarch64
-		;;
-
-	# Recognize the canonical CPU Types that limit and/or modify the
-	# company names they are paired with.
-	cr16-*)
-		basic_os=${basic_os:-elf}
-		;;
-	crisv32-* | etraxfs*-*)
-		cpu=crisv32
-		vendor=axis
-		;;
-	cris-* | etrax*-*)
-		cpu=cris
-		vendor=axis
-		;;
-	crx-*)
-		basic_os=${basic_os:-elf}
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	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=i686-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
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+		;;
+	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-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
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next)
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      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)
-		cpu=neo
-		vendor=tandem
+		basic_machine=neo-tandem
 		;;
 	nse-tandem)
-		cpu=nse
-		vendor=tandem
+		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
-		cpu=nsr
-		vendor=tandem
+		basic_machine=nsr-tandem
 		;;
 	nsv-tandem)
-		cpu=nsv
-		vendor=tandem
+		basic_machine=nsv-tandem
 		;;
 	nsx-tandem)
-		cpu=nsx
-		vendor=tandem
-		;;
-	mipsallegrexel-sony)
-		cpu=mipsallegrexel
-		vendor=sony
-		;;
-	tile*-*)
-		basic_os=${basic_os:-linux-gnu}
-		;;
-
-	*)
-		# 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 | arc32 | arc64 \
-			| arm | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
-			| asmjs \
-			| ba \
-			| be32 | be64 \
-			| bfin | bpf | 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 \
-			| loongarch32 | loongarch64 | loongarchx32 \
-			| 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 \
-			| mipsisa32r3 | mipsisa32r3el \
-			| mipsisa32r5 | mipsisa32r5el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r3 | mipsisa64r3el \
-			| mipsisa64r5 | mipsisa64r5el \
-			| 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 | riscv32be | riscv64 | riscv64be \
-			| rl78 | romp | rs6000 | rx \
-			| s390 | s390x \
-			| 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 \
-			| thumbv7* \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-			| tron \
-			| ubicom32 \
-			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-			| vax \
-			| visium \
-			| w65 \
-			| wasm32 | wasm64 \
-			| 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
+		basic_machine=nsx-tandem
+		;;
+	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
+		;;
+	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
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	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/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle)
+		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)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	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
+		;;
+	rm[46]00)
+		basic_machine=mips-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
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	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
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	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
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	x64)
+		basic_machine=x86_64-pc
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# 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)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		exit 1
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $vendor in
-	digital*)
-		vendor=dec
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
-	commodore*)
-		vendor=cbm
+	*-commodore*)
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
 esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if test x$basic_os != x
+if [ x"$os" != x"" ]
 then
-
-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
-# set os.
-case $basic_os in
-	gnu/linux*)
-		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
-		;;
-	os2-emx)
-		kernel=os2
-		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
-		;;
-	nto-qnx*)
-		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
-		;;
-	*-*)
-		# shellcheck disable=SC2162
-		IFS="-" read kernel os <<EOF
-$basic_os
-EOF
-		;;
-	# Default OS when just kernel was specified
-	nto*)
-		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
-		;;
-	linux*)
-		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
-		;;
-	*)
-		kernel=
-		os=$basic_os
-		;;
-esac
-
-# Now, normalize the OS (knowing we just have one component, it's not a kernel,
-# etc.)
 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
-		;;
-	bluegene*)
-		os=cnk
-		;;
-	solaris1 | solaris1.*)
-		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
-		;;
-	solaris)
-		os=solaris2
-		;;
-	unixware*)
-		os=sysv4.2uw
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# 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/'`
-		;;
-	sco*v* | scout)
-		# Don't match below
-		;;
-	sco*)
-		os=sco3.2v2
-		;;
-	psos*)
-		os=psos
-		;;
-	qnx*)
-		os=qnx
-		;;
-	hiux*)
-		os=hiuxwe2
-		;;
-	lynx*178)
-		os=lynxos178
-		;;
-	lynx*5)
-		os=lynxos5
-		;;
-	lynxos*)
-		# don't get caught up in next wildcard
-		;;
-	lynx*)
-		os=lynxos
-		;;
-	mac[0-9]*)
+	-es1800*)
+		os=-ose
+		;;
+	# 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* | -cloudabi* | -sortix* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -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* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -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*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -xray | -os68k* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
 		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	opened*)
-		os=openedition
+	-linux-dietlibc)
+		os=-linux-dietlibc
 		;;
-	os400*)
-		os=os400
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	sunos5*)
+	-sunos5*)
 		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	sunos6*)
+	-sunos6*)
 		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	wince*)
-		os=wince
-		;;
-	utek*)
-		os=bsd
-		;;
-	dynix*)
-		os=bsd
-		;;
-	acis*)
-		os=aos
-		;;
-	atheos*)
-		os=atheos
-		;;
-	syllable*)
-		os=syllable
-		;;
-	386bsd)
-		os=bsd
-		;;
-	ctix* | uts*)
-		os=sysv
-		;;
-	nova*)
-		os=rtmk-nova
-		;;
-	ns2)
-		os=nextstep2
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2)
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
-	sinix5.*)
-		os=`echo "$os" | sed -e 's|sinix|sysv|'`
-		;;
-	sinix*)
-		os=sysv4
-		;;
-	tpf*)
-		os=tpf
-		;;
-	triton*)
-		os=sysv3
-		;;
-	oss*)
-		os=sysv3
-		;;
-	svr4*)
-		os=sysv4
-		;;
-	svr3)
-		os=sysv3
-		;;
-	sysvr4)
-		os=sysv4
-		;;
-	ose*)
-		os=ose
-		;;
-	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
-		os=mint
-		;;
-	dicos*)
-		os=dicos
-		;;
-	pikeos*)
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $cpu in
+		case $basic_machine in
 		    arm*)
-			os=eabi
+			os=-eabi
 			;;
 		    *)
-			os=elf
+			os=-elf
 			;;
 		esac
 		;;
+	-nacl*)
+		;;
+	-ios)
+		;;
+	-none)
+		;;
 	*)
-		# No normalization, but not necessarily accepted, that comes below.
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+		exit 1
 		;;
 esac
-
 else
 
 # Here we handle the default operating systems that come with various machines.
 # The value should be what the vendor currently ships out the door with their
 # machine or put another way, the most popular os provided with the machine.
@@ -1510,364 +1541,261 @@
 # "-sun"), then you have to tell the case statement up towards the top
 # that MANUFACTURER isn't an operating system.  Otherwise, code above
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-kernel=
-case $cpu-$vendor in
-	score-*)
-		os=elf
-		;;
-	spu-*)
-		os=elf
-		;;
-	*-acorn)
-		os=riscix1.2
-		;;
-	arm*-rebel)
-		kernel=linux
-		os=gnu
-		;;
-	arm*-semi)
-		os=aout
-		;;
-	c4x-* | tic4x-*)
-		os=coff
-		;;
-	c8051-*)
-		os=elf
-		;;
-	clipper-intergraph)
-		os=clix
-		;;
-	hexagon-*)
-		os=elf
-		;;
-	tic54x-*)
-		os=coff
-		;;
-	tic55x-*)
-		os=coff
-		;;
-	tic6x-*)
-		os=coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=tops20
-		;;
-	pdp11-*)
-		os=none
-		;;
-	*-dec | vax-*)
-		os=ultrix4.2
-		;;
-	m68*-apollo)
-		os=domain
-		;;
-	i386-sun)
-		os=sunos4.0.2
-		;;
-	m68000-sun)
-		os=sunos3
-		;;
-	m68*-cisco)
-		os=aout
-		;;
-	mep-*)
-		os=elf
-		;;
-	mips*-cisco)
-		os=elf
-		;;
-	mips*-*)
-		os=elf
-		;;
-	or32-*)
-		os=coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=sysv3
-		;;
-	sparc-* | *-sun)
-		os=sunos4.1.1
-		;;
-	pru-*)
-		os=elf
-		;;
-	*-be)
-		os=beos
-		;;
-	*-ibm)
-		os=aix
-		;;
-	*-knuth)
-		os=mmixware
-		;;
-	*-wec)
-		os=proelf
-		;;
-	*-winbond)
-		os=proelf
-		;;
-	*-oki)
-		os=proelf
-		;;
-	*-hp)
-		os=hpux
-		;;
-	*-hitachi)
-		os=hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=sysv
-		;;
-	*-cbm)
-		os=amigaos
-		;;
-	*-dg)
-		os=dgux
-		;;
-	*-dolphin)
-		os=sysv3
-		;;
-	m68k-ccur)
-		os=rtu
-		;;
-	m88k-omron*)
-		os=luna
-		;;
-	*-next)
-		os=nextstep
-		;;
-	*-sequent)
-		os=ptx
-		;;
-	*-crds)
-		os=unos
-		;;
-	*-ns)
-		os=genix
-		;;
-	i370-*)
-		os=mvs
-		;;
-	*-gould)
-		os=sysv
-		;;
-	*-highlevel)
-		os=bsd
-		;;
-	*-encore)
-		os=bsd
-		;;
-	*-sgi)
-		os=irix
-		;;
-	*-siemens)
-		os=sysv4
-		;;
-	*-masscomp)
-		os=rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=uxpv
-		;;
-	*-rom68k)
-		os=coff
-		;;
-	*-*bug)
-		os=coff
-		;;
-	*-apple)
-		os=macos
-		;;
-	*-atari*)
-		os=mint
-		;;
-	*-wrs)
-		os=vxworks
-		;;
-	*)
-		os=none
-		;;
-esac
-
-fi
-
-# Now, validate our (potentially fixed-up) OS.
-case $os in
-	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | uclibc*)
-		;;
-	# Likewise for "kernel-abi"
-	eabi* | gnueabi*)
-		;;
-	# VxWorks passes extra cpu info in the 4th filed.
-	simlinux | simwindows | spe)
-		;;
-	# Now accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* \
-	     | mpw* | magic* | mmixware* | mon960* | lnews* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
-	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | mint* \
-	     | 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* \
-	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
-		;;
-	# This one is extra strict with allowed versions
-	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	none)
-		;;
-	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# As a final step for OS-related things, validate the OS-kernel combination
-# (given a valid OS), if there is a kernel.
-case $kernel-$os in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
-		;;
-	uclinux-uclibc* )
-		;;
-	-dietlibc* | -newlib* | -musl* | -uclibc* )
-		# These are just libc implementations, not actual OSes, and thus
-		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
-		exit 1
-		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
-		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
-		;;
-	nto-qnx*)
-		;;
-	os2-emx)
-		;;
-	*-eabi* | *-gnueabi*)
-		;;
-	-*)
-		# Blank kernel with real OS is always fine.
-		;;
-	*-*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
-		exit 1
-		;;
-esac
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-case $vendor in
-	unknown)
-		case $cpu-$os in
-			*-riscix*)
-				vendor=acorn
-				;;
-			*-sunos*)
-				vendor=sun
-				;;
-			*-cnk* | *-aix*)
-				vendor=ibm
-				;;
-			*-beos*)
-				vendor=be
-				;;
-			*-hpux*)
-				vendor=hp
-				;;
-			*-mpeix*)
-				vendor=hp
-				;;
-			*-hiux*)
-				vendor=hitachi
-				;;
-			*-unos*)
-				vendor=crds
-				;;
-			*-dgux*)
-				vendor=dg
-				;;
-			*-luna*)
-				vendor=omron
-				;;
-			*-genix*)
-				vendor=ns
-				;;
-			*-clix*)
-				vendor=intergraph
-				;;
-			*-mvs* | *-opened*)
-				vendor=ibm
-				;;
-			*-os400*)
-				vendor=ibm
-				;;
-			s390-* | s390x-*)
-				vendor=ibm
-				;;
-			*-ptx*)
-				vendor=sequent
-				;;
-			*-tpf*)
-				vendor=ibm
-				;;
-			*-vxsim* | *-vxworks* | *-windiss*)
-				vendor=wrs
-				;;
-			*-aux*)
-				vendor=apple
-				;;
-			*-hms*)
-				vendor=hitachi
-				;;
-			*-mpw* | *-macos*)
-				vendor=apple
-				;;
-			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
-				vendor=atari
-				;;
-			*-vos*)
-				vendor=stratus
-				;;
-		esac
-		;;
-esac
-
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	pru-*)
+		os=-elf
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next)
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		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 $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo "$basic_machine$os"
 exit
 
 # Local variables:
 # eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:

Index: autosetup/autosetup-find-tclsh
==================================================================
--- autosetup/autosetup-find-tclsh
+++ autosetup/autosetup-find-tclsh
@@ -1,15 +1,17 @@
 #!/bin/sh
 # Looks for a suitable tclsh or jimsh in the PATH
-# If not found, builds a bootstrap jimsh in current dir from source
-# Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works)
-d="`dirname "$0"`"
-for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do
+# If not found, builds a bootstrap jimsh from source
+# Prefer $autosetup_tclsh if is set in the environment
+d=`dirname "$0"`
+{ "$d/jimsh0" "$d/autosetup-test-tclsh"; } 2>/dev/null && exit 0
+PATH="$PATH:$d"; export PATH
+for tclsh in $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6; do
 	{ $tclsh "$d/autosetup-test-tclsh"; } 2>/dev/null && exit 0
 done
 echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
 for cc in ${CC_FOR_BUILD:-cc} gcc; do
-	{ $cc -o jimsh0 "$d/jimsh0.c"; } 2>/dev/null || continue
-	./jimsh0 "$d/autosetup-test-tclsh" && exit 0
+	{ $cc -o "$d/jimsh0" "$d/jimsh0.c"; } 2>/dev/null || continue
+	"$d/jimsh0" "$d/autosetup-test-tclsh" && exit 0
 done
 echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc."
 echo false

Index: autosetup/cc-db.tcl
==================================================================
--- autosetup/cc-db.tcl
+++ autosetup/cc-db.tcl
@@ -6,10 +6,10 @@
 # The 'cc-db' module provides a knowledge-base of system idiosyncrasies.
 # In general, this module can always be included.
 
 use cc
 
-options {}
+module-options {}
 
 # openbsd needs sys/types.h to detect some system headers
 cc-include-needs sys/socket.h sys/types.h
 cc-include-needs netinet/in.h sys/types.h

Index: autosetup/cc-lib.tcl
==================================================================
--- autosetup/cc-lib.tcl
+++ autosetup/cc-lib.tcl
@@ -4,10 +4,12 @@
 # @synopsis:
 #
 # Provides a library of common tests on top of the 'cc' module.
 
 use cc
+
+module-options {}
 
 # @cc-check-lfs
 #
 # The equivalent of the 'AC_SYS_LARGEFILE' macro.
 #

Index: autosetup/cc-shared.tcl
==================================================================
--- autosetup/cc-shared.tcl
+++ autosetup/cc-shared.tcl
@@ -18,11 +18,11 @@
 ## SH_LINKRPATH      Format for setting the rpath when linking an executable, %s = path
 ## SH_LINKFLAGS      Flags to use linking an executable which will load shared objects
 ## LD_LIBRARY_PATH   Environment variable which specifies path to shared libraries
 ## STRIPLIBFLAGS     Arguments to strip a dynamic library
 
-options {}
+module-options {}
 
 # Defaults: gcc on unix
 define SHOBJ_CFLAGS -fPIC
 define SHOBJ_LDFLAGS -shared
 define SH_CFLAGS -fPIC

Index: autosetup/cc.tcl
==================================================================
--- autosetup/cc.tcl
+++ autosetup/cc.tcl
@@ -27,11 +27,11 @@
 ## CC_FOR_BUILD
 ## LD
 
 use system
 
-options {}
+module-options {}
 
 # Checks for the existence of the given function by linking
 #
 proc cctest_function {function} {
 	cctest -link 1 -declare "extern void $function\(void);" -code "$function\();"
@@ -678,15 +678,15 @@
 }
 
 define CPP [get-env CPP "[get-define CC] -E"]
 
 # XXX: Could avoid looking for a C++ compiler until requested
-# If CXX isn't found, it is set to the empty string.
+# Note that if CXX isn't found, we just set it to "false". It might not be needed.
 if {[env-is-set CXX]} {
 	define CXX [find-an-executable -required [get-env CXX ""]]
 } else {
-	define CXX [find-an-executable [get-define cross]c++ [get-define cross]g++]
+	define CXX [find-an-executable [get-define cross]c++ [get-define cross]g++ false]
 }
 
 # CXXFLAGS default to CFLAGS if not specified
 define CXXFLAGS [get-env CXXFLAGS [get-define CFLAGS]]
 

Index: autosetup/pkg-config.tcl
==================================================================
--- autosetup/pkg-config.tcl
+++ autosetup/pkg-config.tcl
@@ -13,11 +13,11 @@
 #
 # 'PKG_CONFIG' may be set to use an alternative to 'pkg-config'.
 
 use cc
 
-options {
+module-options {
 	sysroot:dir => "Override compiler sysroot for pkg-config search path"
 }
 
 # @pkg-config-init ?required?
 #
@@ -51,16 +51,15 @@
 
 		if {[opt-str sysroot o]} {
 			define SYSROOT [file-normalize $o]
 			msg-result "Using specified sysroot [get-define SYSROOT]"
 		} elseif {[get-define build] ne [get-define host]} {
-			if {[catch {exec-with-stderr {*}[get-define CC] -print-sysroot} result errinfo] == 0} {
+			if {[catch {exec-with-stderr [get-define CC] -print-sysroot} result errinfo] == 0} {
 				# Use the compiler sysroot, if there is one
 				define SYSROOT $result
 				msg-result "Found compiler sysroot $result"
 			} else {
-				configlog "[get-define CC] -print-sysroot: $result"
 				set msg "pkg-config: Cross compiling, but no compiler sysroot and no --sysroot supplied"
 				if {$required} {
 					user-error $msg
 				} else {
 					msg-result $msg
@@ -72,13 +71,10 @@
 			set sysroot [get-define SYSROOT]
 
 			# XXX: It's possible that these should be set only when invoking pkg-config
 			global env
 			set env(PKG_CONFIG_DIR) ""
-			# Supposedly setting PKG_CONFIG_LIBDIR means that PKG_CONFIG_PATH is ignored,
-			# but it doesn't seem to work that way in practice
-			set env(PKG_CONFIG_PATH) ""
 			# Do we need to try /usr/local as well or instead?
 			set env(PKG_CONFIG_LIBDIR) $sysroot/usr/lib/pkgconfig:$sysroot/usr/share/pkgconfig
 			set env(PKG_CONFIG_SYSROOT_DIR) $sysroot
 		}
 	}
@@ -110,34 +106,22 @@
 	if {!$ok} {
 		msg-result "no pkg-config"
 		return 0
 	}
 
-	set pkgconfig [get-define PKG_CONFIG]
-
-	set ret [catch {exec $pkgconfig --modversion "$module $args"} version]
-	configlog "$pkgconfig --modversion $module $args: $version"
-	if {$ret} {
+	if {[catch {exec [get-define PKG_CONFIG] --modversion "$module $args"} version]} {
 		msg-result "not found"
-		return 0
-	}
-	# Sometimes --modversion succeeds but because of dependencies it isn't usable
-	# This seems to show up with --cflags
-	set ret [catch {exec $pkgconfig --cflags $module} cflags]
-	if {$ret} {
-		msg-result "unusable ($version - see config.log)"
-		configlog "$pkgconfig --cflags $module"
-		configlog $cflags
+		configlog "pkg-config --modversion $module $args: $version"
 		return 0
 	}
 	msg-result $version
 	set prefix [feature-define-name $module PKG_]
 	define HAVE_${prefix}
 	define ${prefix}_VERSION $version
-	define ${prefix}_CFLAGS $cflags
-	define ${prefix}_LIBS [exec $pkgconfig --libs-only-l $module]
-	define ${prefix}_LDFLAGS [exec $pkgconfig --libs-only-L $module]
+	define ${prefix}_LIBS [exec pkg-config --libs-only-l $module]
+	define ${prefix}_LDFLAGS [exec pkg-config --libs-only-L $module]
+	define ${prefix}_CFLAGS [exec pkg-config --cflags $module]
 	return 1
 }
 
 # @pkg-config-get module setting
 #
@@ -147,22 +131,5 @@
 # the value of 'PKG_PANGO_CFLAGS', or '""' if not defined.
 proc pkg-config-get {module name} {
 	set prefix [feature-define-name $module PKG_]
 	get-define ${prefix}_${name} ""
 }
-
-# @pkg-config-get-var module variable
-#
-# Return the value of the given variable from the given pkg-config module.
-# The module must already have been successfully detected with pkg-config.
-# e.g.
-#
-## if {[pkg-config harfbuzz >= 2.5]} {
-##   define harfbuzz_libdir [pkg-config-get-var harfbuzz libdir]
-## }
-#
-# Returns the empty string if the variable isn't defined.
-proc pkg-config-get-var {module variable} {
-	set pkgconfig [get-define PKG_CONFIG]
-	set prefix [feature-define-name $module HAVE_PKG_]
-	exec $pkgconfig $module --variable $variable
-}

Index: autosetup/system.tcl
==================================================================
--- autosetup/system.tcl
+++ autosetup/system.tcl
@@ -25,11 +25,11 @@
 if {[is-defined defaultprefix]} {
 	user-notice "Note: defaultprefix is deprecated. Use options-defaults to set default options"
 	options-defaults [list prefix [get-define defaultprefix]]
 }
 
-options {
+module-options [subst -noc -nob {
 	host:host-alias =>		{a complete or partial cpu-vendor-opsys for the system where
 							the application will run (defaults to the same value as --build)}
 	build:build-alias =>	{a complete or partial cpu-vendor-opsys for the system
 							where the application will be built (defaults to the
 							result of running config.guess)}
@@ -50,11 +50,11 @@
 	localstatedir:
 	runstatedir:
 	maintainer-mode=0
 	dependency-tracking=0
 	silent-rules=0
-}
+}]
 
 # @check-feature name { script }
 #
 # defines feature '$name' to the return value of '$script',
 # which should be 1 if found or 0 if not found.

Index: autosetup/tmake.tcl
==================================================================
--- autosetup/tmake.tcl
+++ autosetup/tmake.tcl
@@ -9,11 +9,11 @@
 #
 ## CONFIGURED  - to indicate that the project is configured
 
 use system
 
-options {}
+module-options {}
 
 define CONFIGURED
 
 # @make-tmake-settings outfile patterns ...
 #

DELETED autosetup/wh-common.tcl
Index: autosetup/wh-common.tcl
==================================================================
--- autosetup/wh-common.tcl
+++ autosetup/wh-common.tcl
@@ -1,239 +0,0 @@
-########################################################################
-# Routines for Steve Bennett's autosetup which are common to trees
-# managed under the umbrella of wanderinghorse.net.
-#
-# In the interest of assisting to keep multiple copies of this file
-# up to date:
-#
-# 1) the "canonical" version is the one in libfossil:
-#
-#  https://fossil.wanderinghorse.net/r/libfossil/finfo?name=autosetup/wh-common.tcl
-#
-# 2) Please, dear maintainer, try to keep the following string updated:
-#
-# Last(?) update: 2021-09-01
-########################################################################
-
-########################################################################
-# A proxy for cc-check-function-in-lib which "undoes" any changes that
-# routine makes to the LIBS define. Returns the result of
-# cc-check-function-in-lib.
-proc wh-check-function-in-lib {function libs {otherlibs {}}} {
-    set _LIBS [get-define LIBS]
-    set found [cc-check-function-in-lib $function $libs $otherlibs]
-    define LIBS $_LIBS
-    return $found
-}
-
-########################################################################
-# Look for binary named $binName and `define`s $defName to that full
-# path, or an empty string if not found. Returns the value it defines.
-# This caches the result for a given $binName value, but if called multiple
-# times with a different defName, the 2nd and subsequent defName will not
-# get `define`d (patches to fix that are welcomed).
-proc wh-bin-define {binName defName} {
-    set check [get-define $defName 0]
-    msg-checking "Looking for $binName ... "
-    if {0 ne $check} {
-        msg-result "(cached) $check"
-        return $check
-    }
-    set check [find-executable-path $binName]
-    if {"" eq $check} {
-        msg-result "not found"
-    } else {
-        msg-result $check
-    }
-    define $defName $check
-    return $check
-}
-
-########################################################################
-# Looks for `bash` binary and dies if not found. On success, defines
-# BIN_BASH to the full path to bash and returns that value. We
-# _require_ bash because it's the SHELL value used in our makefiles.
-proc wh-require-bash {} {
-    set bash [wh-bin-define bash BIN_BASH]
-    if {"" eq $bash} {
-        user-error "Our Makefiles require the bash shell."
-    }
-    return $bash
-}
-
-########################################################################
-# Looks for `pkg-config` binary and returns a full path to it if
-# found, else an empty string. Also defines BIN_PKGCONFIG to the
-# (cached) result value.
-proc wh-bin-pkgconfig {} {
-    return [wh-bin-define pkg-config BIN_PKGCONFIG]
-}
-
-########################################################################
-# Looks for `install` binary and returns a full path to it if found,
-# else an empty string. Also defines BIN_INSTALL to the (cached)
-# result value.
-proc wh-bin-install {} {
-    return [wh-bin-define install BIN_INSTALL]
-}
-
-########################################################################
-# Curses!
-#
-# Jumps through numerous hoops to try to find ncurses libraries and
-# appropriate compilation/linker flags. Returns 0 on failure, 1 on
-# success, and defines (either way) LIB_CURSES to the various linker
-# flags and CFLAGS_CURSES to the various CFLAGS (both empty strings if
-# no lib is found).
-#
-# This impl prefers to use pkg-config to find ncurses and libpanel
-# because various platforms either combine, or not, the wide-char
-# versions of those libs into the same library (or not). If no
-# pkg-config is available, OR the platform looks like Mac, then we
-# simply make an educated guess and hope it works. On Mac pkg-config
-# is not sufficient because the core system and either brew or
-# macports can contain mismatched versions of ncurses and iconv, so on
-# that platform we simply guess from the core system level, ignoring
-# brew/macports options.
-proc wh-check-ncurses {} {
-    puts "Looking for \[n]curses..."
-    set pcBin [wh-bin-pkgconfig]
-    set LIB_CURSES ""
-    set CFLAGS_CURSES ""
-    set rc 0
-    if {"" ne $pcBin && $::tcl_platform(os)!="Darwin"} {
-        # Some macOS pkg-config configurations alter library search paths, which make
-        # the compiler unable to find lib iconv, so don't use pkg-config on macOS.
-        set np ""
-        foreach p {ncursesw ncurses} {
-            if {[catch {exec $pcBin --exists $p}]} {
-                continue
-            }
-            set np $p
-            puts "Using pkg-config curses package \[$p]"
-            break
-        }
-        if {"" ne $np} {
-            set ppanel ""
-            if {"ncursesw" eq $np} {
-                if {![catch {exec $pcBin --exists panelw}]} {
-                    set ppanel panelw
-                }
-            }
-            if {"" eq $ppanel && ![catch {exec $pcBin --exists panel}]} {
-                set ppanel panel
-            }
-            set CFLAGS_CURSES [exec $pcBin --cflags $np]
-            set LIB_CURSES [exec $pcBin --libs $np]
-            if {"" eq $ppanel} {
-                # Apparently Mac brew has pkg-config for ncursesw but not
-                # panel/panelw, but hard-coding -lpanel seems to work on
-                # that platform.
-                append LIB_CURSES " -lpanel"
-            } else {
-                append LIB_CURSES " " [exec $pcBin --libs $ppanel]
-                # append CFLAGS_CURSES " " [exec $pcBin --cflags $ppanel]
-                # ^^^^ appending the panel cflags will end up duplicating
-                # at least one -D flag from $np's cflags, leading to
-                # "already defined" errors at compile-time. Sigh. Note, however,
-                # that $ppanel's cflags have flags which $np's do not, so we
-                # may need to include those flags anyway and manually perform
-                # surgery on the list to remove dupes. Sigh.
-            }
-        }
-    }
-
-    if {"" eq $LIB_CURSES} {
-        puts "Guessing curses location (will fail for exotic locations)..."
-        define HAVE_CURSES_H [cc-check-includes curses.h]
-        if {[get-define HAVE_CURSES_H]} {
-            # Linux has -lncurses, BSD -lcurses. Both have <curses.h>
-            msg-result "Found curses.h"
-            if {[wh-check-function-in-lib waddnwstr ncursesw]} {
-                msg-result "Found -lncursesw"
-                set LIB_CURSES "-lncursesw -lpanelw"
-            } elseif {[wh-check-function-in-lib initscr ncurses]} {
-                msg-result "Found -lncurses"
-                set LIB_CURSES "-lncurses -lpanel"
-            } elseif {[wh-check-function-in-lib initscr curses]} {
-                msg-result "Found -lcurses"
-                set LIB_CURSES "-lcurses -lpanel"
-            }
-        }
-    }
-    if {"" ne $LIB_CURSES} {
-        set rc 1
-        puts {************************************************************
-If your build of fails due to missing ncurses functions
-such as waddwstr(), make sure you have the ncursesw (with a
-"w") development package installed. Some platforms combine
-the "w" and non-w curses builds and some don't. Similarly,
-it's easy to get a mismatch between libncursesw and libpanel,
-so make sure you have libpanelw (if appropriate for your
-platform).
-
-The package may have a name such as libncursesw5-dev or
-some such.
-************************************************************}
-    }
-    define LIB_CURSES $LIB_CURSES
-    define CFLAGS_CURSES $CFLAGS_CURSES
-    return $rc
-}
-# /wh-check-ncurses
-########################################################################
-
-########################################################################
-# Check for module-loading APIs (libdl/libltdl)...
-#
-# Looks for libltdl or dlopen(), the latter either in -ldl or built in
-# to libc (as it is on some platforms. Returns 1 if found, else
-# 0. Either way, it `define`'s:
-#
-#  - HAVE_LIBLTDL to 1 or 0 if libltdl is found/not found
-#  - HAVE_LIBDL to 1 or 0 if dlopen() is found/not found
-#  - LDFLAGS_MODULE_LOADER one of ("-lltdl", "-ldl", or ""), noting that
-#    the string may legally be empty on some platforms if HAVE_LIBDL is true.
-proc wh-check-module-loader {} {
-    msg-checking "Looking for module-loader APIs... "
-    if {99 ne [get-define LDFLAGS_MODULE_LOADER]} {
-        if {1 eq [get-define HAVE_LIBLTDL 0]} {
-            msg-result "(cached) libltdl"
-            return 1
-        } elseif {1 eq [get-define HAVE_LIBDL 0]} {
-            msg-result "(cached) libdl"
-            return 1
-        }
-        # else: wha???
-    }
-    set HAVE_LIBLTDL 0
-    set HAVE_LIBDL 0
-    set LDFLAGS_MODULE_LOADER ""
-    set rc 0
-    puts "" ;# cosmetic kludge for cc-check-XXX
-    if {[cc-check-includes ltdl.h] && [cc-check-function-in-lib lt_dlopen ltdl]} {
-        set HAVE_LIBLTDL 1
-        set LDFLAGS_MODULE_LOADER "-lltdl"
-        puts " - Got libltdl."
-        set rc 1
-    } elseif {[cc-with {-includes dlfcn.h} {
-        cctest -link 1 -declare "extern char* dlerror(void);" -code "dlerror();"}]} {
-        puts " - This system can use dlopen() w/o -ldl."
-        set HAVE_LIBDL 1
-        set LDFLAGS_MODULE_LOADER ""
-        set rc 1
-    } elseif {[cc-check-includes dlfcn.h]} {
-        set HAVE_LIBDL 1
-        set rc 1
-        if {[cc-check-function-in-lib dlopen dl]} {
-            puts " - dlopen() needs libdl."
-            set LDFLAGS_MODULE_LOADER "-ldl"
-        } else {
-            puts " - dlopen() not found in libdl. Assuming dlopen() is built-in."
-            set LDFLAGS_MODULE_LOADER ""
-        }
-    }
-    define HAVE_LIBLTDL $HAVE_LIBLTDL
-    define HAVE_LIBDL $HAVE_LIBDL
-    define LDFLAGS_MODULE_LOADER $LDFLAGS_MODULE_LOADER
-    return $rc
-}

Index: config.make.in
==================================================================
--- config.make.in
+++ config.make.in
@@ -25,13 +25,13 @@
 #ifeq (1,$(HAVE_LT_DLOPEN))
 #  ENABLE_MODULES := 1
 #endif
 
 # Install destination
-prefix := @prefix@
+prefix = @prefix@
 exec_prefix = @exec_prefix@
-DESTDIR ?=
+DESTDIR = $(prefix)
 
 CONFIG.MAKE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 #TOP_SRCDIR_ABS := $(dir $(realpath $(CONFIG.MAKE)))
 TOP_SRCDIR_REL := $(patsubst %/,%,$(dir $(CONFIG.MAKE)))
 TOP_SRCDIR_ABS := $(realpath $(TOP_SRCDIR_REL))
@@ -84,6 +84,6 @@
 
 
 CLEAN_FILES += *.o lib*.a *.so
 
 ShakeNMake.QUIET ?= @BUILD_QUIETLY@
-ShakeNMake.BIN.INSTALL := @BIN_INSTALL@
+

Index: fnc/Makefile.in
==================================================================
--- fnc/Makefile.in
+++ fnc/Makefile.in
@@ -27,9 +27,6 @@
 CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED
 
 fnc.BIN.OBJECTS += fnc.o
 fnc.BIN.LDFLAGS := $(FNC_LDFLAGS)
 $(eval $(call ShakeNMake.CALL.RULES.BIN,fnc))
-all: $(fnc.BIN)
-
-ShakeNMake.install.bins := $(fnc.BIN)
-ShakeNMake.install.man1 := fnc.1
+all: fnc.BIN

Index: fnc/fnc.1
==================================================================
--- fnc/fnc.1
+++ fnc/fnc.1
@@ -195,16 +195,10 @@
 Move selection cursor up the timeline.
 .It Cm Ctrl+f, Page-down
 Move selection cursor one page down the timeline.
 .It Cm Ctrl+b, Page-up
 Move selection cursor one page up the timeline.
-.It Cm G, End
-Move selection cursor to the last commit on the timeline (i.e., oldest commit
-in the repository).
-.It Cm gg, Home
-Move selection cursor to the first commit on the timeline (i.e., newest commit
-in the repository).
 .It Cm Enter, Space
 Open a
 .Cm diff
 view displaying the changeset of the currently selected commit.
 .It Cm /
@@ -278,14 +272,10 @@
 Scroll up one line of diff output.
 .It Cm Ctrl+f, Page-down
 Scroll down one page of diff output.
 .It Cm Ctrl+b, Page-up
 Scroll up one page of diff output.
-.It Cm G, End
-Scroll to the end of the view (i.e., last line of diff output).
-.It Cm gg, Home
-Scroll to the top of the view (i.e., first line of diff output).
 .It Cm \&-, \&_
 Decrease the number of context lines shown in diff output.
 .It Cm \&=, \&+
 Increase the number of context lines shown in diff output.
 .It Cm Ctrl+k, K, <, \&,

Index: fnc/fnc.c
==================================================================
--- fnc/fnc.c
+++ fnc/fnc.c
@@ -64,11 +64,11 @@
 #include <wchar.h>
 #include <langinfo.h>
 
 #include "libfossil.h"
 
-#define FNC_VERSION	0.2a
+#define FNC_VERSION	0.1a
 
 /* Utility macros. */
 #define MIN(a, b)	(((a) < (b)) ? (a) : (b))
 #define MAX(a, b)	(((a) > (b)) ? (a) : (b))
 #if !defined(CTRL)
@@ -81,12 +81,10 @@
 /* Application macros. */
 #define PRINT_VERSION	STRINGIFY(FNC_VERSION)
 #define DIFF_MAX_CTXT	64		/* Max diff context lines. */
 #define SPIN_INTERVAL	200		/* Status line progress indicator. */
 #define SPINNER		"\\|/-\0"
-#define NULL_DEVICE	"/dev/null"
-#define NULL_DEVICELEN (sizeof(NULL_DEVICE)-1)
 
 /* Portability macros. */
 #ifdef __OpenBSD__
 #define strtol(s, p, b)	strtonum(s, INT_MIN, INT_MAX, (const char **)p)
 #endif
@@ -130,11 +128,11 @@
 	union {
 		const char	 *zlimit;
 		int limit;
 	} nrecords;			/* Number of commits to load. */
 	union {
-		const char	 *sym;
+		const char	 *uuid;
 		fsl_id_t	  rid;
 	} start_commit;			/* Open timeline from this commit. */
 	const char	*filter_tag;	/* Only load commits with <tag>. */
 	const char	*filter_branch;	/* Only load commits from <branch>. */
 	const char	*filter_user;	/* Only load commits from <user>. */
@@ -208,21 +206,14 @@
 	{ /* cliflags_timeline timeline command related options. */
 	    FCLI_FLAG("T", "tag", "<tag>", &fnc_init.filter_tag,
             "Only display commits with T cards containing <tag>."),
 	    FCLI_FLAG("b", "branch", "<branch>", &fnc_init.filter_branch,
             "Only display commits that reside on the given <branch>."),
-	    FCLI_FLAG("c", "commit", "<sym>", &fnc_init.start_commit.sym,
-            "Open the timeline from commit <sym>. Common valid symbols are:\n"
-            "\tSHA{1,3} hash\n"
-            "\tSHA{1,3} unique prefix\n"
-            "\tbranch\n"
-            "\ttag:TAG\n"
-            "\troot:BRANCH\n"
-            "\tISO8601 date\n"
-            "\tISO8601 timestamp\n"
-            "\t{tip,current,prev,next}\n    "
-            "For a complete list of symbols see Fossil's Check-in Names:\n    "
+	    FCLI_FLAG("c", "commit", "<hash>", &fnc_init.start_commit.uuid,
+            "Open the timeline from commit <hash>, which is expected to be\n  "
+            "  (a unique prefix of) a valid SHA1 or SHA3 hash, or one of\n    "
+            "Fossil's special tags.\n    "
             "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"),
 	    FCLI_FLAG_BOOL("h", "help", NULL,
             "Display timeline command help and usage."),
 	    FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit,
             "Limit display to <n> latest commits; defaults to entire history "
@@ -280,10 +271,17 @@
 
 enum date_string {
 	ISO8601_DATE_ONLY = 10,
 	ISO8601_TIMESTAMP = 20
 };
+
+enum fnc_file_chng_stat {
+	FILE_ADDED,
+	FILE_DELETED,
+	FILE_CHANGED,
+	FILE_RENAMED
+};
 
 enum fnc_view_id {
 	FNC_VIEW_TIMELINE,
 	FNC_VIEW_DIFF,
 	FNC_VIEW_BLAME,
@@ -297,12 +295,11 @@
 
 enum fnc_search_state {
 	SEARCH_WAITING,
 	SEARCH_CONTINUE,
 	SEARCH_COMPLETE,
-	SEARCH_NO_MATCH,
-	SEARCH_FOR_END
+	SEARCH_NO_MATCH
 };
 
 enum diff_colours {
 	FNC_DIFF_META = 1,
 	FNC_DIFF_MINUS,
@@ -324,21 +321,20 @@
 	fsl_buffer	 pwiki;
 	fsl_list	 changeset;
 	fsl_uuid_str	 uuid;
 	fsl_uuid_str	 puuid;
 	fsl_id_t	 rid;
-	fsl_id_t	 prid;
 	char		*user;
 	char		*timestamp;
 	char		*comment;
 	char		*branch;
 	char		*type;
 };
 
 struct fsl_file_artifact {
 	fsl_card_F		*fc;
-	enum fsl_ckout_change_e	 change;
+	enum fnc_file_chng_stat	 change;
 };
 
 TAILQ_HEAD(commit_tailhead, commit_entry);
 struct commit_entry {
 	TAILQ_ENTRY(commit_entry)	 entries;
@@ -362,11 +358,10 @@
 	regex_t			 *regex;
 	enum fnc_search_state	 *search_status;
 	enum fnc_search_mvmnt	 *searching;
 	int			  spin_idx;
 	int			  ncommits_needed;
-	bool			  endjmp;
 	bool			  timeline_end;
 	sig_atomic_t		 *quit;
 	pthread_cond_t		  commit_consumer;
 	pthread_cond_t		  commit_producer;
 };
@@ -489,26 +484,21 @@
 static int		 wrapline(char *, fsl_size_t ncols_avail,
 			    struct fnc_diff_view_state *, off_t *);
 static int		 add_line_offset(off_t **, size_t *, off_t);
 static int		 diff_commit(fsl_buffer *, struct fnc_commit_artifact *,
 			    int, int, int);
-static int		 diff_checkout(fsl_buffer *, fsl_id_t, int, int, int);
-static int		 write_diff_meta(fsl_buffer *, const char *,
-			    fsl_uuid_str, const char *, fsl_uuid_str, int,
-			    enum fsl_ckout_change_e);
-static int		 diff_file(fsl_buffer *, fsl_buffer *, const char *,
-			    fsl_uuid_str, const char *, enum fsl_ckout_change_e,
-			    int, int, bool);
 static int		 diff_non_checkin(fsl_buffer *, struct
 			    fnc_commit_artifact *, int, int, int);
 static int		 diff_file_artifact(fsl_buffer *, fsl_id_t,
-			    const fsl_card_F *, fsl_id_t, const fsl_card_F *,
-			    fsl_ckout_change_e, int, int, int);
+			    fsl_card_F const *, fsl_id_t, fsl_card_F const *,
+			    int, int, int);
 static int		 fsl_ckout_file_content(fsl_cx *, char const *,
 			    fsl_buffer *);
+static int		 fsl_ckout_mtime(fsl_cx *, fsl_id_t, fsl_card_F const *,
+			    fsl_time_t *, fsl_time_t *);
 static int		 show_diff(struct fnc_view *);
-static int		 write_diff(struct fnc_view *, char *);
+static int		 write_diff(struct fnc_view *, const char *);
 static int		 match_line(const void *, const void *);
 static int		 write_matched_line(int *, const char *, int, int,
 			    WINDOW *, regmatch_t *);
 static void		 draw_vborder(struct fnc_view *);
 static int		 diff_input_handler(struct fnc_view **,
@@ -529,11 +519,10 @@
 static void		 fnc_commit_artifact_close(struct fnc_commit_artifact*);
 static int		 fsl_list_object_free(void *, void *);
 static void		 sigwinch_handler(int);
 static void		 sigpipe_handler(int);
 static void		 sigcont_handler(int);
-static char		*fnc_strsep (char **, const char *);
 
 int
 main(int argc, const char **argv)
 {
 	fcli_command	*cmd = NULL;
@@ -543,10 +532,12 @@
 
 	fnc_init.filter_types =
 	    (struct artifact_types *)fsl_malloc(sizeof(struct artifact_types));
 	fnc_init.filter_types->values = fsl_malloc(sizeof(char *));
 	fnc_init.filter_types->nitems = 0;
+	fcli_fax(fnc_init.filter_types->values);
+	fcli_fax(fnc_init.filter_types);
 
 	if (!setlocale(LC_CTYPE, ""))
 		fsl_fprintf(stderr, "[!] Warning: Can't set locale.\n");
 
 	fnc_init.cmdarg = argv[1];	/* Which cmd to show usage if needed. */
@@ -561,22 +552,22 @@
 		fnc_show_version();
 		goto end;
 	} else if (fnc_init.hflag)
 		usage();
 
-	rc = fcli_fingerprint_check(true);
-	if (rc)
-		goto end;
-
 	if (argc == 1)
 		cmd = &fnc_init.cmd_args[FNC_VIEW_TIMELINE];
 	else if (((rc = fcli_dispatch_commands(fnc_init.cmd_args, false)
 	    == FSL_RC_NOT_FOUND)) || (rc = fcli_has_unused_args(false))) {
 		fnc_init.err = rc;
 		usage();
 	} else if (rc)
 		goto end;
+
+	rc = fcli_fingerprint_check(true);
+	if (rc)
+		goto end;
 
 	f = fcli_cx();
 	if (!fsl_cx_db_repo(f)) {
 		rc = fsl_cx_err_set(f, FSL_RC_MISUSE, "repo database required");
 		goto end;
@@ -603,11 +594,11 @@
 static int
 cmd_timeline(fcli_command const *argv)
 {
 	struct fnc_view	*v;
 	fsl_cx		*f = fcli_cx();
-	fsl_id_t	 rid = -1;
+	fsl_id_t	 rid = 0;
 	int		 rc = 0;
 
 	rc = fcli_process_flags(argv->flags);
 	if (rc || (rc = fcli_has_unused_flags(false)))
 		return rc;
@@ -628,19 +619,18 @@
 		else if (ptr && *ptr != '\0')
 			return fsl_cx_err_set(f, FSL_RC_MISUSE,
 			    "invalid char in <n>: -n|--limit=%s [%s]", s, ptr);
 	}
 
-	if (fnc_init.start_commit.sym != NULL) {
-		rc = fsl_sym_to_rid(f, fnc_init.start_commit.sym,
-		    FSL_SATYPE_CHECKIN, &rid);
-		if (rc || rid < 0)
+	if (fnc_init.start_commit.uuid != NULL) {
+		rid = fsl_uuid_to_rid(f, fnc_init.start_commit.uuid);
+		if (rid > 0)
+			fnc_init.start_commit.rid = rid;
+		else
 			return fcli_err_set(FSL_RC_TYPE,
 			    "artifact [%s] not resolvable to a commit",
-			    fnc_init.start_commit.sym);
-		else
-			fnc_init.start_commit.rid = rid;
+			    fnc_init.start_commit.uuid);
 	}
 
 	rc = init_curses();
 	if (rc)
 		return fsl_cx_err_set(f, fsl_errno_to_rc(rc, FSL_RC_ERROR),
@@ -1221,11 +1211,11 @@
 
 		entry->idx = cx->commits->ncommits;
 		TAILQ_INSERT_TAIL(&cx->commits->head, entry, entries);
 		cx->commits->ncommits++;
 
-		if (!cx->endjmp && *cx->searching == SEARCH_FORWARD &&
+		if (*cx->searching == SEARCH_FORWARD &&
 		    *cx->search_status == SEARCH_WAITING) {
 			if (find_commit_match(commit, cx->regex))
 				*cx->search_status = SEARCH_CONTINUE;
 		}
 
@@ -1493,45 +1483,31 @@
 }
 
 static int
 multibyte_to_wchar(const char *src, wchar_t **dst, size_t *dstlen)
 {
-	int	rc = 0;
+	fsl_cx	*f = fcli_cx();
 
 	/*
 	 * mbstowcs POSIX extension specifies that the number of wchar that
 	 * would be written are returned when first arg is a null pointer:
 	 * https://en.cppreference.com/w/cpp/string/multibyte/mbstowcs
 	 */
 	*dstlen = mbstowcs(NULL, src, 0);
-	if (*dstlen < 0) {
-		if (errno == EILSEQ)
-			return fcli_err_set(FSL_RC_RANGE,
-			    "invalid multibyte character");
-		else
-			return fcli_err_set(FSL_RC_MISUSE, "mbstowcs");
-	}
-
+	if (*dstlen < 0)
+		return fsl_cx_err_set(f, FSL_RC_MISUSE,
+		    "invalid multibyte character");
 
 	*dst = NULL;
 	*dst = fsl_malloc(sizeof(wchar_t) * (*dstlen + 1));
-	if (*dst == NULL) {
-		rc = fcli_err_set(FSL_RC_OOM, "malloc");
-		goto end;
-	}
+	if (*dst == NULL)
+		return fsl_cx_err_set(f, FSL_RC_OOM, "malloc");
 
 	if (mbstowcs(*dst, src, *dstlen) != *dstlen)
-		rc = fcli_err_set(FSL_RC_SIZE_MISMATCH, "mbstowcs mismatch");
-
-end:
-	if (rc) {
-		fsl_free(*dst);
-		*dst = NULL;
-		*dstlen = 0;
-	}
-
-	return rc;
+		return fsl_cx_err_set(f, FSL_RC_RANGE, "mbstowcs mismatch");
+
+	return 0;
 }
 
 /*
  * When the terminal is >= 110 columns wide, the commit summary line in the
  * timeline view will take the form:
@@ -1782,15 +1758,10 @@
 			s->selected_idx = MIN(view->nlines - 2,
 			    s->commits.ncommits - 1);
 		select_commit(s);
 		break;
 	}
-	case KEY_END:
-	case 'G':
-		view->search_status = SEARCH_FOR_END;
-		view_search_start(view);
-		break;
 	case 'k':
 	case KEY_UP:
 	case '<':
 	case ',':
 		if (s->first_commit_onscreen == NULL)
@@ -1809,27 +1780,10 @@
 			s->selected_idx = 0;
 		else
 			timeline_scroll_up(s, view->nlines - 1);
 		select_commit(s);
 		break;
-	case 'g': {
-		bool home = true;
-		halfdelay(10);	/* Block for 1 second, then return ERR. */
-		if (wgetch(view->window) != 'g')
-			home = false;
-		cbreak();	/* Return to blocking mode on user input. */
-		if (!home)
-			break;
-		/* FALL THROUGH */
-	}
-	case KEY_HOME:
-		if (s->first_commit_onscreen == NULL)
-			break;
-		s->selected_idx = 0;
-		timeline_scroll_up(s, s->commits.ncommits);
-		select_commit(s);
-		break;
 	case KEY_RESIZE:
 		if (s->selected_idx > view->nlines - 2)
 			s->selected_idx = view->nlines - 2;
 		if (s->selected_idx > s->commits.ncommits - 1)
 			s->selected_idx = s->commits.ncommits - 1;
@@ -2021,21 +1975,10 @@
 	view->started_search = false;
 
 	if (view->nlines < 1)
 		return rc;
 
-	if (view->search_status == SEARCH_FOR_END) {
-		view->search_init(view);
-		view->started_search = true;
-		view->searching = SEARCH_FORWARD;
-		view->search_status = SEARCH_WAITING;
-		view->state.timeline.thread_cx.endjmp = true;
-		view->search_next(view);
-
-		return rc;
-	}
-
 	mvwaddstr(view->window, view->start_ln + view->nlines - 1, 0, "/");
 	wclrtoeol(view->window);
 
 	nocbreak();
 	echo();
@@ -2114,17 +2057,10 @@
 			entry = TAILQ_LAST(&s->commits.head, commit_tailhead);
 	}
 
 	while (1) {
 		if (entry == NULL) {
-			if (s->thread_cx.timeline_end && s->thread_cx.endjmp) {
-				s->matched_commit = TAILQ_LAST(&s->commits.head,
-				    commit_tailhead);
-				view->search_status = SEARCH_COMPLETE;
-				s->thread_cx.endjmp = false;
-				break;
-			}
 			if (s->thread_cx.timeline_end || view->searching ==
 			    SEARCH_REVERSE) {
 				view->search_status = (s->matched_commit ==
 				    NULL ?  SEARCH_NO_MATCH : SEARCH_COMPLETE);
 				s->search_commit = NULL;
@@ -2137,12 +2073,11 @@
 			 */
 			++s->thread_cx.ncommits_needed;
 			return signal_tl_thread(view, 0);
 		}
 
-		if (!s->thread_cx.endjmp && find_commit_match(entry->commit,
-		    &view->regex)) {
+		if (find_commit_match(entry->commit, &view->regex)) {
 			view->search_status = SEARCH_CONTINUE;
 			s->matched_commit = entry;
 			break;
 		}
 
@@ -2286,20 +2221,15 @@
 static void
 fnc_commit_artifact_close(struct fnc_commit_artifact *commit)
 {
 	struct fsl_list_state	st = { FNC_ARTIFACT_OBJ };
 
-	if (commit->branch)
-		fsl_free(commit->branch);
-	if (commit->comment)
-		fsl_free(commit->comment);
-	if (commit->timestamp)
-		fsl_free(commit->timestamp);
-	if (commit->type)
-		fsl_free(commit->type);
-	if (commit->user)
-		fsl_free(commit->user);
+	fsl_free(commit->branch);
+	fsl_free(commit->comment);
+	fsl_free(commit->timestamp);
+	fsl_free(commit->type);
+	fsl_free(commit->user);
 	fsl_free(commit->uuid);
 	fsl_free(commit->puuid);
 	fsl_list_clear(&commit->changeset, fsl_list_object_free, &st);
 	fsl_list_reserve(&commit->changeset, 0);
 	fsl_free(commit);
@@ -2453,11 +2383,11 @@
 static int
 create_diff(struct fnc_diff_view_state *s)
 {
 	fsl_cx	*f = fcli_cx();
 	FILE	*fout = NULL;
-	char	*line, *st0 = NULL, *st = NULL;
+	char	*line, *st = NULL;
 	off_t	 lnoff = 0;
 	int	 n, rc = 0;
 
 	free(s->line_offsets);
 	s->line_offsets = fsl_malloc(sizeof(off_t));
@@ -2476,14 +2406,10 @@
 		    "fclose");
 		goto end;
 	}
 	s->f = fout;
 
-	/*
-	 * We'll diff artifacts of type "ci" (i.e., "checkin") separately, as
-	 * it's a different process to diff the others (wiki, technote, etc.).
-	 */
 	if (!fsl_strcmp(s->selected_commit->type, "checkin")) {
 		rc = create_changeset(s->selected_commit);
 		if (rc) {
 			rc = fsl_cx_err_set(f, FSL_RC_DB, "create_changeset");
 			goto end;
@@ -2502,30 +2428,27 @@
 	 */
 	if (s->timeline_view)
 		write_commit_meta(s);
 
 	/*
-	 * Diff local changes on disk in the current checkout differently to
-	 * checked-in versions: the former compares on disk file content with
-	 * file artifacts; the latter compares file artifact blobs only.
+	 * We'll diff artifacts of type "ci" (i.e., "checkin") separately, as
+	 * it's a different process to diff the others (wiki, technote, etc.).
 	 */
-	if (s->selected_commit->rid == 0)
-		diff_checkout(&s->buf, s->selected_commit->prid, s->diff_flags,
-		    s->context, s->sbs);
-	else if (!fsl_strcmp(s->selected_commit->type, "checkin") &&
-	    s->selected_commit->puuid != NULL)
+	if (!fsl_strncmp(s->selected_commit->type, "checkin",
+	    fsl_strlen(s->selected_commit->type)) &&
+	    s->selected_commit->puuid != NULL) {
 		diff_commit(&s->buf, s->selected_commit, s->diff_flags,
 		    s->context, s->sbs);
+	}
 
 	/*
 	 * Parse the diff buffer line-by-line to record byte offsets of each
 	 * line for scrolling and searching in diff view.
 	 */
-	st0 = fsl_strdup(fsl_buffer_str(&s->buf));
-	st = st0;
+	st = fsl_strdup(fsl_buffer_str(&s->buf));
 	lnoff = (s->line_offsets)[s->nlines - 1];
-	while ((line = fnc_strsep(&st, "\n")) != NULL) {
+	while ((line = strsep(&st, "\n")) != NULL) {
 		n = fsl_fprintf(s->f, "%s\n", line);
 		lnoff += n;
 		rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff);
 		if (rc)
 			goto end;
@@ -2536,11 +2459,11 @@
 	rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff);
 	if (rc)
 		goto end;
 
 end:
-	free(st0);
+	free(st);
 	fsl_buffer_clear(&s->buf);
 	if (s->f && fflush(s->f) != 0 && rc == 0)
 		rc = fsl_cx_err_set(f, FSL_RC_IO, "fflush");
 	return rc;
 }
@@ -2548,11 +2471,11 @@
 static int
 create_changeset(struct fnc_commit_artifact *commit)
 {
 	fsl_cx		*f = fcli_cx();
 	fsl_stmt	*st = NULL;
-	fsl_db		*db = fsl_cx_db_repo(f);
+	fsl_db		*db = &f->dbMem;
 	fsl_list	 changeset = fsl_list_empty;
 	int		 rc = 0;
 
 	rc = fsl_db_prepare_cached(db, &st,
 	    "SELECT name, mperm, "
@@ -2568,35 +2491,34 @@
 		return fsl_cx_err_set(f, FSL_RC_DB, "fsl_db_prepare_cached");
 
 	while ((rc = fsl_stmt_step(st)) == FSL_RC_STEP_ROW) {
 		struct fsl_file_artifact *fdiff = NULL;
 		const char *path, *oldpath, *olduuid, *uuid;
-		/* TODO: Parse file mode to display in commit changeset. */
-		/* int perm; */
+		//int perm;
 
 		path = fsl_stmt_g_text(st, 0, NULL);	/* Current filename. */
-		//perm = fsl_stmt_g_int32(st, 1);	/* File permissions. */
+		//perm = fsl_stmt_g_int32(st, 1);		/* File permissions. */
 		olduuid = fsl_stmt_g_text(st, 2, NULL);	/* UUID before change */
 		uuid = fsl_stmt_g_text(st, 3, NULL);	/* UUID after change. */
 		oldpath = fsl_stmt_g_text(st, 4, NULL);	/* Old name, if chngd */
 
 		fdiff = fsl_malloc(sizeof(struct fsl_file_artifact));
 		fdiff->fc = fsl_malloc(sizeof(fsl_card_F));
 		fdiff->fc->name = fsl_strdup(path);
 		if (!uuid) {
 			fdiff->fc->uuid = fsl_strdup(olduuid);
-			fdiff->change = FSL_CKOUT_CHANGE_REMOVED;
+			fdiff->change = FILE_DELETED;
 		} else if (!olduuid) {
 			fdiff->fc->uuid = fsl_strdup(uuid);
-			fdiff->change = FSL_CKOUT_CHANGE_ADDED;
+			fdiff->change = FILE_ADDED;
 		} else if (oldpath) {
 			fdiff->fc->uuid = fsl_strdup(uuid);
 			fdiff->fc->priorName = fsl_strdup(oldpath);
-			fdiff->change = FSL_CKOUT_CHANGE_RENAMED;
+			fdiff->change = FILE_RENAMED;
 		} else {
 			fdiff->fc->uuid = fsl_strdup(uuid);
-			fdiff->change = FSL_CKOUT_CHANGE_MOD;
+			fdiff->change = FILE_CHANGED;
 		}
 		fsl_list_append(&changeset, fdiff);
 	}
 
 	commit->changeset = changeset;
@@ -2609,11 +2531,11 @@
 }
 
 static int
 write_commit_meta(struct fnc_diff_view_state *s)
 {
-	char		*line = NULL, *st0 = NULL, *st = NULL;
+	char		*line = NULL, *st = NULL;
 	fsl_size_t	 linelen, idx = 0;
 	off_t		 lnoff = 0;
 	int		 n, rc = 0;
 
 	if ((n = fsl_fprintf(s->f,"%s %s\n", s->selected_commit->type,
@@ -2646,17 +2568,12 @@
 	fputc('\n', s->f);
 	++lnoff;
 	if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff)))
 		goto end;
 
-	st0 = fsl_strdup(s->selected_commit->comment);
-	st = st0;
-	if (st == NULL) {
-		fcli_err_set(FSL_RC_OOM, "fsl_strdup");
-		goto end;
-	}
-	while ((line = fnc_strsep(&st, "\n")) != NULL) {
+	st = fsl_strdup(s->selected_commit->comment);
+	while ((line = strsep(&st, "\n")) != NULL) {
 		linelen = fsl_strlen(line);
 		if (linelen >= s->ncols) {
 			rc = wrapline(line, s->ncols, s, &lnoff);
 			if (rc)
 				goto end;
@@ -2682,26 +2599,23 @@
 		struct fsl_file_artifact	*file_change;
 
 		file_change = s->selected_commit->changeset.list[idx];
 
 		switch (file_change->change) {
-		case FSL_CKOUT_CHANGE_MOD:
-			changeline = "[~] ";
-			break;
-		case FSL_CKOUT_CHANGE_ADDED:
-			changeline = "[+] ";
-			break;
-		case FSL_CKOUT_CHANGE_RENAMED:
-			changeline = fsl_mprintf("[>] %s -> ",
-			   file_change->fc->priorName);
-			break;
-		case FSL_CKOUT_CHANGE_REMOVED:
-			changeline = "[-] ";
-			break;
-		default:
-			changeline = "[!] ";
-			break;
+			case FILE_CHANGED:
+				changeline = "[~] ";
+				break;
+			case FILE_ADDED:
+				changeline = "[+] ";
+				break;
+			case FILE_RENAMED:
+				changeline = fsl_mprintf("[>] %s -> ",
+				   file_change->fc->priorName);
+				break;
+			case FILE_DELETED:
+				changeline = "[-] ";
+				break;
 		}
 		if ((n = fsl_fprintf(s->f, "%s%s\n", changeline,
 		    file_change->fc->name)) < 0)
 			goto end;
 		lnoff += n;
@@ -2708,11 +2622,11 @@
 		if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff)))
 			goto end;
 	}
 
 end:
-	free(st0);
+	free(st);
 	free(line);
 	if (rc) {
 		free(*&s->line_offsets);
 		s->line_offsets = NULL;
 		s->nlines = 0;
@@ -2734,11 +2648,11 @@
 {
 	char		*word;
 	fsl_size_t	 wordlen, cursor = 0;
 	int		 n = 0, rc = 0;
 
-	while ((word = fnc_strsep(&line, " ")) != NULL) {
+	while ((word = strsep(&line, " ")) != NULL) {
 		wordlen = fsl_strlen(word);
 		if ((cursor + wordlen) >= ncols_avail) {
 			fputc('\n', s->f);
 			++(*lnoff);
 			rc = add_line_offset(&s->line_offsets, &s->nlines,
@@ -2782,14 +2696,15 @@
  * (to be loaded into deck d1) is the version we diff against. Step through the
  * deck of F(ile) cards from both versions to determine: (1) if we have new
  * files added (i.e., no F card counterpart in d1); (2) files deleted (i.e., no
  * F card counterpart in d2); (3) or otherwise the same file (i.e., F card
  * exists in both d1 and d2). In cases (1) and (2), we call diff_file_artifact()
- * to dump the complete content of the added/deleted file if FSL_DIFF_VERBOSE is
- * set, otherwise only diff metatadata will be output. In case (3), if the
- * hash (UUID) of each F card is the same, there are no changes; if different,
- * both artifacts will be passed to diff_file_artifact() to be diffed.
+ * to dump the complete content of the added/deleted file. In case (3), if the
+ * hash (UUID) of each F card is the same AND we're NOT diffing the checkout on
+ * disk, there are no changes; however, if we're diffing changes in the local
+ * checkout (i.e., commit->rid == 0) against another version, we also need to
+ * call diff_file_artifact().
  */
 static int
 diff_commit(fsl_buffer *buf, struct fnc_commit_artifact *commit, int diff_flags,
     int context, int sbs)
 {
@@ -2828,38 +2743,43 @@
 
 	fsl_deck_F_next(&d1, &fc1);
 	fsl_deck_F_next(&d2, &fc2);
 	while (fc1 || fc2) {
 		const fsl_card_F	*a = NULL, *b = NULL;
-		fsl_ckout_change_e	 change = FSL_CKOUT_CHANGE_NONE;
+		const char		*curr;
 
+		if (fc2)
+			curr = fc2->priorName ? fc2->priorName : fc2->name;
+		else if (fc1)
+			curr = fc1->priorName ? fc1->priorName : fc1->name;
 		if (!fc1)	/* File added. */
 			different = 1;
 		else if (!fc2)	/* File deleted. */
 			different = -1;
 		else		/* Same filename in both versions. */
-			different = fsl_strcmp(fc1->name, fc2->name);
+			different = fsl_strcmp(fc1->name, curr);
 
 		if (different) {
 			if (different > 0) {
 				b = fc2;
-				change = FSL_CKOUT_CHANGE_ADDED;
 				fsl_deck_F_next(&d2, &fc2);
 			} else if (different < 0) {
 				a = fc1;
-				change = FSL_CKOUT_CHANGE_REMOVED;
 				fsl_deck_F_next(&d1, &fc1);
 			}
 			rc = diff_file_artifact(buf, id1, a, commit->rid, b,
-			    change, diff_flags, context, sbs);
-		} else if (!fsl_uuidcmp(fc1->uuid, fc2->uuid)) { /* No change */
+			    diff_flags, context, sbs);
+		} else if (!fsl_uuidcmp(fc1->uuid, fc2->uuid)) {
+			if (!id1 || !commit->rid) {  /* Diff checkout. */
+				rc = diff_file_artifact(buf, id1, fc1,
+				    commit->rid, fc2, diff_flags, context, sbs);
+			}
 			fsl_deck_F_next(&d1, &fc1);
 			fsl_deck_F_next(&d2, &fc2);
-		} else {
-			change = FSL_CKOUT_CHANGE_MOD;
+		} else {  /* File changed. */
 			rc = diff_file_artifact(buf, id1, fc1, commit->rid, fc2,
-			    change, diff_flags, context, sbs);
+			    diff_flags, context, sbs);
 			fsl_deck_F_next(&d1, &fc1);
 			fsl_deck_F_next(&d2, &fc2);
 		}
 		if (rc == FSL_RC_RANGE || rc == FSL_RC_TYPE) {
 			fsl_buffer_append(buf,
@@ -2870,354 +2790,10 @@
 			goto end;
 	}
 end:
 	fsl_deck_finalize(&d1);
 	fsl_deck_finalize(&d2);
-	return rc;
-}
-
-/*
- * Diff local changes on disk in the current checkout against either a previous
- * commit or, if no version has been supplied, the current checkout.
- *   buf  output buffer in which diff content is appended
- *   vid  repository database record id of the version to diff against
- * diff_flags, context, and sbs are the same parameters as diff_file_artifact()
- * nb. This routine is only called with 'fnc diff [hash]'; that is, one or
- * zero args—not two—supplied to fnc's diff command line interface.
- */
-static int
-diff_checkout(fsl_buffer *buf, fsl_id_t vid, int diff_flags, int context,
-    int sbs)
-{
-	fsl_cx		*f = fcli_cx();
-	fsl_db		*db = fsl_cx_db_ckout(f);
-	fsl_stmt	*st = NULL;
-	fsl_buffer	 sql, abspath, bminus;
-	fsl_uuid_str	 xminus = NULL;
-	fsl_id_t	 cid;
-	int		 rc = 0;
-
-	abspath = bminus = sql = fsl_buffer_empty;
-	fsl_ckout_version_info(f, &cid, NULL);
-	/* cid = fsl_config_get_id(f, FSL_CONFDB_CKOUT, 0, "checkout"); */
-	/* XXX Already done in cmd_diff(): Load vfile table with local state. */
-	/* rc = fsl_vfile_changes_scan(f, cid, */
-	/*     FSL_VFILE_CKSIG_ENOTFILE & FSL_VFILE_CKSIG_KEEP_OTHERS); */
-	/* if (rc) */
-	/*	return fcli_err_set(rc, "fsl_vfile_changes_scan"); */
-
-	/*
-	 * If a previous version is supplied, load its vfile state to query
-	 * changes. Otherwise query the current checkout state for changes.
-	 */
-	if (vid != cid) {
-		/* Keep vfile ckout state; but unload vid when finished. */
-		rc = fsl_vfile_load(f, vid, false, NULL);
-		if (rc)
-			goto unload;
-		fsl_buffer_appendf(&sql, "SELECT v2.pathname, v2.deleted, "
-		    "v2.chnged, v2.rid == 0, v1.rid, v1.islink"
-		    " FROM vfile v1, vfile v2"
-		    " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d"
-		    " AND (v2.deleted OR v2.chnged OR v1.mrid != v2.rid)"
-		    " UNION "
-		    "SELECT pathname, 1, 0, 0, 0, islink"
-		    " FROM vfile v1"
-		    " WHERE v1.vid = %d"
-		    " AND NOT EXISTS(SELECT 1 FROM vfile v2"
-		    " WHERE v2.vid = %d AND v2.pathname = v1.pathname)"
-		    " UNION "
-		    "SELECT pathname, 0, 0, 1, 0, islink"
-		    " FROM vfile v2"
-		    " WHERE v2.vid = %d"
-		    " AND NOT EXISTS(SELECT 1 FROM vfile v1"
-		    " WHERE v1.vid = %d AND v1.pathname = v2.pathname)"
-		    " ORDER BY 1", vid, cid, vid, cid, cid, vid);
-	} else {
-		fsl_buffer_appendf(&sql, "SELECT pathname, deleted, chnged, "
-		    "rid == 0, rid, islink"
-		    " FROM vfile"
-		    " WHERE vid = %d"
-		    " AND (deleted OR chnged OR rid == 0)"
-		    " ORDER BY pathname", cid);
-	}
-	if ((rc = fsl_db_prepare_cached(db, &st, "%b", &sql)))
-		goto yield;
-
-	while ((rc = fsl_stmt_step(st)) == FSL_RC_STEP_ROW) {
-		const char	*path;
-		int		 deleted, changed, added, fid, symlink;
-		enum		 fsl_ckout_change_e change;
-
-		path = fsl_stmt_g_text(st, 0, NULL);
-		deleted = fsl_stmt_g_int32(st, 1);
-		changed = fsl_stmt_g_int32(st, 2);
-		added = fsl_stmt_g_int32(st, 3);
-		fid = fsl_stmt_g_int32(st, 4);
-		symlink = fsl_stmt_g_int32(st, 5);
-		rc = fsl_file_canonical_name2(f->ckout.dir, path, &abspath,
-		    false);
-		if (rc)
-			goto yield;
-
-		if (deleted)
-			change = FSL_CKOUT_CHANGE_REMOVED;
-		else if (fsl_file_access(fsl_buffer_cstr(&abspath), F_OK))
-			change = FSL_CKOUT_CHANGE_MISSING;
-		else if (added) {
-			fid = 0;
-			change = FSL_CKOUT_CHANGE_ADDED;
-		} else if (changed == 3) {
-			fid = 0;
-			change = FSL_CKOUT_CHANGE_MERGE_ADD;
-		} else if (changed == 5) {
-			fid = 0;
-			change = FSL_CKOUT_CHANGE_INTEGRATE_ADD;
-		} else
-			change = FSL_CKOUT_CHANGE_MOD;
-
-		/*
-		 * For changed files of which this checkout is already aware,
-		 * grab their hash to make comparisons. For removed files, if
-		 * diffing against a version other than the current checkout,
-		 * load the version's manifest to parse for known versions of
-		 * said files. If we don't, we risk diffing stale or bogus
-		 * content. Known cases include MISSING, DELETED, and RENAMED
-		 * files, which fossil(1) misses in some instances.
-		 */
-		if (fid > 0)
-			xminus = fsl_rid_to_uuid(f, fid);
-		else if (vid != cid && !added) {
-			fsl_deck		 d = fsl_deck_empty;
-			const fsl_card_F	*cf = NULL;
-
-			rc = fsl_deck_load_rid(f, &d, vid, FSL_SATYPE_CHECKIN);
-			if (!rc)
-				rc = fsl_deck_F_rewind(&d);
-			if (rc)
-				goto yield;
-			do {
-				fsl_deck_F_next(&d, &cf);
-				if (cf && !fsl_strcmp(cf->name, path)) {
-					xminus = fsl_strdup(cf->uuid);
-					if (xminus == NULL) {
-						fcli_err_set(FSL_RC_OOM,
-						    "fsl_strdup");
-						goto yield;
-					}
-					fid = fsl_uuid_to_rid(f, xminus);
-					break;
-				}
-			} while (cf);
-		}
-		if (!xminus)
-			xminus = fsl_strdup(NULL_DEVICE);
-
-		if (!symlink != !fsl_is_symlink(fsl_buffer_cstr(&abspath))) {
-			rc = write_diff_meta(buf, path, xminus, path,
-			    NULL_DEVICE, diff_flags, change);
-			fsl_buffer_append(buf, "\nSymbolic links and regular "
-			    "files cannot be diffed\n", -1);
-			if (rc)
-				goto yield;
-			continue;
-		}
-		if (fid > 0 && change != FSL_CKOUT_CHANGE_ADDED)
-			rc = fsl_content_get(f, fid, &bminus);
-		else
-			fsl_buffer_clear(&bminus);
-		if (!rc)
-			rc = diff_file(buf, &bminus, path, xminus,
-			    fsl_buffer_cstr(&abspath), change, diff_flags,
-			    context, sbs);
-		fsl_buffer_reuse(&bminus);
-		fsl_buffer_reuse(&abspath);
-		fsl_free(xminus);
-		xminus = NULL;
-		if (rc == FSL_RC_RANGE || rc == FSL_RC_TYPE) {
-			fsl_buffer_append(buf,
-			    "\nBinary files cannot be diffed\n", -1);
-			rc = 0;
-			fsl_cx_err_reset(f);
-		} else if (rc)
-			goto yield;
-	}
-
-yield:
-	fsl_stmt_cached_yield(st);
-	fsl_free(xminus);
-unload:
-	fsl_vfile_unload_except(f, cid);
-	fsl_buffer_clear(&abspath);
-	fsl_buffer_clear(&bminus);
-	fsl_buffer_clear(&sql);
-	return rc;
-}
-
-/*
- * Write diff index line and file metadata (i.e., file paths and hashes), which
- * signify file addition, removal, or modification.
- *   buf         output buffer in which diff output will be appended
- *   zminus      file name of the file being diffed against
- *   xminus      hex hash of file named zminus
- *   zplus       file name of the file being diffed
- *   xplus       hex hash of the file named zplus
- *   diff_flags  bitwise flags to control the diff
- *   change      enum denoting the versioning change of the file
- */
-static int
-write_diff_meta(fsl_buffer *buf, const char *zminus, fsl_uuid_str xminus,
-    const char *zplus, fsl_uuid_str xplus, int diff_flags,
-    enum fsl_ckout_change_e change)
-{
-	int	rc = 0;
-	const char	*index, *plus, *minus;
-
-	index = zplus ? zplus : (zminus ? zminus : NULL_DEVICE);
-
-	switch (change) {
-	case FSL_CKOUT_CHANGE_MERGE_ADD:
-		/* FALL THROUGH */
-	case FSL_CKOUT_CHANGE_INTEGRATE_ADD:
-		/* FALL THROUGH */
-	case FSL_CKOUT_CHANGE_ADDED:
-		minus = NULL_DEVICE;
-		plus = xplus;
-		zminus = NULL_DEVICE;
-		break;
-	case FSL_CKOUT_CHANGE_MISSING:
-		/* FALL THROUGH */
-	case FSL_CKOUT_CHANGE_REMOVED:
-		minus = xminus;
-		plus = NULL_DEVICE;
-		zplus = NULL_DEVICE;
-		break;
-	case FSL_CKOUT_CHANGE_RENAMED:
-		/* FALL THROUGH */
-	case FSL_CKOUT_CHANGE_MOD:
-		/* FALL THROUGH */
-	default:
-		minus = xminus;
-		plus = xplus;
-		break;
-	}
-
-	if ((diff_flags & (FSL_DIFF_SIDEBYSIDE | FSL_DIFF_BRIEF)) == 0) {
-		rc = fsl_buffer_appendf(buf, "\nIndex: %s\n%.71c\n", index, '=');
-		if (!rc)
-			rc = fsl_buffer_appendf(buf, "hash - %s\nhash + %s\n",
-			    minus, plus);
-	}
-	if (!rc && (diff_flags & FSL_DIFF_BRIEF) == 0)
-		rc = fsl_buffer_appendf(buf, "--- %s\n+++ %s\n", zminus, zplus);
-
-	return rc;
-}
-
-/*
- * The diff_file_artifact() counterpart that diffs actual files on disk rather
- * than file artifacts in the Fossil repository's blob table.
- *   buf      output buffer in which diff output will be appended
- *   bminus   blob containing content of the versioned file being diffed against
- *   zminus   filename of bminus
- *   xminus   hex UUID containing the SHA{1,3} hash of the file named zminus
- *   abspath  absolute path to the file on disk being diffed
- *   change   enum denoting the versioning change of the file
- * diff_flags, context, and sbs are the same parameters as diff_file_artifact()
- */
-static int
-diff_file(fsl_buffer *buf, fsl_buffer *bminus, const char *zminus,
-    fsl_uuid_str xminus, const char *abspath, enum fsl_ckout_change_e change,
-    int diff_flags, int context, bool sbs)
-{
-	fsl_cx		*f = fcli_cx();
-	fsl_buffer	 bplus = fsl_buffer_empty;
-	fsl_buffer	 xplus = fsl_buffer_empty;
-	const char	*zplus;
-	int		 rc = 0;
-	bool		 verbose;
-
-	/*
-	 * If it exists, read content of abspath to diff EXCEPT for the content
-	 * of 'fossil rm FILE' files because they will either: (1) have the same
-	 * content as the versioned file's blob in bminus or (2) have changes.
-	 * As a result, the upcoming call to fsl_diff_text_to_buffer() _will_
-	 * (1) produce an empty diff or (2) show the differences; neither are
-	 * expected behaviour because the SCM has been instructed to remove the
-	 * file; therefore, the diff should display the versioned file content
-	 * as being entirely removed. With this check, fnc now contrasts the
-	 * behaviour of fossil(1), which produces the abovementioned unexpected
-	 * output described in (1) and (2).
-	 */
-	if (fsl_file_size(abspath) < 0)
-		zplus = NULL_DEVICE;
-	else if (change != FSL_CKOUT_CHANGE_REMOVED) {
-		rc = fsl_ckout_file_content(f, abspath, &bplus);
-		if (rc)
-			goto end;
-		/*
-		 * To replicate fossil(1)'s behaviour—where a fossil rm'd file
-		 * will either show as an unchanged or edited rather than a
-		 * removed file with 'fossil diff -v' output—remove the above
-		 * 'if (change != FSL_CKOUT_CHANGE_REMOVED)' from the else
-		 * condition and uncomment the following three lines of code.
-		 */
-		/* if (change == FSL_CKOUT_CHANGE_REMOVED && */
-		/*     !fsl_buffer_compare(bminus, &bplus)) */
-		/*	fsl_buffer_clear(&bplus); */
-		zplus = zminus;
-	}
-
-	switch (fsl_strlen(xminus)) {
-	case FSL_STRLEN_K256:
-		rc = fsl_sha3sum_buffer(&bplus, &xplus);
-		break;
-	case FSL_STRLEN_SHA1:
-		rc = fsl_sha1sum_buffer(&bplus, &xplus);
-		break;
-	case NULL_DEVICELEN:
-		switch (fsl_config_get_int32(f, FSL_CONFDB_REPO,
-		    FSL_HPOLICY_AUTO, "hash-policy")) {
-		case FSL_HPOLICY_SHA1:
-			rc = fsl_sha1sum_buffer(&bplus, &xplus);
-			break;
-		case FSL_HPOLICY_AUTO:
-			/* FALL THROUGH */
-		case FSL_HPOLICY_SHA3:
-			/* FALL THROUGH */
-		case FSL_HPOLICY_SHA3_ONLY:
-			rc = fsl_sha3sum_buffer(&bplus, &xplus);
-			break;
-		}
-		break;
-	default:
-		fcli_err_set(FSL_RC_SIZE_MISMATCH,
-		    "invalid artifact uuid [%s], xminus");
-		goto end;
-	}
-	if (rc)
-		goto end;
-
-	rc = write_diff_meta(buf, zminus, xminus, zplus, fsl_buffer_str(&xplus),
-	    diff_flags, change);
-	if (rc)
-		goto end;
-
-	verbose = (diff_flags & FSL_DIFF_VERBOSE) != 0 ? true : false;
-	if (diff_flags & FSL_DIFF_BRIEF) {
-		rc = fsl_buffer_compare(bminus, &bplus);
-		if (!rc)
-			rc = fsl_buffer_appendf(buf, "CHANGED -> %s\n", zminus);
-	} else if (verbose || (bminus->used && bplus.used)) {
-		rc = fsl_diff_text_to_buffer(bminus, &bplus, buf, context,
-		    sbs, diff_flags);
-	}
-
-end:
-	fsl_buffer_clear(&bplus);
-	fsl_buffer_clear(&xplus);
-
 	return rc;
 }
 
 /*
  * Parse the deck of non-checkin commits to present a 'fossil ui' equivalent
@@ -3322,68 +2898,124 @@
 	fsl_buffer_clear(&pwiki);
 	fsl_deck_finalize(d);
 	return rc;
 }
 
-/*
- * Compute the differences between two repository file artifacts to produce the
- * set of changes necessary to convert one into the other.
- *   buf         output buffer in which diff output will be appended
- *   vid1        repo record id of the version from which artifact a belongs
- *   a           file artifact being diffed against
- *   vid2        repo record id of the version from which artifact b belongs
- *   b           file artifact being diffed
- *   change      enum denoting the versioning change of the file
- *   diff_flags  bitwise flags to control the diff
- *   context     the number of context lines to surround changes
- *   sbs	 number of columns in which to display each side-by-side diff
- */
 static int
-diff_file_artifact(fsl_buffer *buf, fsl_id_t vid1, const fsl_card_F *a,
-    fsl_id_t vid2, const fsl_card_F *b, enum fsl_ckout_change_e change,
-    int diff_flags, int context, int sbs)
-{
-	fsl_cx		*f = fcli_cx();
-	fsl_buffer	 fbuf1 = fsl_buffer_empty;
-	fsl_buffer	 fbuf2 = fsl_buffer_empty;
-	const char	*zplus = NULL, *zminus = NULL;
-	fsl_uuid_str	 xplus = NULL, xminus = NULL;
-	int		 rc = 0;
-	bool		 verbose;
+diff_file_artifact(fsl_buffer *buf, fsl_id_t vid1, fsl_card_F const *fc1,
+    fsl_id_t vid2, fsl_card_F const *fc2, int diff_flags, int context, int sbs)
+{
+	const fsl_card_F	*hashchk = NULL;
+	fsl_cx			*f = fcli_cx();
+	fsl_buffer		 fbuf1 = fsl_buffer_empty;
+	fsl_buffer		 fbuf2 = fsl_buffer_empty;
+	fsl_buffer		 fhash = fsl_buffer_empty;
+	fsl_time_t		 rmtime = 0;
+	fsl_time_t		 fmtime = 0;
+	int			 rc = 0;
+	bool			 verbose;
 
 	assert(vid1 != vid2);
-	assert(vid1 > 0 && vid2 > 0 &&
-	    "local checkout should be diffed with diff_checkout()");
-
-	fbuf2.used = fbuf1.used = 0;
-
-	if (a) {
-		rc = fsl_card_F_content(f, a, &fbuf1);
-		if (rc)
-			goto end;
-		zminus = a->name;
-		xminus = a->uuid;
-	}
-	if (b) {
-		rc = fsl_card_F_content(f, b, &fbuf2);
-		if (rc)
-			goto end;
-		zplus = b->name;
-		xplus = b->uuid;
-	}
-
-	rc = write_diff_meta(buf, zminus, xminus, zplus, xplus, diff_flags,
-	    change);
-	verbose = (diff_flags & FSL_DIFF_VERBOSE) != 0 ? true : false;
-	if (verbose || (a && b))
-		rc = fsl_diff_text_to_buffer(&fbuf1, &fbuf2, buf, context, sbs,
-		    diff_flags);
-	if (rc)
-		fcli_err_set(rc, "Error %s: fsl_diff_text_to_buffer\n"
-		    " -> %s [%s]\n -> %s [%s]", fsl_rc_cstr(rc),
-		    a ? a->name : NULL_DEVICE, a ? a->uuid : NULL_DEVICE,
-		    b ? b->name : NULL_DEVICE, b ? b->uuid : NULL_DEVICE);
+
+	fhash.used = fbuf2.used = fbuf1.used = 0;
+
+	/* If diffing against local checkout, hash file on disk to compare. */
+	if (vid1 == 0 && fc1) {
+		assert(vid2 != 0);
+		rc = fsl_ckout_file_content(f, fc1->name, &fbuf1);
+		if (!rc) {
+			switch (fsl_strlen(fc1->uuid)) {
+			case FSL_STRLEN_K256:
+				rc = fsl_sha3sum_buffer(&fbuf1, &fhash);
+				break;
+			case FSL_STRLEN_SHA1:
+				rc = fsl_sha1sum_buffer(&fbuf1, &fhash);
+				break;
+			default:
+				return fcli_err_set(FSL_RC_SIZE_MISMATCH,
+				    "invalid artifact uuid [%s], fc1->uuid");
+			}
+			if (!rc) {
+				hashchk = fc2;
+				rc = fsl_ckout_mtime(f, vid1, fc1, NULL,
+				    &fmtime);
+			}
+		}
+	} else if (fc1) {
+		rc = fsl_card_F_content(f, fc1, &fbuf1);
+		if (!rc && (vid2 == 0))
+			/* Collect repo-side mtime if the other version == 0. */
+			rc = fsl_ckout_mtime(f, vid1, fc1, &rmtime, NULL);
+	}
+
+	if (rc)
+		goto end;
+
+	/* If diffing the local checkout, hash the file on disk to compare. */
+	if (vid2 == 0 && fc2) {
+		assert(vid1 != 0);
+		rc = fsl_ckout_file_content(f, fc2->name, &fbuf2);
+		if (!rc) {
+			switch (fsl_strlen(fc2->uuid)) {
+			case FSL_STRLEN_K256:
+				rc = fsl_sha3sum_buffer(&fbuf2, &fhash);
+				break;
+			case FSL_STRLEN_SHA1:
+				rc = fsl_sha1sum_buffer(&fbuf2, &fhash);
+				break;
+			default:
+				return fcli_err_set(FSL_RC_SIZE_MISMATCH,
+				    "invalid artifact uuid [%s], fc2->uuid");
+			}
+			if (!rc) {
+				hashchk = fc1;
+				rc = fsl_ckout_mtime(f, vid2, fc2, NULL,
+				    &fmtime);
+			}
+		}
+	} else if (fc2) {
+		rc = fsl_card_F_content(f, fc2, &fbuf2);
+		if(!rc && (vid1 == 0)){
+			/* Collect repo-side mtime if the other version == 0. */
+			rc = fsl_ckout_mtime(f, vid2, fc2, &rmtime, NULL);
+		}
+	}
+
+	if (rc)
+		goto end;
+
+	if (hashchk && (fsl_uuidcmp(fsl_buffer_cstr(&fhash),
+	    hashchk->uuid) == 0)) {
+		/* Repo-side content is unchanged from local copy. */
+		assert(rc == 0);
+		goto end;
+	} else if ((fmtime > 0) && (fmtime == rmtime)) {
+		/*
+		 * One of the above is a local file and rmtime holds the
+		 * repo-side mtime of the other. Assume naively that same time
+		 * indicates the same content, which'll be the case more often
+		 * than not.
+		 */
+		goto end;
+	} else {
+		verbose = (diff_flags & FSL_DIFF_VERBOSE) != 0 ? true : false;
+		fsl_buffer_appendf(buf, "\nIndex: %s\n%.71c\n",
+		    fc2 ? fc2->name : fc1->name, '=');
+		fsl_buffer_appendf(buf, "hash - %s\nhash + %s\n",
+		    fc1 ? fc1->uuid : "/dev/null",
+		    fc2 ? fc2->uuid : "/dev/null");
+		fsl_buffer_appendf(buf, "--- %s\n+++ %s\n",
+		    fc1 ? fc1->name : "/dev/null",
+		    fc2 ? fc2->name : "/dev/null");
+		if (verbose || (fc1 && fc2))
+			rc = fsl_diff_text_to_buffer(&fbuf1, &fbuf2, buf,
+			    context, sbs, diff_flags);
+		if (rc)
+			fcli_err_set(rc, "Error %s: generating diff %s %s",
+			    fsl_rc_cstr(rc), fc1 ? fc1->name : "/dev/null",
+			    fc2 ? fc2->name : "/dev/null");
+	}
 end:
 	fsl_buffer_clear(&fbuf1);
 	fsl_buffer_clear(&fbuf2);
 	return rc;
 }
@@ -3415,10 +3047,43 @@
 	}
 	fsl_buffer_clear(&fname);
 
 	return rc;
 }
+
+static int
+fsl_ckout_mtime(fsl_cx *f, fsl_id_t vid, fsl_card_F const *fc,
+    fsl_time_t *repotime, fsl_time_t *localtime)
+{
+	fsl_fstat	fst = fsl_fstat_empty;
+	fsl_id_t	fid = 0;
+	int		rc = 0;
+
+	if (vid == 0)
+		fsl_ckout_version_info(f, &vid, NULL);
+
+	fid = fsl_repo_filename_fnid(f, fc->name);
+	if (fid <= 0) {
+		rc = fsl_cx_err_get(f, NULL, NULL);
+		return rc ? rc : fsl_cx_err_set(f, FSL_RC_NOT_FOUND,
+			"Could not resolve filename: %s", fc->name);
+	} else if (!fid)
+		return fsl_cx_err_set(f, FSL_RC_NOT_FOUND,
+		    "Could not resolve filename: %s", fc->name);
+
+	if (localtime) {
+		rc = fsl_cx_stat(f, 0, fc->name, &fst);
+		if (rc)
+			return fsl_cx_err_set(f, rc, "Could not stat file: %s",
+			    fc->name);
+		*localtime = fst.mtime;
+	}
+	if (repotime)
+		rc = fsl_mtime_of_manifest_file(f, vid, fid, repotime);
+
+	return rc;
+}
 
 static int
 show_diff(struct fnc_view *view)
 {
 	struct fnc_diff_view_state	*s = &view->state.diff;
@@ -3432,11 +3097,11 @@
 
 	return write_diff(view, headln);
 }
 
 static int
-write_diff(struct fnc_view *view, char *headln)
+write_diff(struct fnc_view *view, const char *headln)
 {
 	struct fnc_diff_view_state	*s = &view->state.diff;
 	fsl_cx				*f = fcli_cx();
 	regmatch_t			*regmatch = &view->regmatch;
 	struct fnc_colour		*c = NULL;
@@ -3454,35 +3119,38 @@
 	line_offset = s->line_offsets[s->first_line_onscreen - 1];
 	if (fseeko(s->f, line_offset, SEEK_SET))
 		return fsl_cx_err_set(f, fsl_errno_to_rc(errno, FSL_RC_ERROR),
 		    "fseeko");
 
-	werase(view->window);
+	/*
+	 * werase() fails to properly clear the parent screen when viewing
+	 * a diff and scrolling through commits with {J|,}. The headln of
+	 * <commit-type> <uuid> is redrawn on consecutive lines.
+	 */
+	/* werase(view->window); */
+	/* wclrtoeol(view->window); */	/* Overkill with wclear(). */
+	wclear(view->window);
 
 	if (headln) {
 		if ((line = fsl_mprintf("[%d/%d] %s", (s->first_line_onscreen -
 		    1 + s->current_line), nlines, headln)) == NULL)
 			return fsl_cx_err_set(f, fsl_errno_to_rc(errno,
 			    FSL_RC_ERROR), "mprintf");
 		rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0);
-		fsl_free(line);
-		fsl_free(headln);
 		if (rc)
-			return rc;
+			goto end;
 
 		if (screen_is_shared(view))
 			wstandout(view->window);
 		waddwstr(view->window, wcstr);
-		fsl_free(wcstr);
-		wcstr = NULL;
 		if (screen_is_shared(view))
 			wstandend(view->window);
 		if (wstrlen <= view->ncols - 1)
 			waddch(view->window, '\n');
 
 		if (max_lines <= 1)
-			return rc;
+			goto end;
 		--max_lines;
 	}
 
 	s->eof = false;
 	line = NULL;
@@ -3491,14 +3159,13 @@
 		if (linelen == -1) {
 			if (feof(s->f)) {
 				s->eof = true;
 				break;
 			}
-			fsl_free(line);
 			fsl_cx_err_set(f, fsl_errno_to_rc(ferror(s->f),
 			    FSL_RC_IO), "getline");
-			return rc;
+			goto end;
 		}
 
 		if (s->colour && (match = fsl_list_index_of(&s->colours, line,
 		    match_line)) != -1)
 			c = s->colours.list[match];
@@ -3506,33 +3173,26 @@
 			wattr_on(view->window, COLOR_PAIR(c->scheme), NULL);
 		if (s->first_line_onscreen + nprintln == s->matched_line &&
 		    regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
 			rc = write_matched_line(&wstrlen, line, view->ncols, 0,
 			    view->window, regmatch);
-			if (rc) {
-				fsl_free(line);
-				return rc;
-			}
+			if (rc)
+				goto end;
 		} else {
 			rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0);
-			if (rc) {
-				fsl_free(line);
-				return rc;
-			}
+			if (rc)
+				goto end;
 			waddwstr(view->window, wcstr);
-			fsl_free(wcstr);
-			wcstr = NULL;
 		}
 		if (c) {
 			wattr_off(view->window, COLOR_PAIR(c->scheme), NULL);
 			c = NULL;
 		}
 		if (wstrlen <= view->ncols - 1)
 			waddch(view->window, '\n');
 		++nprintln;
 	}
-	fsl_free(line);
 	if (nprintln >= 1)
 		s->last_line_onscreen = s->first_line_onscreen + (nprintln - 1);
 	else
 		s->last_line_onscreen = s->first_line_onscreen;
 
@@ -3546,11 +3206,13 @@
 
 		wstandout(view->window);
 		waddstr(view->window, "(END)");
 		wstandend(view->window);
 	}
-
+end:
+	free(wcstr);
+	free(line);
 	return rc;
 }
 
 static int
 match_line(const void *ln, const void *key)
@@ -3637,12 +3299,12 @@
 		*col_pos += wstrlen;
 	}
 
 	/* Write the rest of the line if not yet at EOL. */
 	if (ncols_avail > 0 && fsl_strlen(line) > (fsl_size_t)regmatch->rm_eo) {
-		rc = formatln(&wcstr, &wstrlen, line + regmatch->rm_eo,
-		    ncols_avail, start_column);
+		rc = formatln(&wcstr, &wstrlen,
+		line + regmatch->rm_eo, ncols_avail, start_column);
 		if (rc)
 			return rc;
 		waddwstr(window, wcstr);
 		free(wcstr);
 		*col_pos += wstrlen;
@@ -3709,17 +3371,10 @@
 				break;
 			}
 		}
 		free(line);
 		break;
-	case KEY_END:
-	case 'G':
-		if (s->eof)
-			break;
-		s->first_line_onscreen = (s->nlines - view->nlines) + 2;
-		s->eof = true;
-		break;
 	case KEY_UP:
 	case 'k':
 		if (s->first_line_onscreen > 1)
 			--s->first_line_onscreen;
 		break;
@@ -3729,23 +3384,10 @@
 			break;
 		i = 0;
 		while (i++ < view->nlines - 1 && s->first_line_onscreen > 1)
 			--s->first_line_onscreen;
 		break;
-	case 'g': {
-		bool home = true;
-		halfdelay(10);	/* Only block for 1 second, then return ERR. */
-		if (wgetch(view->window) != 'g')
-			home = false;
-		cbreak();	/* Return to blocking mode on user input. */
-		if (!home)
-			break;
-		/* FALL THROUGH */
-	}
-	case KEY_HOME:
-		s->first_line_onscreen = 1;
-		break;
 	case 'c':
 	case 'i':
 	case 'v':
 	case 'w':
 		if (ch == 'c')
@@ -4086,11 +3728,11 @@
 
 static void
 usage_timeline(void)
 {
 	fsl_fprintf(fnc_init.err ? stderr : stdout,
-	    " %s timeline [-T tag] [-b branch] [-c sym]"
+	    " %s timeline [-T tag] [-b branch] [-c hash]"
 	    " [-h|--help] [-n n] [-t type] [-u user] [-z|--utc]\n"
 	    "  e.g.: %s timeline --type ci -u jimmy\n\n",
 	    fcli_progname(), fcli_progname());
 }
 
@@ -4098,11 +3740,11 @@
 usage_diff(void)
 {
 	fsl_fprintf(fnc_init.err ? stderr : stdout,
 	    " %s diff [-c|--no-colour] [-h|--help] [-i|--invert]"
 	    " [-q|--quiet] [-w|--whitespace] [-x|--context n] "
-	    "[sym ...]\n  e.g.: %s diff --context 3 d34db33f c0ff33\n\n",
+	    "[hash ...]\n  e.g.: %s diff --context 3 d34db33f c0ff33\n\n",
 	    fcli_progname(), fcli_progname());
 }
 
 static void
 usage_blame(void)
@@ -4139,16 +3781,18 @@
 	} else if (fcli.argc < 2) {
 		artifact1 = "current";
 		rid = 0;
 		if (fcli_next_arg(false))
 			artifact1 = fcli_next_arg(true);
-		if ((rc = fsl_ckout_changes_scan(f)))
-			return fcli_err_set(rc, "fsl_ckout_changes_scan");
-		if (!fsl_strcmp(artifact1, "current") &&
-		    !fsl_ckout_has_changes(f)) {
-			fsl_fprintf(stdout, "No local changes.\n");
-			return rc;
+		if (!fsl_strcmp(artifact1, "current")) {
+			if ((rc = fsl_ckout_changes_scan(f)))
+				return fcli_err_set(rc,
+				    "fsl_ckout_changes_scan");
+			if (!fsl_ckout_has_changes(f)) {
+				fsl_fprintf(stdout, "No local changes.\n");
+				return rc;
+			}
 		}
 	} else { /* fcli_* APIs should prevent getting here but just in case. */
 		usage_diff();
 		return fcli_err_set(FSL_RC_MISUSE, "\ninvalid args");
 	}
@@ -4161,27 +3805,24 @@
 		rc = fsl_sym_to_rid(f, artifact2, FSL_SATYPE_ANY, &rid);
 	if (rc || rid < 0)
 		return fcli_err_set(rc, "invalid artifact [%s]", artifact2);
 
 	commit = calloc(1, sizeof(*commit));
-	if (commit == NULL)
-		return fcli_err_set(FSL_RC_OOM, "calloc fail");
 	if (rid == 0)
-		fsl_ckout_version_info(f, NULL, (fsl_uuid_cstr *)commit->uuid);
+		fsl_ckout_version_info(f, NULL, (const char **)commit->uuid);
 	else
 		commit->uuid = fsl_rid_to_uuid(f, rid);
 	commit->puuid = fsl_rid_to_uuid(f, prid);
-	commit->prid = prid;
 	commit->rid = rid;
 
 	/*
 	 * If either of the supplied versions are not checkin artifacts,
 	 * let the user know which operands aren't valid.
 	 */
 	if ((fsl_rid_is_a_checkin(f, rid) || rid == 0) &&
 	    fsl_rid_is_a_checkin(f, prid))
-		commit->type = fsl_strdup("checkin");
+		commit->type = "checkin";
 	else
 		return fcli_err_set(FSL_RC_TYPE,
 		    "artifact(s) [%s] not resolvable to a checkin",
 		    (!fsl_rid_is_a_checkin(f, rid) && rid != 0) &&
 		    !fsl_rid_is_a_checkin(f, prid) ?
@@ -4211,14 +3852,14 @@
 	if (view == NULL)
 		return fcli_err_set(FSL_RC_OOM, "view_open fail");
 
 	rc = open_diff_view(view, commit, context, fnc_init.ws,
 	    fnc_init.invert, !fnc_init.quiet, NULL);
-	if (!rc)
-		rc = view_loop(view);
+	if (rc)
+		return fcli_err_set(rc, "open_diff_view fail");
+	rc = view_loop(view);
 
-	fnc_commit_artifact_close(commit);
 	return rc;
 }
 
 static int
 cmd_blame(fcli_command const *argv)
@@ -4232,22 +3873,5 @@
 fnc_show_version(void)
 {
 	printf("%s %s\n", fcli_progname(), PRINT_VERSION);
 }
 
-static char *
-fnc_strsep(char **ptr, const char *sep)
-{
-	char	*s, *token;
-
-	if ((s = *ptr) == NULL)
-		return NULL;
-
-	if (*(token = s + strcspn(s, sep)) != '\0') {
-		*token++ = '\0';
-		*ptr = token;
-	} else
-		*ptr = NULL;
-
-	return s;
-}
-

Index: shakenmake.make
==================================================================
--- shakenmake.make
+++ shakenmake.make
@@ -42,13 +42,13 @@
 # ShakeNMake.CALL.FIND_FILE call()able function:
 # $1 = app name
 # $2 = optional path ($(PATH) is always included)
 ShakeNMake.CALL.FIND_FILE = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(2) $(PATH)))))
 ########################################################################
-ShakeNMake.BIN.AR ?= $(call ShakeNMake.CALL.FIND_FILE,$(AR))
-ShakeNMake.BIN.GCC ?= $(call ShakeNMake.CALL.FIND_FILE,gcc)
-ShakeNMake.BIN.INSTALL ?= $(call ShakeNMake.CALL.FIND_FILE,install)
+ShakeNMake.BINS.AR := $(call ShakeNMake.CALL.FIND_FILE,$(AR))
+ShakeNMake.BINS.GCC := $(call ShakeNMake.CALL.FIND_FILE,gcc)
+
 
 ifneq (,$(COMSPEC))
 $(warning Setting ShakeNMake.SMELLS.LIKE.WINDOWS to 1)
 ShakeNMake.SMELLS.LIKE.WINDOWS := 1
 ShakeNMake.EXTENSIONS.DLL = .dll
@@ -110,11 +110,11 @@
 $(1).LIB = $(1).a
 $(1).LIB: $$($(1).LIB)
 CLEAN_FILES += $$($(1).LIB)
 $$($(1).LIB): $$($(1).LIB.OBJECTS)
 	@$(call ShakeNMake.CALL.SETX,"AR [$$@]"); \
-		$$(ShakeNMake.BIN.AR) crs $$@ $$($(1).LIB.OBJECTS)
+		$$(ShakeNMake.BINS.AR) crs $$@ $$($(1).LIB.OBJECTS)
 endef
 define ShakeNMake.CALL.RULES.LIBS
 $(foreach liba,$(1),$(eval $(call ShakeNMake.EVAL.RULES.LIB,$(liba))))
 endef
 # end ShakeNMake.EVAL.RULES.LIB
@@ -190,74 +190,33 @@
 # end ShakeNMake.CALL.RULES.BIN and friends
 ########################################################################
 
 ########################################################################
 # Sets up rules for subdir $1.
-########################################################################
-# Newer (2021-09-01) subdir rules, ported over from toc...
-#
-# $(call ShakeNMake.CALL.MAKE-SUBDIRS,dirs_list[,target_name=all])
-# Walks each dir in $(1), calling $(MAKE) $(2) for each one.
-#
-#   $1 = list of dirs
-#   $2 = make target
-#
-# Note that this approach makes parallel builds between the dirs in
-# $(1) impossible, so it should only be used for targets where
-# parallelizing stuff may screw things up or is otherwise not desired
-# or not significant.
-ShakeNMake.CALL.MAKE-SUBDIRS = \
-	test "x$(1)" = "x" -o "x." = "x$(1)" && exit 0; \
-	tgt="$(if $(2),$(2),all)"; \
-	make_nop_arg=''; \
-	test 1 = 1 -o x1 = "x$(ShakeNMake.QUIET)" && make_nop_arg="--no-print-directory"; \
-	for b in $(1) "x"; do test ".x" = ".$$$$b" && break; \
-		pwd=$$$$(pwd); \
-		deep=0; while test $$$$deep -lt $(MAKELEVEL); do echo -n "  "; deep=$$$$((deep+1)); done; \
-		echo "Making '$$$$tgt' in $$$${PWD}/$$$${b}"; \
-		$(MAKE) -C $$$${b} $$$${make_nop_arg} $$$${tgt} || exit; \
-		cd $$$$pwd || exit; \
-	done
-.PHONY: subdirs $(ShakeNMake.subdirs) $(patsubst %,subdir-%,$(ShakeNMake.subdirs))
-$(ShakeNMake.subdirs):
-	@+$(call ShakeNMake.MAKE-SUBDIRS,$@,all)
-subdirs: $(ShakeNMake.subdirs)
-subdir-%:# run all in subdir $*
-	@+$(call ShakeNMake.MAKE-SUBDIRS,$*,all)
-subdirs-%:# run target % in $(ShakeNMake.subdirs)
-	@+$(call ShakeNMake.MAKE-SUBDIRS,$(ShakeNMake.subdirs),$*)
-#########################################################################
 .PHONY: subdir-.
 subdir-.:
 define ShakeNMake.CALL.SUBDIR
 .PHONY: $(1)
 subdir-$(1):
-	@+$(call ShakeNMake.CALL.MAKE-SUBDIRS,$(1),all)
+	+$(MAKE) -C $(1)
 clean: clean-$(1)
 clean-.: clean-$(1)
 distclean-.: distclean-$(1)
-subdir-install-$(1):
-	@+$(call ShakeNMake.CALL.MAKE-SUBDIRS,$(1),install)
-install: subdir-install-$(1)
-subdir-uninstall-$(1):
-	@+$(call ShakeNMake.CALL.MAKE-SUBDIRS,$(1),uninstall)
-uninstall: subdir-uninstall-$(1)
-ShakeNMake.subdirs += $(1)
 endef
 define ShakeNMake.CALL.SUBDIRS
 $(foreach dir,$(1),$(eval $(call ShakeNMake.CALL.SUBDIR,$(dir))))
 endef
-# end ShakeNMake.CALL.SUBDIR and friends
+# end ShakeNMake.CALL.RULES.DLLS and friends
 ########################################################################
 
 
 ########################################################################
 # Automatic dependencies generation for C/C++ code...
 # To disable deps generation, set ShakeNMake.USE_MKDEPS=0 *before*
 # including this file.
 ShakeNMake.USE_MKDEPS := 1
-ifeq (,$(ShakeNMake.BIN.GCC))
+ifeq (,$(ShakeNMake.BINS.GCC))
 ShakeNMake.USE_MKDEPS ?= 0
 else
 ShakeNMake.USE_MKDEPS ?= 1
 endif
 #$(warning ShakeNMake.USE_MKDEPS=$(ShakeNMake.USE_MKDEPS));
@@ -265,17 +224,17 @@
 ShakeNMake.CISH_SOURCES ?= $(wildcard *.cpp *.c *.c++ *.h *.hpp *.h++ *.hh)
 #$(warning ShakeNMake.CISH_SOURCES=$(ShakeNMake.CISH_SOURCES))
 
 ifneq (,$(ShakeNMake.CISH_SOURCES))
 ShakeNMake.CISH_DEPS_FILE := .make.c_deps
-ShakeNMake.BIN.MKDEP = gcc -w -E -MM $(CPPFLAGS)
+ShakeNMake.BINS.MKDEP = gcc -w -E -MM $(CPPFLAGS)
 #$(ShakeNMake.CISH_SOURCES): $(filter-out $(ShakeNMake.CISH_DEPS_FILE),$(MAKEFILE_LIST))
 CLEAN_FILES += $(ShakeNMake.CISH_DEPS_FILE)
 $(ShakeNMake.CISH_DEPS_FILE): $(PACKAGE.MAKEFILE) $(ShakeNMake.MAKEFILE) $(ShakeNMake.CISH_SOURCES)
 	@touch $@; test x = "x$(ShakeNMake.CISH_SOURCES)" && exit 0; \
 	echo "Generating dependencies..."; \
-	$(ShakeNMake.BIN.MKDEP) $(ShakeNMake.CISH_SOURCES) 2>/dev/null > $@ || exit
+	$(ShakeNMake.BINS.MKDEP) $(ShakeNMake.CISH_SOURCES) 2>/dev/null > $@ || exit
 
 #	perl -i -pe 's|^(.+)\.o:\s*((\w+/)*)|$(OBJ.DIR)/$$1.o: $(filter-out $(ShakeNMake.CISH_DEPS_FILE),$(MAKEFILE_LIST))\n$(OBJ.DIR)/$$1.o: $$2|' $@
 # That perl bit is a big, ugly, tree-specific hack for libfossil!
 # gcc -E -MM strips directory parts (why, i cannot imagine), so we've got to
 # hack the output.
@@ -290,18 +249,18 @@
 #	if [[ x = "x$(TOP_DIR)" ]]; then echo "REMOVE THIS TREE-SPECIFIC HACK!"; exit 1; fi;\
 #ifeq (,$(TOP_DIR))
 #$(error Tree-specific hack in place here. See the comments and remove these lines or set TOP_DIR)
 #endif
 # normally we also want:
-#  || $(ShakeNMake.BIN.RM) -f $@ 2>/dev/null
+#  || $(ShakeNMake.BINS.RM) -f $@ 2>/dev/null
 # because we don't want a bad generated makefile to kill the build, but gcc -E
 # is returning 1 when some generated files do not yet exist.
 deps: $(ShakeNMake.CISH_DEPS_FILE)
 
 ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS))))
 # $(warning Skipping C/C++ deps generation.)
-# ABSOLUTEBOGO := $(shell $(ShakeNMake.BIN.RM) -f $(ShakeNMake.CISH_DEPS_FILE))
+# ABSOLUTEBOGO := $(shell $(ShakeNMake.BINS.RM) -f $(ShakeNMake.CISH_DEPS_FILE))
 else
 #$(warning Including C/C++ deps.)
 -include $(ShakeNMake.CISH_DEPS_FILE)
 endif
 
@@ -320,11 +279,11 @@
 # $(error include $(.dfiles.list))
 include $(.dfiles.list)
 endif
 
 define ShakeNBake.CALL.MkDep.Tromey
-$(ShakeNMake.BIN.GCC) -MM \
+$(ShakeNMake.BINS.GCC) -MM \
 	-w	\
 	-MF $(1).d         \
 	-MP            \
 	-MT $2         \
 	$(CPPFLAGS)    \
@@ -379,144 +338,5 @@
 # ^^^ TOP_SRCDIR_REL==.
 
 #%.o:
 #	@$$(call ShakeNMake.CALL.SETX,"CC [$@] ..."); \
 #	$(COMPILE.c) $(COMPILE.c.OPTIONS) -o $@
-
-########################################################################
-# Installation rules...
-#
-# Sample usage:
-#
-#  ShakeNMake.install.bins = mybin myotherbin # installs to $(DESTDIR)$(prefix)/bin
-#  ShakeNMake.install.libs = mylib.a myotherlib.a # installs to $(DESTDIR)$(prefix)/lib
-#
-# Where (bins, libs...) is the name of an installation rule set, the
-# complete list of which is defined somewhere below.
-#
-# Then `make install` will try to DTRT with those.
-#
-# These rules are quite ancient - dating back to the very early 2000's
-# - and arguably severely overengineered. As part of the port out of
-# the original tree, the subdir handling "might" have been broken, so
-# be on the lookout for that.
-ifeq (,$(wildcard $(ShakeNMake.BIN.INSTALL)))
-uninstall install:
-	@echo "Install rules require that the variable ShakeNMake.BIN.INSTALL be set."; exit 1
-else
-DESTDIR ?=
-prefix ?= /usr/local
-########################################################################
-# $(call ShakeNMake.CALL.INSTALL.grep_kludge,file_name)
-# This is an ancient kludge force [un]install to silently fail without an
-# error when passed an empty file list. This was done because saner
-# approaches to checking this failed to work on some older machines.
-ShakeNMake.CALL.INSTALL.grep_kludge = echo $(1) "" | grep -q '[a-zA-Z0-9]' || exit 0
-########################################################################
-# $(call ShakeNMake.CALL.INSTALL,file_list,destdir[,install-sh-flags])
-# Installs files $(1) to $(DESTDIR)$(2). $(3) is passed on to
-# $(ShakeNMake.BIN.INSTALL).
-#
-# This code has some rather old logic in it when uses 'cmp' to compare
-# the source and dest files, and does not update the destination if
-# they are the same. This was originally in place because the install
-# code was used to copy header files around the source tree during
-# build-time, and we wanted to avoid breaking dependencies. It hasn't
-# been used in that way in a long, long time (2003? 2004?) and can
-# probably be removed, as it just slows down the install process.
-ShakeNMake.CALL.INSTALL = $(call ShakeNMake.CALL.INSTALL.grep_kludge,$(1)); \
-	tgtdir="$(DESTDIR)$(2)"; \
-	test -d "$$tgtdir" || mkdir -p "$${tgtdir}" \
-		|| { err=$$?; echo "$(@): mkdir -p $${tgtdir} failed"; exit $$err; }; \
-	for b in $(1) ""; do test -z "$$b" && continue; \
-		b=$${b\#\#*/}; \
-		target="$${tgtdir}/$$b"; \
-		cmd="$(ShakeNMake.BIN.INSTALL) $(3) $$b $$target"; echo $$cmd; $$cmd || exit; \
-	done
-
-########################################################################
-# $(call ShakeNMake.CALL.UNINSTALL,file_list,source_dir)
-# removes all files listed in $(1) from target directory $(DESTDIR)$(2).
-#
-# Maintenance reminder:
-# The while/rmdir loop is there to clean up empty dirs left over by
-# the uninstall. This is very arguable but seems more or less
-# reasonable. The loop takes care to stop when it reaches $(DESTDIR),
-# since DESTDIR is presumably (but not necessarily) created by another
-# authority.
-ShakeNMake.CALL.UNINSTALL =  $(call ShakeNMake.CALL.INSTALL.grep_kludge,$(1)); \
-	tgtdir="$(DESTDIR)$(2)"; \
-	test -e "$${tgtdir}" || exit 0; \
-	for b in $(1) ""; do test -z "$$b" && continue; \
-		fp="$${tgtdir}/$$b"; test -e "$$fp" || continue; \
-		cmd="rm $$fp"; echo $$cmd; $$cmd || exit $$?; \
-	done; \
-	tgtdir="$(2)"; \
-	while test x != "x$${tgtdir}" -a '$(prefix)' != "$${tgtdir}" \
-		-a '/' != "$${tgtdir}" -a -d "$(DESTDIR)$${tgtdir}"; do \
-		rmdir $(DESTDIR)$${tgtdir} 2>/dev/null || break; \
-		echo "Removing empty dir: $(DESTDIR)$${tgtdir}"; \
-		tgtdir=$${tgtdir%/*}; \
-	done; true
-
-ShakeNMake.INSTALL.flags.nonbins = -m 0644
-ShakeNMake.INSTALL.flags.bins = -s -m 0755
-ShakeNMake.INSTALL.flags.bin-scripts = -m 0755
-ShakeNMake.INSTALL.flags.dlls = -m 0755
-#.PHONY: install-subdirs
-#install: subdirs-install
-#install-subdirs: subdirs-install
-#.PHONY: uninstall-subdirs
-#uninstall-subdirs: subdirs-uninstall
-#uninstall: subdirs-uninstall
-
-########################################################################
-# $(call ShakeNMake.CALL.define-install-set,SET_NAME,dest_dir,install_flags)
-define ShakeNMake.EVAL.define-install-set
-$(if $(1),,$(error ShakeNMake.CALL.define-install-set requires an install set name as $$1))
-$(if $(2),,$(error ShakeNMake.CALL.define-install-set requires an installation path as $$2))
-
-$(if $(ShakeNMake.install.$(1).dupecheck),$(error ShakeNMake.CALL.define-install-set: rules for $1 have already been created. \
-	You cannot create them twice.))
-ShakeNMake.install.$(1).dupecheck := 1
-ShakeNMake.install.$(1).dest ?= $(2)
-ShakeNMake.install.$(1).install-flags ?= $(3)
-
-.PHONY: install-$(1)
-install-$(1):
-	@test x = "x$$(ShakeNMake.install.$(1))" && exit 0; \
-	$$(call ShakeNMake.CALL.INSTALL,$$(ShakeNMake.install.$(1)),$$(ShakeNMake.install.$(1).dest),$$(ShakeNMake.install.$(1).install-flags))
-install: install-$(1)
-
-.PHONY: uninstall-$(1)
-uninstall-$(1):
-	@test x = "x$$(ShakeNMake.install.$(1))" && exit 0; \
-	$$(call ShakeNMake.CALL.UNINSTALL,$$(ShakeNMake.install.$(1)),$$(ShakeNMake.install.$(1).dest))
-uninstall: uninstall-$(1)
-endef
-ShakeNMake.CALL.define-install-set = $(eval $(call ShakeNMake.EVAL.define-install-set,$(1),$(2),$(3)))
-# set up the initial install locations and install flags:
-ShakeNMake.INSTALL.target_basenames := bins sbins \
-				bin-scripts \
-				libs dlls \
-				package_libs package_dlls \
-				headers package_headers \
-				package_data docs \
-				man1 man2 man3 man4 \
-				man5 man6 man7 man8 man9
-$(call ShakeNMake.CALL.define-install-set,bins,$(prefix)/bin,$(ShakeNMake.INSTALL.flags.bins))
-$(call ShakeNMake.CALL.define-install-set,bin-scripts,$(prefix)/bin,$(ShakeNMake.INSTALL.flags.bin-scripts))
-#$(call ShakeNMake.CALL.define-install-set,sbins,$(prefix)/sbin,$(ShakeNMake.INSTALL.flags.bins))
-$(call ShakeNMake.CALL.define-install-set,libs,$(prefix)/lib,$(ShakeNMake.INSTALL.flags.nonbins))
-$(call ShakeNMake.CALL.define-install-set,dlls,$(prefix)/lib,$(ShakeNMake.INSTALL.flags.dlls))
-#$(call ShakeNMake.CALL.define-install-set,package_libs,$(prefix)/lib/$(package.name),$(ShakeNMake.INSTALL.flags.nonbins))
-#$(call ShakeNMake.CALL.define-install-set,package_dlls,$(prefix)/lib/$(package.name),$(ShakeNMake.INSTALL.flags.dlls))
-#$(call ShakeNMake.CALL.define-install-set,headers,$(prefix)/include,$(ShakeNMake.INSTALL.flags.nonbins))
-#$(call ShakeNMake.CALL.define-install-set,package_headers,$(prefix)/include/$(package.name),$(ShakeNMake.INSTALL.flags.nonbins))
-#$(call ShakeNMake.CALL.define-install-set,package_data,$(prefix)/share/$(package.name),$(ShakeNMake.INSTALL.flags.nonbins))
-#$(call ShakeNMake.CALL.define-install-set,docs,$(prefix)/share/doc/$(package.name),$(ShakeNMake.INSTALL.flags.nonbins))
-# Set up man page entries...
-$(foreach NUM,1 2 3 4 5 6 7 8 9,$(call \
-	ShakeNMake.CALL.define-install-set,man$(NUM),$(prefix)/man/man$(NUM),$(ShakeNMake.INSTALL.flags.nonbins)))
-endif
-# /install
-########################################################################