diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2018-08-29 18:53:00 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2018-08-29 18:53:00 +0000 |
| commit | a9bd2fb5f68a16ff2ae9e2acbfc1678aa484c719 (patch) | |
| tree | a246f69f1e7323471956c8d761c941df24b14b17 /Templates | |
| parent | f22225bb09376b5c74529a1dc38f8f261b77fb08 (diff) | |
| download | ports-a9bd2fb5f68a16ff2ae9e2acbfc1678aa484c719.tar.gz ports-a9bd2fb5f68a16ff2ae9e2acbfc1678aa484c719.zip | |
config.guess: merge upstream changes up to 2018-08-29
PR: 230987
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=478367
Diffstat (limited to 'Templates')
| -rw-r--r-- | Templates/config.guess | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/Templates/config.guess b/Templates/config.guess index 26c917ec0e08..b1f709e5aa0f 100644 --- a/Templates/config.guess +++ b/Templates/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-07-18' +timestamp='2018-08-29' # 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 @@ -126,7 +126,7 @@ set_cc_for_build() { # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi @@ -392,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - 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/[^.]*//'`" + 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 exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -843,7 +838,7 @@ EOF *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; - arm*:FreeBSD:*:*) + arm:FreeBSD:*:*) UNAME_PROCESSOR=`uname -p` set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |