From daa94b9e3ec0e783e2efc806ecb0357053c1d91e Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 12 May 2005 03:58:35 +0000 Subject: [PATCH] 2005-05-12 Noah Misch * config.guess (9000/[34678]??:HP-UX:*:*): Discard stderr of `cc -E -'; HP `cc' emits an error for it but still preprocesses standard input as expected. Add comment. --- ChangeLog | 6 ++++++ config.guess | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1f81297..ba22fe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-12 Noah Misch + + * config.guess (9000/[34678]??:HP-UX:*:*): Discard stderr of `cc + -E -'; HP `cc' emits an error for it but still preprocesses + standard input as expected. Add comment. + 2005-05-12 Nick Burrett Ben Elliston diff --git a/config.guess b/config.guess index ea42831..f751885 100755 --- a/config.guess +++ b/config.guess @@ -653,7 +653,18 @@ EOF then # avoid double evaluation of $set_cc_for_build test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + + # 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: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else