From 6f5b719255e306a37c9feb4ae649044db4ca7cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Granlund?= Date: Sat, 21 Dec 2019 12:01:43 +1100 Subject: [PATCH] * config.guess (alpha:Linux:*:*): Guard against missing /proc/cpuinfo by redirecting standard error to /dev/null. Signed-off-by: Ben Elliston --- ChangeLog | 5 +++++ config.guess | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f00177..9c688eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-12-21 Torbjörn Granlund + + * config.guess (alpha:Linux:*:*): Guard against missing + /proc/cpuinfo by redirecting standard error to /dev/null. + 2019-09-12 Ben Elliston * testsuite/config-guess.data: Sort. diff --git a/config.guess b/config.guess index 7f9ebbe..fe242a4 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2019-09-10' +timestamp='2019-12-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 @@ -924,7 +924,7 @@ EOF echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;;