From 198a3211f7e4c8ebbe13d0b5616c21776d7de534 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Mon, 12 Dec 2005 23:38:07 +0000 Subject: [PATCH] 2005-12-13 Ralf Wildenhues * config.guess (mips:Linux:*:*, mips64:Linux:*:*, i*86:Linux:*:*): Fix quoting of eval command line, allow for preprocessor to insert white space between C tokens. (i*86:Linux:*:*): Handle Portland Group pgcc like Intel icc; it doesn't define __ELF__ either. --- ChangeLog | 8 ++++++++ config.guess | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00ce531..d4e3a88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-12-13 Ralf Wildenhues + + * config.guess (mips:Linux:*:*, mips64:Linux:*:*, i*86:Linux:*:*): + Fix quoting of eval command line, allow for preprocessor to insert + white space between C tokens. + (i*86:Linux:*:*): Handle Portland Group pgcc like Intel icc; it + doesn't define __ELF__ either. + 2005-12-11 Ben Elliston From Shaun Jackman : diff --git a/config.guess b/config.guess index be0de06..290a113 100755 --- a/config.guess +++ b/config.guess @@ -851,7 +851,7 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +870,7 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -967,7 +967,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) LIBC=gnu #else LIBC=gnuaout @@ -977,7 +977,7 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit