Commit 090c830f authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1598273 - Refresh config.guess and config.sub from upstream. r=froydnj 

Differential Revision: https://phabricator.services.mozilla.com/D54244

--HG--
extra : moz-landing-system : lando
parent 74ec11e0

build/autoconf/config.guess

+228 −51
Original line number Diff line number Diff line 
#! /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-12-07'

timestamp='2019-09-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
@@ -50,7 +50,7 @@ version="\ 
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."
@@ -262,6 +262,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in 
    *:SolidBSD:*:*)

	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"

	exit ;;

    *:OS108:*:*)

	echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"

	exit ;;

    macppc:MirBSD:*:*)

	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"

	exit ;;
@@ -271,6 +274,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in 
    *:Sortix:*:*)

	echo "$UNAME_MACHINE"-unknown-sortix

	exit ;;

    *:Twizzler:*:*)

	echo "$UNAME_MACHINE"-unknown-twizzler

	exit ;;

    *:Redox:*:*)

	echo "$UNAME_MACHINE"-unknown-redox

	exit ;;
@@ -391,15 +397,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
@@ -980,22 +991,50 @@ EOF 
	exit ;;

    mips:Linux:*:* | mips64:Linux:*:*)

	set_cc_for_build

	IS_GLIBC=0

	test x"${LIBC}" = xgnu && IS_GLIBC=1

	sed 's/^	//' << EOF > "$dummy.c"

	#undef CPU

	#undef ${UNAME_MACHINE}

	#undef ${UNAME_MACHINE}el

	#undef mips

	#undef mipsel

	#undef mips64

	#undef mips64el

	#if ${IS_GLIBC} && defined(_ABI64)

	LIBCABI=gnuabi64

	#else

	#if ${IS_GLIBC} && defined(_ABIN32)

	LIBCABI=gnuabin32

	#else

	LIBCABI=${LIBC}

	#endif

	#endif



	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6

	CPU=mipsisa64r6

	#else

	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6

	CPU=mipsisa32r6

	#else

	#if defined(__mips64)

	CPU=mips64

	#else

	CPU=mips

	#endif

	#endif

	#endif



	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

	CPU=${UNAME_MACHINE}el

	MIPS_ENDIAN=el

	#else

	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

	CPU=${UNAME_MACHINE}

	MIPS_ENDIAN=

	#else

	CPU=

	MIPS_ENDIAN=

	#endif

	#endif

EOF

	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"

	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }

	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"

	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }

	;;

    mips64el:Linux:*:*)

	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1108,7 +1147,7 @@ EOF 
	    *Pentium)	     UNAME_MACHINE=i586 ;;

	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;

	esac

	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"

	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"

	exit ;;

    i*86:*:3.2:*)

	if test -f /usr/options/cb.name; then
@@ -1292,12 +1331,19 @@ EOF 
	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"

	exit ;;

    *:Darwin:*:*)

	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

	UNAME_PROCESSOR=`uname -p`

	case $UNAME_PROCESSOR in

	    unknown) UNAME_PROCESSOR=powerpc ;;

	esac

	if command -v xcode-select > /dev/null 2> /dev/null && \

		! xcode-select --print-path > /dev/null 2> /dev/null ; then

	    # Avoid executing cc if there is no toolchain installed as

	    # cc will be a stub that puts up a graphical alert

	    # prompting the user to install developer tools.

	    CC_FOR_BUILD=no_compiler_found

	else

	    set_cc_for_build

	if test "$UNAME_PROCESSOR" = unknown ; then

	    UNAME_PROCESSOR=powerpc

	fi

	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; 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) | \
@@ -1315,15 +1361,9 @@ EOF 
	    then

		UNAME_PROCESSOR=powerpc

	    fi

	    fi

	elif test "$UNAME_PROCESSOR" = i386 ; then

	    # Avoid executing cc on OS X 10.9, as it ships with a stub

	    # that puts up a graphical alert prompting to install

	    # developer tools.  Any system running Mac OS X 10.7 or

	    # later (Darwin 11 and later) is required to have a 64-bit

	    # processor. This is not true of the ARM version of Darwin

	    # that Apple uses in portable devices.

	    UNAME_PROCESSOR=x86_64

	    # uname -m returns i386 or x86_64

	    UNAME_PROCESSOR=$UNAME_MACHINE

	fi

	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"

	exit ;;
@@ -1428,6 +1468,143 @@ EOF 
	exit ;;

esac



# No uname command or uname output not recognized.

set_cc_for_build

cat > "$dummy.c" <<EOF

#ifdef _SEQUENT_

#include <sys/types.h>

#include <sys/utsname.h>

#endif

#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)

#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)

#include <signal.h>

#if defined(_SIZE_T_) || defined(SIGLOST)

#include <sys/utsname.h>

#endif

#endif

#endif

main ()

{

#if defined (sony)

#if defined (MIPSEB)

  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,

     I don't know....  */

  printf ("mips-sony-bsd\n"); exit (0);

#else

#include <sys/param.h>

  printf ("m68k-sony-newsos%s\n",

#ifdef NEWSOS4

  "4"

#else

  ""

#endif

  ); exit (0);

#endif

#endif



#if defined (NeXT)

#if !defined (__ARCHITECTURE__)

#define __ARCHITECTURE__ "m68k"

#endif

  int version;

  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;

  if (version < 4)

    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);

  else

    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);

  exit (0);

#endif



#if defined (MULTIMAX) || defined (n16)

#if defined (UMAXV)

  printf ("ns32k-encore-sysv\n"); exit (0);

#else

#if defined (CMU)

  printf ("ns32k-encore-mach\n"); exit (0);

#else

  printf ("ns32k-encore-bsd\n"); exit (0);

#endif

#endif

#endif



#if defined (__386BSD__)

  printf ("i386-pc-bsd\n"); exit (0);

#endif



#if defined (sequent)

#if defined (i386)

  printf ("i386-sequent-dynix\n"); exit (0);

#endif

#if defined (ns32000)

  printf ("ns32k-sequent-dynix\n"); exit (0);

#endif

#endif



#if defined (_SEQUENT_)

  struct utsname un;



  uname(&un);

  if (strncmp(un.version, "V2", 2) == 0) {

    printf ("i386-sequent-ptx2\n"); exit (0);

  }

  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */

    printf ("i386-sequent-ptx1\n"); exit (0);

  }

  printf ("i386-sequent-ptx\n"); exit (0);

#endif



#if defined (vax)

#if !defined (ultrix)

#include <sys/param.h>

#if defined (BSD)

#if BSD == 43

  printf ("vax-dec-bsd4.3\n"); exit (0);

#else

#if BSD == 199006

  printf ("vax-dec-bsd4.3reno\n"); exit (0);

#else

  printf ("vax-dec-bsd\n"); exit (0);

#endif

#endif

#else

  printf ("vax-dec-bsd\n"); exit (0);

#endif

#else

#if defined(_SIZE_T_) || defined(SIGLOST)

  struct utsname un;

  uname (&un);

  printf ("vax-dec-ultrix%s\n", un.release); exit (0);

#else

  printf ("vax-dec-ultrix\n"); exit (0);

#endif

#endif

#endif

#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)

#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)

#if defined(_SIZE_T_) || defined(SIGLOST)

  struct utsname *un;

  uname (&un);

  printf ("mips-dec-ultrix%s\n", un.release); exit (0);

#else

  printf ("mips-dec-ultrix\n"); exit (0);

#endif

#endif

#endif



#if defined (alliant) && defined (i860)

  printf ("i860-alliant-bsd\n"); exit (0);

#endif



  exit (1);

}

EOF



$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&

	{ echo "$SYSTEM_NAME"; exit; }



# Apollos put the system type in the environment.

test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }



echo "$0: unable to guess system type" >&2



case "$UNAME_MACHINE:$UNAME_SYSTEM" in

build/autoconf/config.sub

+29 −27
Original line number Diff line number Diff line 
#! /bin/sh

# Configuration validation subroutine script.

#   Copyright 1992-2018 Free Software Foundation, Inc.

#   Copyright 1992-2019 Free Software Foundation, Inc.



timestamp='2018-12-16'

timestamp='2019-06-30'



# 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 @@ Report bugs and patches to <config-patches@gnu.org>." 
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."
@@ -111,6 +111,7 @@ case $# in 
esac



# Split fields of configuration type

# shellcheck disable=SC2162

IFS="-" read field1 field2 field3 field4 <<EOF

$1

EOF
@@ -336,17 +337,14 @@ case $1 in 
				basic_machine=m88k-harris

				os=sysv3

				;;

			hp300)

			hp300 | hp300hpux)

				basic_machine=m68k-hp

				os=hpux

				;;

			hp300bsd)

				basic_machine=m68k-hp

				os=bsd

				;;

			hp300hpux)

				basic_machine=m68k-hp

				os=hpux

				;;

			hppaosf)

				basic_machine=hppa1.1-hp

				os=osf
@@ -359,10 +357,6 @@ case $1 in 
				basic_machine=i386-mach

				os=mach

				;;

			vsta)

				basic_machine=i386-pc

				os=vsta

				;;

			isi68 | isi)

				basic_machine=m68k-isi

				os=sysv
@@ -611,6 +605,10 @@ case $1 in 
				basic_machine=vax-dec

				os=vms

				;;

			vsta)

				basic_machine=i386-pc

				os=vsta

				;;

			vxworks960)

				basic_machine=i960-wrs

				os=vxworks
@@ -821,6 +819,8 @@ case $basic_machine in 
		cpu=m68k

		vendor=next

		case $os in

		    openstep*)

		        ;;

		    nextstep*)

			;;

		    ns2*)
@@ -918,6 +918,7 @@ case $basic_machine in 
		;;



	*-*)

		# shellcheck disable=SC2162

		IFS="-" read cpu vendor <<EOF

$basic_machine

EOF
@@ -1168,7 +1169,7 @@ case $cpu-$vendor in 
			| asmjs \

			| ba \

			| be32 | be64 \

			| bfin | bs2000 \

			| bfin | bpf | bs2000 \

			| c[123]* | c30 | [cjt]90 | c4x \

			| c8051 | clipper | craynv | csky | cydra \

			| d10v | d30v | dlx | dsp16xx \
@@ -1183,13 +1184,13 @@ case $cpu-$vendor in 
			| le32 | le64 \

			| lm32 \

			| m32c | m32r | m32rle \

			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \

			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \

			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \

			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \

			| m88110 | m88k | maxq | mb | mcore | mep | metag \

			| microblaze | microblazeel \

			| mips | mipsbe | mipseb | mipsel | mipsle \

			| mips16 \

			| mips64 | mips64el \

			| mips64 | mips64eb | mips64el \

			| mips64octeon | mips64octeonel \

			| mips64orion | mips64orionel \

			| mips64r5900 | mips64r5900el \
@@ -1216,11 +1217,12 @@ case $cpu-$vendor in 
			| nds32 | nds32le | nds32be \

			| nfp \

			| nios | nios2 | nios2eb | nios2el \

			| none | np1 | ns16k | ns32k \

			| none | np1 | ns16k | ns32k | nvptx \

			| open8 \

			| or1k* \

			| or32 \

			| orion \

			| picochip \

			| pdp10 | pdp11 | pj | pjl | pn | power \

			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \

			| pru \
@@ -1228,7 +1230,8 @@ case $cpu-$vendor in 
			| riscv | riscv32 | riscv64 \

			| rl78 | romp | rs6000 | rx \

			| score \

			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \

			| sh | shl \

			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \

			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \

			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \

			| sparclite \
@@ -1238,10 +1241,11 @@ case $cpu-$vendor in 
			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \

			| tron \

			| ubicom32 \

			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \

			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \

			| vax \

			| visium \

			| wasm32 \

			| w65 \

			| wasm32 | wasm64 \

			| we32k \

			| x86 | x86_64 | xc16x | xgate | xps100 \

			| xstormy16 | xtensa* \
@@ -1339,11 +1343,11 @@ case $os in 
	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \

	     | sym* | kopensolaris* | plan9* \

	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \

	     | aos* | aros* | cloudabi* | sortix* \

	     | aos* | aros* | cloudabi* | sortix* | twizzler* \

	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \

	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \

	     | knetbsd* | mirbsd* | netbsd* \

	     | bitrig* | openbsd* | solidbsd* | libertybsd* \

	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \

	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \

	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \

	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
@@ -1361,7 +1365,8 @@ case $os in 
	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \

	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \

	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \

	     | midnightbsd* | amdhsa* | unleashed*)

	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \

	     | nsk* | powerunix)

	# Remember, each alternative MUST END IN *, to match a version number.

		;;

	qnx*)
@@ -1445,9 +1450,6 @@ case $os in 
	ns2)

		os=nextstep2

		;;

	nsk*)

		os=nsk

		;;

	# Preserve the version number of sinix5.

	sinix5.*)

		os=`echo $os | sed -e 's|sinix|sysv|'`