Revert 2018-07-18 change:

From Apostolos Syropoulos <asyropoulos@gmail.com>:
	* config.guess (i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*): Use the
	isainfo(1) command to guess what kind of system we have. Running
	isainfo -b returns either "32" or "64".
This commit is contained in:
Ben Elliston 2018-12-21 12:22:29 +11:00
parent 9764df548d
commit 9e514cc932
2 changed files with 23 additions and 9 deletions

View File

@ -1,3 +1,12 @@
2018-12-21 Ben Elliston <bje@gnu.org>
Revert 2018-07-18 change:
From Apostolos Syropoulos <asyropoulos@gmail.com>:
* config.guess (i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*): Use the
isainfo(1) command to guess what kind of system we have. Running
isainfo -b returns either "32" or "64".
2018-12-16 Ben Elliston <bje@gnu.org>
Revert 2018-05-05 change.

23
config.guess vendored
View File

@ -391,15 +391,20 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
case `isainfo -b` in
32)
echo i386-pc-solaris2"$UNAME_REL"
;;
64)
echo x86_64-pc-solaris2"$UNAME_REL"
;;
esac
set_cc_for_build
SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
SUN_ARCH=x86_64
fi
fi
echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize