pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/gnu-config Merge in newer GNU config files.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/75a4ff56848e
branches:  trunk
changeset: 389578:75a4ff56848e
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri Jan 04 07:35:25 2019 +0000

description:
Merge in newer GNU config files.

- Locally patch in netbsd/superh, not yet accepted upstream.
- upstream did netbsd/mips64eb fix differently.

Other changes that might be notable to us:

- different compiler-based way of identifying 32bit vs. 64bit for
solaris/x86
- different compiler-based way of identifying solaris/sparc 64bit,
that supposedly works for both sun cc and GCC.

diffstat:

 mk/gnu-config/config.guess |  52 +++++++++++++++++++++++++++++++--------------
 mk/gnu-config/config.sub   |  30 +++++++++++++-------------
 2 files changed, 51 insertions(+), 31 deletions(-)

diffs (226 lines):

diff -r 9bd89a77a23a -r 75a4ff56848e mk/gnu-config/config.guess
--- a/mk/gnu-config/config.guess        Fri Jan 04 07:34:03 2019 +0000
+++ b/mk/gnu-config/config.guess        Fri Jan 04 07:35:25 2019 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2019-01-03'
 
 # 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
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -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}"
@@ -386,21 +385,39 @@
        echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
        exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-       echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+       set_cc_for_build
+       SUN_ARCH=sparc
+       # 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 __sparcv9'; echo IS_64BIT_ARCH; echo '#endif') | \
+               (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+               grep IS_64BIT_ARCH >/dev/null
+           then
+               SUN_ARCH=sparcv9
+           fi
+       fi
+       echo "$SUN_ARCH"-sun-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
        exit ;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
        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 +907,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 +1441,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
diff -r 9bd89a77a23a -r 75a4ff56848e mk/gnu-config/config.sub
--- a/mk/gnu-config/config.sub  Fri Jan 04 07:34:03 2019 +0000
+++ b/mk/gnu-config/config.sub  Fri Jan 04 07:35:25 2019 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2019-01-04'
 
 # 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
@@ -67,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -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,8 @@
 esac
 
 # Split fields of configuration type
-IFS="-" read -r field1 field2 field3 field4 <<EOF
+# shellcheck disable=SC2162
+IFS="-" read field1 field2 field3 field4 <<EOF
 $1
 EOF
 
@@ -149,7 +150,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 +919,8 @@
                ;;
 
        *-*)
-               IFS="-" read -r cpu vendor <<EOF
+               # shellcheck disable=SC2162
+               IFS="-" read cpu vendor <<EOF
 $basic_machine
 EOF
                ;;
@@ -950,7 +952,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
@@ -1029,9 +1031,6 @@
        mips3*-*)
                cpu=mips64
                ;;
-       mips64*-*)
-               cpu=mips64
-               ;;
        ms1-*)
                cpu=mt
                ;;
@@ -1104,7 +1103,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}
@@ -1153,7 +1152,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 \
@@ -1164,6 +1163,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 \
@@ -1191,7 +1191,7 @@
                        | microblaze | microblazeel \
                        | mips | mipsbe | mipseb | mipsel | mipsle \
                        | mips16 \
-                       | mips64 | mips64el \
+                       | mips64 | mips64eb | mips64el \
                        | mips64octeon | mips64octeonel \
                        | mips64orion | mips64orionel \
                        | mips64r5900 | mips64r5900el \
@@ -1362,7 +1362,7 @@
             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-            | midnightbsd*)
+            | midnightbsd* | amdhsa* | unleashed* | emscripten*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        qnx*)



Home | Main Index | Thread Index | Old Index