From 9c63d2fafeee92602b240f6bb3d34ce82fcaa85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=AC=E7=94=9F?= Date: Fri, 3 Jul 2015 15:06:04 +1000 Subject: [PATCH] * config.guess (*:NetBSD:*:*): Use only the major release and minor release number in the triplet. * testsuite/config-guess.data: Add new tests. Signed-off-by: Ben Elliston --- ChangeLog | 12 +++++++++--- config.guess | 4 ++-- testsuite/config-guess.data | 5 +++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b1b95..d17ef14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-07-03 宋冬生 + + * config.guess (*:NetBSD:*:*): Use only the major release and + minor release number in the triplet. + * testsuite/config-guess.data: Add new tests. + 2015-06-30 Alexandre Oliva Ben Elliston @@ -178,7 +184,7 @@ 2013-10-01 Ben Elliston - Reported by Jö Fahlke . + Reported by Jö Fahlke . * config.sub (k1om, k1om-*): New. * testsuite/config-sub.data: Add test cases. @@ -640,7 +646,7 @@ (mips:Linux:*:* | mips64:Linux:*:*): Simplfy with grep, not sed, to pull CPU= lines from the preprocessor output. -2009-11-08 Jerker Bäck +2009-11-08 Jerker Bäck Ben Elliston * config.guess (*:Interix*:*): Allow any uname -r value so that @@ -1940,7 +1946,7 @@ * config.guess: Detect Convergent 3B1 machines (running AT&T UNIX). Reported by Bruce Lilly . -2002-08-22 Urs Janßen +2002-08-22 Urs Janßen * config.sub: Cosmetic whitespace fixes. diff --git a/config.guess b/config.guess index e5bdb99..fddac42 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-06-30' +timestamp='2015-07-03' # 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 @@ -221,7 +221,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data index eec9a33..8bb2222 100644 --- a/testsuite/config-guess.data +++ b/testsuite/config-guess.data @@ -4,6 +4,11 @@ aarch64_be ignored Linux ignored ignored aarch64_be-unknown-linux-gnu aarch64 ignored Linux ignored ignored aarch64-unknown-linux-gnu amd64 1.5.12(0.116/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin +amd64 6.1.4 NetBSD ignored x86_64 x86_64-unknown-netbsd6.1 +amd64 6.1.5_PATCH NetBSD ignored x86_64 x86_64-unknown-netbsd6.1 +amd64 7.0_BETA NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 +amd64 7.0 NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 +amd64 7.0_RC1 NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 arceb ignored Linux ignored ignored arceb-unknown-linux-gnu arc ignored Linux ignored ignored arc-unknown-linux-gnu arm ignored riscos ignored ignored arm-unknown-riscos