diff --git a/ChangeLog b/ChangeLog index 4e6c2b5..ad5d080 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-02-21 Taylor R Campbell + + * config.guess (*:NetBSD:*:*): `uname -p' and `sysctl -n + hw.machine_arch' have been the same since `uname -p' was + introduced in 1998. `sysctl -n hw.machine_arch' has been around a + little longer, since 1997, so fall back to that in the obscure + case that someone might still care about that vintage. + 2015-02-20 Ben Elliston * testsuite/config-guess.sh: Read an additional column from the diff --git a/config.guess b/config.guess index dbfb978..9726d28 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2015-01-01' +timestamp='2015-02-21' # 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 @@ -168,8 +168,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;;