Import config.sub and config.guess from upstream.

From: Kuba Sejdak <jakub.sejdak@phoesys.com>

---
 ChangeLog    |  4 +++
 config.guess | 93 ++++++++++++++++++++++++++++++++----------------------------
 config.sub   |  8 ++++--
 3 files changed, 59 insertions(+), 46 deletions(-)

Is it OK for trunk, gcc-4.9, gcc-5 and gcc-6 branches?

2016-05-13 9:52 GMT+02:00 Jakub Sejdak <jakub.sejdak@phoesys.com>:
> From: Kuba Sejdak <jakub.sejdak@phoesys.com>
>
> ---
>  ChangeLog    |  4 +++
>  config.guess | 93 ++++++++++++++++++++++++++++++++----------------------------
>  config.sub   |  8 ++++--
>  3 files changed, 59 insertions(+), 46 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index eac1cc6..e092878 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,7 @@
> +2016-05-13  Jakub Sejdak  <jakub.sejdak@phoesys.com>
> +    * config.guess: Import version 2016-04-02 (newest).
> +    * config.sub: Import version 2016-05-10 (newest).
> +
>  2016-05-09  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>
>
>         * MAINTAINERS (Write After Approval): Add myself.
> diff --git a/config.guess b/config.guess
> index dcd5149..0967f2a 100755
> --- a/config.guess
> +++ b/config.guess
> @@ -2,7 +2,7 @@
>  # Attempt to guess a canonical system name.
>  #   Copyright 1992-2016 Free Software Foundation, Inc.
>
> -timestamp='2016-01-01'
> +timestamp='2016-04-02'
>
>  # 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
> @@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>         UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
>         echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
>         exit ;;
> +    *:LibertyBSD:*:*)
> +       UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
> +       echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
> +       exit ;;
>      *:ekkoBSD:*:*)
>         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
>         exit ;;
> @@ -268,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>         ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
>         case "$ALPHA_CPU_TYPE" in
>             "EV4 (21064)")
> -               UNAME_MACHINE="alpha" ;;
> +               UNAME_MACHINE=alpha ;;
>             "EV4.5 (21064)")
> -               UNAME_MACHINE="alpha" ;;
> +               UNAME_MACHINE=alpha ;;
>             "LCA4 (21066/21068)")
> -               UNAME_MACHINE="alpha" ;;
> +               UNAME_MACHINE=alpha ;;
>             "EV5 (21164)")
> -               UNAME_MACHINE="alphaev5" ;;
> +               UNAME_MACHINE=alphaev5 ;;
>             "EV5.6 (21164A)")
> -               UNAME_MACHINE="alphaev56" ;;
> +               UNAME_MACHINE=alphaev56 ;;
>             "EV5.6 (21164PC)")
> -               UNAME_MACHINE="alphapca56" ;;
> +               UNAME_MACHINE=alphapca56 ;;
>             "EV5.7 (21164PC)")
> -               UNAME_MACHINE="alphapca57" ;;
> +               UNAME_MACHINE=alphapca57 ;;
>             "EV6 (21264)")
> -               UNAME_MACHINE="alphaev6" ;;
> +               UNAME_MACHINE=alphaev6 ;;
>             "EV6.7 (21264A)")
> -               UNAME_MACHINE="alphaev67" ;;
> +               UNAME_MACHINE=alphaev67 ;;
>             "EV6.8CB (21264C)")
> -               UNAME_MACHINE="alphaev68" ;;
> +               UNAME_MACHINE=alphaev68 ;;
>             "EV6.8AL (21264B)")
> -               UNAME_MACHINE="alphaev68" ;;
> +               UNAME_MACHINE=alphaev68 ;;
>             "EV6.8CX (21264D)")
> -               UNAME_MACHINE="alphaev68" ;;
> +               UNAME_MACHINE=alphaev68 ;;
>             "EV6.9A (21264/EV69A)")
> -               UNAME_MACHINE="alphaev69" ;;
> +               UNAME_MACHINE=alphaev69 ;;
>             "EV7 (21364)")
> -               UNAME_MACHINE="alphaev7" ;;
> +               UNAME_MACHINE=alphaev7 ;;
>             "EV7.9 (21364A)")
> -               UNAME_MACHINE="alphaev79" ;;
> +               UNAME_MACHINE=alphaev79 ;;
>         esac
>         # A Pn.n version is a patched version.
>         # A Vn.n version is a released version.
>         # A Tn.n version is a released field test version.
>         # A Xn.n version is an unreleased experimental baselevel.
>         # 1.2 uses "1.2" for uname -r.
> -       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> +       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
>         # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
>         exitcode=$?
>         trap '' 0
> @@ -376,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>         exit ;;
>      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>         eval $set_cc_for_build
> -       SUN_ARCH="i386"
> +       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 [ "$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) | \
> +               (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
>                 grep IS_64BIT_ARCH >/dev/null
>             then
> -               SUN_ARCH="x86_64"
> +               SUN_ARCH=x86_64
>             fi
>         fi
>         echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> @@ -410,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>         exit ;;
>      sun*:*:4.2BSD:*)
>         UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
> -       test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
> +       test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
>         case "`/bin/arch`" in
>             sun3)
>                 echo m68k-sun-sunos${UNAME_RELEASE}
> @@ -635,13 +639,13 @@ EOF
>                     sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
>                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
>                     case "${sc_cpu_version}" in
> -                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
> -                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
> +                     523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
> +                     528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
>                       532)                      # CPU_PA_RISC2_0
>                         case "${sc_kernel_bits}" in
> -                         32) HP_ARCH="hppa2.0n" ;;
> -                         64) HP_ARCH="hppa2.0w" ;;
> -                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
> +                         32) HP_ARCH=hppa2.0n ;;
> +                         64) HP_ARCH=hppa2.0w ;;
> +                         '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
>                         esac ;;
>                     esac
>                 fi
> @@ -680,11 +684,11 @@ EOF
>                     exit (0);
>                 }
>  EOF
> -                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
> +                   (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
>                     test -z "$HP_ARCH" && HP_ARCH=hppa
>                 fi ;;
>         esac
> -       if [ ${HP_ARCH} = "hppa2.0w" ]
> +       if [ ${HP_ARCH} = hppa2.0w ]
>         then
>             eval $set_cc_for_build
>
> @@ -697,12 +701,12 @@ EOF
>             # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
>             # => hppa64-hp-hpux11.23
>
> -           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
> +           if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
>                 grep -q __LP64__
>             then
> -               HP_ARCH="hppa2.0w"
> +               HP_ARCH=hppa2.0w
>             else
> -               HP_ARCH="hppa64"
> +               HP_ARCH=hppa64
>             fi
>         fi
>         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
> @@ -807,14 +811,14 @@ EOF
>         echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>         exit ;;
>      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
> -       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> -       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> +       FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
> +       FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
>         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
>         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
>         exit ;;
>      5000:UNIX_System_V:4.*:*)
> -       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> -       FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
> +       FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
> +       FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
>         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
>         exit ;;
>      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
> @@ -896,7 +900,7 @@ EOF
>         exit ;;
>      *:GNU/*:*:*)
>         # other systems with GNU libc and userland
> -       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
> +       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
>         exit ;;
>      i*86:Minix:*:*)
>         echo ${UNAME_MACHINE}-pc-minix
> @@ -919,7 +923,7 @@ EOF
>           EV68*) UNAME_MACHINE=alphaev68 ;;
>         esac
>         objdump --private-headers /bin/sh | grep -q ld.so.1
> -       if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
> +       if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
>         echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
>         exit ;;
>      arc:Linux:*:* | arceb:Linux:*:*)
> @@ -1272,6 +1276,9 @@ EOF
>      SX-8R:SUPER-UX:*:*)
>         echo sx8r-nec-superux${UNAME_RELEASE}
>         exit ;;
> +    SX-ACE:SUPER-UX:*:*)
> +       echo sxace-nec-superux${UNAME_RELEASE}
> +       exit ;;
>      Power*:Rhapsody:*:*)
>         echo powerpc-apple-rhapsody${UNAME_RELEASE}
>         exit ;;
> @@ -1285,9 +1292,9 @@ EOF
>             UNAME_PROCESSOR=powerpc
>         fi
>         if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
> -           if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
> +           if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
>                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
> -                   (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
> +                   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
>                     grep IS_64BIT_ARCH >/dev/null
>                 then
>                     case $UNAME_PROCESSOR in
> @@ -1309,7 +1316,7 @@ EOF
>         exit ;;
>      *:procnto*:*:* | *:QNX:[0123456789]*:*)
>         UNAME_PROCESSOR=`uname -p`
> -       if test "$UNAME_PROCESSOR" = "x86"; then
> +       if test "$UNAME_PROCESSOR" = x86; then
>                 UNAME_PROCESSOR=i386
>                 UNAME_MACHINE=pc
>         fi
> @@ -1340,7 +1347,7 @@ EOF
>         # "uname -m" is not consistent, so use $cputype instead. 386
>         # is converted to i386 for consistency with other x86
>         # operating systems.
> -       if test "$cputype" = "386"; then
> +       if test "$cputype" = 386; then
>             UNAME_MACHINE=i386
>         else
>             UNAME_MACHINE="$cputype"
> @@ -1382,7 +1389,7 @@ EOF
>         echo i386-pc-xenix
>         exit ;;
>      i*86:skyos:*:*)
> -       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> +       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
>         exit ;;
>      i*86:rdos:*:*)
>         echo ${UNAME_MACHINE}-pc-rdos
> diff --git a/config.sub b/config.sub
> index da6d1b6..6d86a1e 100755
> --- a/config.sub
> +++ b/config.sub
> @@ -2,7 +2,7 @@
>  # Configuration validation subroutine script.
>  #   Copyright 1992-2016 Free Software Foundation, Inc.
>
> -timestamp='2016-01-01'
> +timestamp='2016-05-10'
>
>  # 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
> @@ -1382,7 +1382,7 @@ case $os in
>               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
>               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>               | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
> -             | -bitrig* | -openbsd* | -solidbsd* \
> +             | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
>               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
>               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
>               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> @@ -1399,7 +1399,7 @@ case $os in
>               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
>               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>               | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
> -             | -onefs* | -tirtos*)
> +             | -onefs* | -tirtos* | -phoenix*)
>         # Remember, each alternative MUST END IN *, to match a version number.
>                 ;;
>         -qnx*)
> @@ -1531,6 +1531,8 @@ case $os in
>                 ;;
>         -nacl*)
>                 ;;
> +       -ios)
> +               ;;
>         -none)
>                 ;;
>         *)
> --
> 2.7.4
>

On Fri, 13 May 2016, Jakub Sejdak wrote:

> Is it OK for trunk, gcc-4.9, gcc-5 and gcc-6 branches?

It's not appropriate to update these scripts from upstream on release 
branches.  For example, config.guess changed a while back to output 
x86_64-pc-linux-gnu in place of x86_64-unknown-linux-gnu, and clearly we 
don't want to make such a change on 4.9 and 5 branches, which have 
versions predating that change.

OK I understand. So am I right, that in such a case there is no way to
introduce new OS targets to branch 4.9 and 5?
What about 6 branch and trunk?

On the other hand: this is my first patch and I'm not quite familiar
with the procedure of applying patches to upstream. Who should upload
my patch, when it gets accepted?

Thank you,
Jakub

2016-05-13 20:03 GMT+02:00 Joseph Myers <joseph@codesourcery.com>:
> On Fri, 13 May 2016, Jakub Sejdak wrote:
>
>> Is it OK for trunk, gcc-4.9, gcc-5 and gcc-6 branches?
>
> It's not appropriate to update these scripts from upstream on release
> branches.  For example, config.guess changed a while back to output
> x86_64-pc-linux-gnu in place of x86_64-unknown-linux-gnu, and clearly we
> don't want to make such a change on 4.9 and 5 branches, which have
> versions predating that change.
>
> --
> Joseph S. Myers
> joseph@codesourcery.com

On May 13, 2016, at 11:50 AM, Jakub Sejdak <jakub.sejdak@phoesys.com> wrote:
> 
> OK I understand. So am I right, that in such a case there is no way to
> introduce new OS targets to branch 4.9 and 5?

No.  You just hand edit in the bits you need for your port, and seek approval for that.

In general, all new work goes into trunk, first.  Once it is there, then you can back port to the first oldest release branch.  Once there, then you can back port to the next oldest and so on.  If it can't make it into a branch, it can't go onto the next oldest branch.

So, be be concrete, get 5 in first, then ask for 4.9.  Get 6 in first, then ask for 5.  Get trunk in first, then ask for 6.

> What about 6 branch and trunk?

6 would have the same answer as 4.9 and 5.  For trunk, import from upstream is the usual way to pick up that work.

> On the other hand: this is my first patch and I'm not quite familiar
> with the procedure of applying patches to upstream. Who should upload
> my patch, when it gets accepted?

Anyone with write access.

OK so just one final question to be clear: This patch was created from
trunk with config,sub and config.guess copied from GNU config
upstream.
If you say, that I should just modify bits for my port, then this
patch is still bad (since it modifies much more).

Then when those scripts get copied 'as they are' from GNU config? Only
for newly created branches?

2016-05-13 22:18 GMT+02:00 Mike Stump <mikestump@comcast.net>:
> On May 13, 2016, at 11:50 AM, Jakub Sejdak <jakub.sejdak@phoesys.com> wrote:
>>
>> OK I understand. So am I right, that in such a case there is no way to
>> introduce new OS targets to branch 4.9 and 5?
>
> No.  You just hand edit in the bits you need for your port, and seek approval for that.
>
> In general, all new work goes into trunk, first.  Once it is there, then you can back port to the first oldest release branch.  Once there, then you can back port to the next oldest and so on.  If it can't make it into a branch, it can't go onto the next oldest branch.
>
> So, be be concrete, get 5 in first, then ask for 4.9.  Get 6 in first, then ask for 5.  Get trunk in first, then ask for 6.
>
>> What about 6 branch and trunk?
>
> 6 would have the same answer as 4.9 and 5.  For trunk, import from upstream is the usual way to pick up that work.
>
>> On the other hand: this is my first patch and I'm not quite familiar
>> with the procedure of applying patches to upstream. Who should upload
>> my patch, when it gets accepted?
>
> Anyone with write access.

On May 14, 2016, at 1:15 AM, Jakub Sejdak <jakub.sejdak@phoesys.com> wrote:
> Then when those scripts get copied 'as they are' from GNU config? Only
> for newly created branches?

Only for trunk...

So please confirm that this is OK for trunk only and apply it.
Then I will start working on backporting this for other branches.

2016-05-14 11:29 GMT+02:00 Mike Stump <mikestump@comcast.net>:
> On May 14, 2016, at 1:15 AM, Jakub Sejdak <jakub.sejdak@phoesys.com> wrote:
>> Then when those scripts get copied 'as they are' from GNU config? Only
>> for newly created branches?
>
> Only for trunk...

Ping.

2016-05-14 13:36 GMT+02:00 Jakub Sejdak <jakub.sejdak@phoesys.com>:
> So please confirm that this is OK for trunk only and apply it.
> Then I will start working on backporting this for other branches.
>
> 2016-05-14 11:29 GMT+02:00 Mike Stump <mikestump@comcast.net>:
>> On May 14, 2016, at 1:15 AM, Jakub Sejdak <jakub.sejdak@phoesys.com> wrote:
>>> Then when those scripts get copied 'as they are' from GNU config? Only
>>> for newly created branches?
>>
>> Only for trunk...

On 05/13/2016 01:55 AM, Jakub Sejdak wrote:
> +2016-05-13  Jakub Sejdak  <jakub.sejdak@phoesys.com>
>> +    * config.guess: Import version 2016-04-02 (newest).
>> +    * config.sub: Import version 2016-05-10 (newest).
>>
Installed on the trunk.  I think this was NAK's for the release branches.

jeff