[GRASS-SVN] r73849 - grass/branches/releasebranch_7_6
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Dec 26 02:21:27 PST 2018
Author: neteler
Date: 2018-12-26 02:21:27 -0800 (Wed, 26 Dec 2018)
New Revision: 73849
Modified:
grass/branches/releasebranch_7_6/config.guess
grass/branches/releasebranch_7_6/config.sub
Log:
config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/
Modified: grass/branches/releasebranch_7_6/config.guess
===================================================================
--- grass/branches/releasebranch_7_6/config.guess 2018-12-26 10:20:41 UTC (rev 73848)
+++ grass/branches/releasebranch_7_6/config.guess 2018-12-26 10:21:27 UTC (rev 73849)
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-08-29'
+timestamp='2018-12-07'
# 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
@@ -96,8 +96,7 @@
tmp=
# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
set_cc_for_build() {
: "${TMPDIR=/tmp}"
@@ -392,15 +391,20 @@
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
@@ -890,7 +894,7 @@
echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
+ echo x86_64-pc-cygwin
exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
@@ -1424,6 +1428,9 @@
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
+ *:Unleashed:*:*)
+ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+ exit ;;
esac
echo "$0: unable to guess system type" >&2
Modified: grass/branches/releasebranch_7_6/config.sub
===================================================================
--- grass/branches/releasebranch_7_6/config.sub 2018-12-26 10:20:41 UTC (rev 73848)
+++ grass/branches/releasebranch_7_6/config.sub 2018-12-26 10:21:27 UTC (rev 73849)
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-08-29'
+timestamp='2018-12-16'
# 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
@@ -89,7 +89,7 @@
- ) # Use stdin as input.
break ;;
-* )
- echo "$me: invalid option $1$help"
+ echo "$me: invalid option $1$help" >&2
exit 1 ;;
*local*)
@@ -111,7 +111,7 @@
esac
# Split fields of configuration type
-IFS="-" read -r field1 field2 field3 field4 <<EOF
+IFS="-" read field1 field2 field3 field4 <<EOF
$1
EOF
@@ -149,7 +149,7 @@
esac
;;
*-*)
- # A lone config we happen to match not fitting any patern
+ # A lone config we happen to match not fitting any pattern
case $field1-$field2 in
decstation-3100)
basic_machine=mips-dec
@@ -918,7 +918,7 @@
;;
*-*)
- IFS="-" read -r cpu vendor <<EOF
+ IFS="-" read cpu vendor <<EOF
$basic_machine
EOF
;;
@@ -950,7 +950,7 @@
# Decode basic machines in the full and proper CPU-Company form.
case $cpu-$vendor in
- # Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
+ # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
# some cases the only manufacturer, in others, it is the most popular.
craynv-unknown)
vendor=cray
@@ -1101,7 +1101,7 @@
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- # Recognize the cannonical CPU Types that limit and/or modify the
+ # Recognize the canonical CPU Types that limit and/or modify the
# company names they are paired with.
cr16-*)
os=${os:-elf}
@@ -1150,7 +1150,7 @@
;;
*)
- # Recognize the cannonical CPU types that are allowed with any
+ # Recognize the canonical CPU types that are allowed with any
# company name.
case $cpu in
1750a | 580 \
@@ -1161,6 +1161,7 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
| alphapca5[67] | alpha64pca5[67] \
| am33_2.0 \
+ | amdgcn \
| arc | arceb \
| arm | arm[lb]e | arme[lb] | armv* \
| avr | avr32 \
@@ -1360,7 +1361,7 @@
| powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- | midnightbsd*)
+ | midnightbsd* | amdhsa* | unleashed*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
qnx*)
More information about the grass-commit
mailing list