mozilla-ppc64le-build.patch
branchfirefox29
changeset 723 2917b25ec806
parent 710 5341dc98d26c
equal deleted inserted replaced
722:71fc8d74b596 723:2917b25ec806
     1 # HG changeset patch
     1 # HG changeset patch
     2 # Parent 007cf000fdf7c5048939a87f63165a67fd9db5f6
     2 # Parent 8f66af6369d31e3952806faaa1f466a69d03f0eb
     3 # User Ulrich Weigand <uweigand@de.ibm.com>
     3 # User Ulrich Weigand <uweigand@de.ibm.com>
     4 Bug 976648 - powerpc64le-linux support - toplevel build/config
     4 Bug 976648 - powerpc64le-linux support - toplevel build/config
     5 
     5 
     6 diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess
     6 diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess
     7 --- a/build/autoconf/config.guess
     7 --- a/build/autoconf/config.guess
  1342  
  1342  
  1343  help="
  1343  help="
  1344  Try \`$me --help' for more information."
  1344  Try \`$me --help' for more information."
  1345  
  1345  
  1346  # Parse command line
  1346  # Parse command line
  1347 @@ -118,23 +110,28 @@ case $# in
  1347 @@ -118,20 +110,21 @@ case $# in
  1348   *) echo "$me: too many arguments$help" >&2
  1348   *) echo "$me: too many arguments$help" >&2
  1349      exit 1;;
  1349      exit 1;;
  1350  esac
  1350  esac
  1351  
  1351  
  1352  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
  1352  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
  1353  # Here we must recognize all the valid KERNEL-OS combinations.
  1353  # Here we must recognize all the valid KERNEL-OS combinations.
  1354  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  1354  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  1355  case $maybe_os in
  1355  case $maybe_os in
  1356 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  1356 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  1357 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  1357 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  1358 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  1358 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | \
  1359 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  1359 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  1360 +  knetbsd*-gnu* | netbsd*-gnu* | \
  1360 +  knetbsd*-gnu* | netbsd*-gnu* | \
  1361    kopensolaris*-gnu* | \
  1361    kopensolaris*-gnu* | \
  1362 -  storm-chaos* | os2-emx* | rtmk-nova* | wince-winmo*)
  1362 -  storm-chaos* | os2-emx* | rtmk-nova* | wince-winmo*)
  1363 +  storm-chaos* | os2-emx* | rtmk-nova*)
  1363 +  storm-chaos* | os2-emx* | rtmk-nova*)
  1364      os=-$maybe_os
  1364      os=-$maybe_os
  1365      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
  1365      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
  1366      ;;
  1366      ;;
  1367 +  android-linux)
       
  1368 +    os=-linux-android
       
  1369 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
       
  1370 +    ;;
       
  1371    *)
  1367    *)
  1372      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
  1368      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
  1373      if [ $basic_machine != $1 ]
  1369      if [ $basic_machine != $1 ]
  1374      then os=`echo $1 | sed 's/.*-/-/'`
  1370      then os=`echo $1 | sed 's/.*-/-/'`
  1375      else os=; fi
  1371      else os=; fi
  1376      ;;
  1372 @@ -147,41 +140,41 @@ case $os in
  1377  esac
       
  1378  
       
  1379 @@ -147,41 +144,41 @@ case $os in
       
  1380  		# Prevent following clause from handling this invalid input.
  1373  		# Prevent following clause from handling this invalid input.
  1381  		;;
  1374  		;;
  1382  	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
  1375  	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
  1383  	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
  1376  	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
  1384  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  1377  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  1422  	-sco6)
  1415  	-sco6)
  1423  		os=-sco5v6
  1416  		os=-sco5v6
  1424  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  1417  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  1425  		;;
  1418  		;;
  1426  	-sco5)
  1419  	-sco5)
  1427 @@ -216,16 +213,22 @@ case $os in
  1420 @@ -216,16 +209,22 @@ case $os in
  1428  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  1421  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  1429  		;;
  1422  		;;
  1430  	-clix*)
  1423  	-clix*)
  1431  		basic_machine=clipper-intergraph
  1424  		basic_machine=clipper-intergraph
  1432  		;;
  1425  		;;
  1445  	-ptx*)
  1438  	-ptx*)
  1446  		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
  1439  		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
  1447  		;;
  1440  		;;
  1448  	-windowsnt*)
  1441  	-windowsnt*)
  1449  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  1442  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  1450 @@ -240,30 +243,38 @@ case $os in
  1443 @@ -240,30 +239,38 @@ case $os in
  1451  esac
  1444  esac
  1452  
  1445  
  1453  # Decode aliases for certain CPU-COMPANY combinations.
  1446  # Decode aliases for certain CPU-COMPANY combinations.
  1454  case $basic_machine in
  1447  case $basic_machine in
  1455  	# Recognize the basic CPU types without company name.
  1448  	# Recognize the basic CPU types without company name.
  1487  	| mips64octeon | mips64octeonel \
  1480  	| mips64octeon | mips64octeonel \
  1488  	| mips64orion | mips64orionel \
  1481  	| mips64orion | mips64orionel \
  1489  	| mips64r5900 | mips64r5900el \
  1482  	| mips64r5900 | mips64r5900el \
  1490  	| mips64vr | mips64vrel \
  1483  	| mips64vr | mips64vrel \
  1491  	| mips64vr4100 | mips64vr4100el \
  1484  	| mips64vr4100 | mips64vr4100el \
  1492 @@ -271,84 +282,118 @@ case $basic_machine in
  1485 @@ -271,84 +278,118 @@ case $basic_machine in
  1493  	| mips64vr5000 | mips64vr5000el \
  1486  	| mips64vr5000 | mips64vr5000el \
  1494  	| mips64vr5900 | mips64vr5900el \
  1487  	| mips64vr5900 | mips64vr5900el \
  1495  	| mipsisa32 | mipsisa32el \
  1488  	| mipsisa32 | mipsisa32el \
  1496  	| mipsisa32r2 | mipsisa32r2el \
  1489  	| mipsisa32r2 | mipsisa32r2el \
  1497  	| mipsisa64 | mipsisa64el \
  1490  	| mipsisa64 | mipsisa64el \
  1619  	| mips64octeon-* | mips64octeonel-* \
  1612  	| mips64octeon-* | mips64octeonel-* \
  1620  	| mips64orion-* | mips64orionel-* \
  1613  	| mips64orion-* | mips64orionel-* \
  1621  	| mips64r5900-* | mips64r5900el-* \
  1614  	| mips64r5900-* | mips64r5900el-* \
  1622  	| mips64vr-* | mips64vrel-* \
  1615  	| mips64vr-* | mips64vrel-* \
  1623  	| mips64vr4100-* | mips64vr4100el-* \
  1616  	| mips64vr4100-* | mips64vr4100el-* \
  1624 @@ -356,38 +401,44 @@ case $basic_machine in
  1617 @@ -356,38 +397,44 @@ case $basic_machine in
  1625  	| mips64vr5000-* | mips64vr5000el-* \
  1618  	| mips64vr5000-* | mips64vr5000el-* \
  1626  	| mips64vr5900-* | mips64vr5900el-* \
  1619  	| mips64vr5900-* | mips64vr5900el-* \
  1627  	| mipsisa32-* | mipsisa32el-* \
  1620  	| mipsisa32-* | mipsisa32el-* \
  1628  	| mipsisa32r2-* | mipsisa32r2el-* \
  1621  	| mipsisa32r2-* | mipsisa32r2el-* \
  1629  	| mipsisa64-* | mipsisa64el-* \
  1622  	| mipsisa64-* | mipsisa64el-* \
  1672  		;;
  1665  		;;
  1673  	# Recognize the basic CPU types without company name, with glob match.
  1666  	# Recognize the basic CPU types without company name, with glob match.
  1674  	xtensa*)
  1667  	xtensa*)
  1675  		basic_machine=$basic_machine-unknown
  1668  		basic_machine=$basic_machine-unknown
  1676  		;;
  1669  		;;
  1677 @@ -402,17 +453,17 @@ case $basic_machine in
  1670 @@ -402,17 +449,17 @@ case $basic_machine in
  1678  		;;
  1671  		;;
  1679  	3b*)
  1672  	3b*)
  1680  		basic_machine=we32k-att
  1673  		basic_machine=we32k-att
  1681  		;;
  1674  		;;
  1682  	a29khif)
  1675  	a29khif)
  1691  		basic_machine=m68010-adobe
  1684  		basic_machine=m68010-adobe
  1692  		os=-scout
  1685  		os=-scout
  1693  		;;
  1686  		;;
  1694  	alliant | fx80)
  1687  	alliant | fx80)
  1695  		basic_machine=fx80-alliant
  1688  		basic_machine=fx80-alliant
  1696 @@ -472,21 +523,30 @@ case $basic_machine in
  1689 @@ -472,21 +519,30 @@ case $basic_machine in
  1697  	blackfin-*)
  1690  	blackfin-*)
  1698  		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
  1691  		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
  1699  		os=-linux
  1692  		os=-linux
  1700  		;;
  1693  		;;
  1701  	bluegene*)
  1694  	bluegene*)
  1723  	convex-c1)
  1716  	convex-c1)
  1724  		basic_machine=c1-convex
  1717  		basic_machine=c1-convex
  1725  		os=-bsd
  1718  		os=-bsd
  1726  		;;
  1719  		;;
  1727  	convex-c2)
  1720  	convex-c2)
  1728 @@ -508,17 +568,17 @@ case $basic_machine in
  1721 @@ -508,17 +564,17 @@ case $basic_machine in
  1729  	cray | j90)
  1722  	cray | j90)
  1730  		basic_machine=j90-cray
  1723  		basic_machine=j90-cray
  1731  		os=-unicos
  1724  		os=-unicos
  1732  		;;
  1725  		;;
  1733  	craynv)
  1726  	craynv)
  1742  	crds | unos)
  1735  	crds | unos)
  1743  		basic_machine=m68k-crds
  1736  		basic_machine=m68k-crds
  1744  		;;
  1737  		;;
  1745  	crisv32 | crisv32-* | etraxfs*)
  1738  	crisv32 | crisv32-* | etraxfs*)
  1746  		basic_machine=crisv32-axis
  1739  		basic_machine=crisv32-axis
  1747 @@ -666,17 +726,16 @@ case $basic_machine in
  1740 @@ -666,17 +722,16 @@ case $basic_machine in
  1748  		;;
  1741  		;;
  1749  	hppro)
  1742  	hppro)
  1750  		basic_machine=hppa1.1-hp
  1743  		basic_machine=hppa1.1-hp
  1751  		os=-proelf
  1744  		os=-proelf
  1752  		;;
  1745  		;;
  1760  		;;
  1753  		;;
  1761  	i*86v4*)
  1754  	i*86v4*)
  1762  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  1755  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  1763  		os=-sysv4
  1756  		os=-sysv4
  1764  		;;
  1757  		;;
  1765 @@ -724,21 +783,25 @@ case $basic_machine in
  1758 @@ -724,21 +779,25 @@ case $basic_machine in
  1766  	magnum | m3230)
  1759  	magnum | m3230)
  1767  		basic_machine=mips-mips
  1760  		basic_machine=mips-mips
  1768  		os=-sysv
  1761  		os=-sysv
  1769  		;;
  1762  		;;
  1770  	merlin)
  1763  	merlin)
  1788  		basic_machine=arm-unknown
  1781  		basic_machine=arm-unknown
  1789  		os=-mingw32ce
  1782  		os=-mingw32ce
  1790  		;;
  1783  		;;
  1791  	miniframe)
  1784  	miniframe)
  1792  		basic_machine=m68000-convergent
  1785  		basic_machine=m68000-convergent
  1793 @@ -763,20 +826,28 @@ case $basic_machine in
  1786 @@ -763,20 +822,28 @@ case $basic_machine in
  1794  		;;
  1787  		;;
  1795  	msdos)
  1788  	msdos)
  1796  		basic_machine=i386-pc
  1789  		basic_machine=i386-pc
  1797  		os=-msdos
  1790  		os=-msdos
  1798  		;;
  1791  		;;
  1817  		;;
  1810  		;;
  1818  	netbsd386)
  1811  	netbsd386)
  1819  		basic_machine=i386-unknown
  1812  		basic_machine=i386-unknown
  1820  		os=-netbsd
  1813  		os=-netbsd
  1821  		;;
  1814  		;;
  1822 @@ -831,16 +902,22 @@ case $basic_machine in
  1815 @@ -831,16 +898,22 @@ case $basic_machine in
  1823  		;;
  1816  		;;
  1824  	nonstopux)
  1817  	nonstopux)
  1825  		basic_machine=mips-compaq
  1818  		basic_machine=mips-compaq
  1826  		os=-nonstopux
  1819  		os=-nonstopux
  1827  		;;
  1820  		;;
  1840  	op50n-* | op60c-*)
  1833  	op50n-* | op60c-*)
  1841  		basic_machine=hppa1.1-oki
  1834  		basic_machine=hppa1.1-oki
  1842  		os=-proelf
  1835  		os=-proelf
  1843  		;;
  1836  		;;
  1844  	openrisc | openrisc-*)
  1837  	openrisc | openrisc-*)
  1845 @@ -913,19 +990,20 @@ case $basic_machine in
  1838 @@ -913,19 +986,20 @@ case $basic_machine in
  1846  	pentium4-*)
  1839  	pentium4-*)
  1847  		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  1840  		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  1848  		;;
  1841  		;;
  1849  	pn)
  1842  	pn)
  1850  		basic_machine=pn-gould
  1843  		basic_machine=pn-gould
  1863  		;;
  1856  		;;
  1864  	ppcle-* | powerpclittle-*)
  1857  	ppcle-* | powerpclittle-*)
  1865  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  1858  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  1866  		;;
  1859  		;;
  1867  	ppc64)	basic_machine=powerpc64-unknown
  1860  	ppc64)	basic_machine=powerpc64-unknown
  1868 @@ -940,17 +1018,21 @@ case $basic_machine in
  1861 @@ -940,17 +1014,21 @@ case $basic_machine in
  1869  		;;
  1862  		;;
  1870  	ps2)
  1863  	ps2)
  1871  		basic_machine=i386-ibm
  1864  		basic_machine=i386-ibm
  1872  		;;
  1865  		;;
  1873  	pw32)
  1866  	pw32)
  1886  	rom68k)
  1879  	rom68k)
  1887  		basic_machine=m68k-rom68k
  1880  		basic_machine=m68k-rom68k
  1888  		os=-coff
  1881  		os=-coff
  1889  		;;
  1882  		;;
  1890  	rm[46]00)
  1883  	rm[46]00)
  1891 @@ -1009,16 +1091,19 @@ case $basic_machine in
  1884 @@ -1009,16 +1087,19 @@ case $basic_machine in
  1892  		;;
  1885  		;;
  1893  	st2000)
  1886  	st2000)
  1894  		basic_machine=m68k-tandem
  1887  		basic_machine=m68k-tandem
  1895  		;;
  1888  		;;
  1896  	stratus)
  1889  	stratus)
  1906  	sun2os3)
  1899  	sun2os3)
  1907  		basic_machine=m68000-sun
  1900  		basic_machine=m68000-sun
  1908  		os=-sunos3
  1901  		os=-sunos3
  1909  		;;
  1902  		;;
  1910  	sun2os4)
  1903  	sun2os4)
  1911 @@ -1065,30 +1150,18 @@ case $basic_machine in
  1904 @@ -1065,30 +1146,18 @@ case $basic_machine in
  1912  	t3e)
  1905  	t3e)
  1913  		basic_machine=alphaev5-cray
  1906  		basic_machine=alphaev5-cray
  1914  		os=-unicos
  1907  		os=-unicos
  1915  		;;
  1908  		;;
  1916  	t90)
  1909  	t90)
  1938  		basic_machine=mipstx39-unknown
  1931  		basic_machine=mipstx39-unknown
  1939  		;;
  1932  		;;
  1940  	tx39el)
  1933  	tx39el)
  1941  		basic_machine=mipstx39el-unknown
  1934  		basic_machine=mipstx39el-unknown
  1942  		;;
  1935  		;;
  1943 @@ -1148,16 +1221,19 @@ case $basic_machine in
  1936 @@ -1148,16 +1217,19 @@ case $basic_machine in
  1944  		;;
  1937  		;;
  1945  	xbox)
  1938  	xbox)
  1946  		basic_machine=i686-pc
  1939  		basic_machine=i686-pc
  1947  		os=-mingw32
  1940  		os=-mingw32
  1948  		;;
  1941  		;;
  1958  		;;
  1951  		;;
  1959  	z8k-*-coff)
  1952  	z8k-*-coff)
  1960  		basic_machine=z8k-unknown
  1953  		basic_machine=z8k-unknown
  1961  		os=-sim
  1954  		os=-sim
  1962  		;;
  1955  		;;
  1963 @@ -1245,19 +1321,22 @@ case $basic_machine in
  1956 @@ -1245,19 +1317,22 @@ case $basic_machine in
  1964  		;;
  1957  		;;
  1965  esac
  1958  esac
  1966  
  1959  
  1967  # Decode manufacturer-specific aliases for certain operating systems.
  1960  # Decode manufacturer-specific aliases for certain operating systems.
  1968  
  1961  
  1983  	-solaris)
  1976  	-solaris)
  1984  		os=-solaris2
  1977  		os=-solaris2
  1985  		;;
  1978  		;;
  1986  	-svr4*)
  1979  	-svr4*)
  1987  		os=-sysv4
  1980  		os=-sysv4
  1988 @@ -1269,39 +1348,40 @@ case $os in
  1981 @@ -1269,39 +1344,40 @@ case $os in
  1989  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  1982  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  1990  		;;
  1983  		;;
  1991  	# First accept the basic system types.
  1984  	# First accept the basic system types.
  1992  	# The portable systems comes first.
  1985  	# The portable systems comes first.
  1993  	# Each alternative MUST END IN A *, to match a version number.
  1986  	# Each alternative MUST END IN A *, to match a version number.
  2011  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  2004  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  2012  	      | -chorusos* | -chorusrdb* | -cegcc* \
  2005  	      | -chorusos* | -chorusrdb* | -cegcc* \
  2013 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  2006 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  2014 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  2007 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  2015 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  2008 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  2016 +	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
  2009 +	      | -mingw32* | -mingw64* | -linux-gnu* \
  2017 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  2010 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  2018  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  2011  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  2019  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  2012  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  2020  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  2013  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  2021  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  2014  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  2030  		case $basic_machine in
  2023  		case $basic_machine in
  2031  		    x86-* | i*86-*)
  2024  		    x86-* | i*86-*)
  2032  			;;
  2025  			;;
  2033  		    *)
  2026  		    *)
  2034  			os=-nto$os
  2027  			os=-nto$os
  2035 @@ -1330,22 +1410,19 @@ case $os in
  2028 @@ -1330,22 +1406,19 @@ case $os in
  2036  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  2029  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  2037  		;;
  2030  		;;
  2038  	-sunos6*)
  2031  	-sunos6*)
  2039  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  2032  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  2040  		;;
  2033  		;;
  2054  	-osfrose*)
  2047  	-osfrose*)
  2055  		os=-osfrose
  2048  		os=-osfrose
  2056  		;;
  2049  		;;
  2057  	-osf*)
  2050  	-osf*)
  2058  		os=-osf
  2051  		os=-osf
  2059 @@ -1382,17 +1459,17 @@ case $os in
  2052 @@ -1382,17 +1455,17 @@ case $os in
  2060  		;;
  2053  		;;
  2061  	# Preserve the version number of sinix5.
  2054  	# Preserve the version number of sinix5.
  2062  	-sinix5.*)
  2055  	-sinix5.*)
  2063  		os=`echo $os | sed -e 's|sinix|sysv|'`
  2056  		os=`echo $os | sed -e 's|sinix|sysv|'`
  2064  		;;
  2057  		;;
  2073  		os=-sysv3
  2066  		os=-sysv3
  2074  		;;
  2067  		;;
  2075  	-oss*)
  2068  	-oss*)
  2076  		os=-sysv3
  2069  		os=-sysv3
  2077  		;;
  2070  		;;
  2078 @@ -1418,28 +1495,24 @@ case $os in
  2071 @@ -1418,28 +1491,27 @@ case $os in
  2079  		os=-xenix
  2072  		os=-xenix
  2080  		;;
  2073  		;;
  2081  	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  2074  	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  2082  		os=-mint
  2075  		os=-mint
  2083  		;;
  2076  		;;
  2091  		os=-zvmoe
  2084  		os=-zvmoe
  2092  		;;
  2085  		;;
  2093  	-dicos*)
  2086  	-dicos*)
  2094  		os=-dicos
  2087  		os=-dicos
  2095  		;;
  2088  		;;
  2096 -        -android*)
  2089          -android*)
  2097 -	        os=-android
  2090  	        os=-android
  2098 -                ;;
  2091                  ;;
  2099 +	-nacl*)
  2092 +	-nacl*)
  2100 +		;;
  2093 +		;;
  2101  	-none)
  2094  	-none)
  2102  		;;
  2095  		;;
  2103  	*)
  2096  	*)
  2104  		# Get rid of the `-' at the beginning of $os.
  2097  		# Get rid of the `-' at the beginning of $os.
  2105  		os=`echo $os | sed 's/[^-]*-//'`
  2098  		os=`echo $os | sed 's/[^-]*-//'`
  2106  		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  2099  		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  2107  		exit 1
  2100  		exit 1
  2108  		;;
  2101  		;;
  2109 @@ -1452,33 +1525,48 @@ else
  2102 @@ -1452,33 +1524,48 @@ else
  2110  
  2103  
  2111  # Note that if you're going to try to match "-MANUFACTURER" here (say,
  2104  # Note that if you're going to try to match "-MANUFACTURER" here (say,
  2112  # "-sun"), then you have to tell the case statement up towards the top
  2105  # "-sun"), then you have to tell the case statement up towards the top
  2113  # that MANUFACTURER isn't an operating system.  Otherwise, code above
  2106  # that MANUFACTURER isn't an operating system.  Otherwise, code above
  2114  # will signal an error saying that MANUFACTURER isn't an operating
  2107  # will signal an error saying that MANUFACTURER isn't an operating
  2157  		os=-tops20
  2150  		os=-tops20
  2158  		;;
  2151  		;;
  2159  	pdp11-*)
  2152  	pdp11-*)
  2160  		os=-none
  2153  		os=-none
  2161  		;;
  2154  		;;
  2162 @@ -1488,32 +1576,32 @@ case $basic_machine in
  2155 @@ -1488,32 +1575,32 @@ case $basic_machine in
  2163  	m68*-apollo)
  2156  	m68*-apollo)
  2164  		os=-domain
  2157  		os=-domain
  2165  		;;
  2158  		;;
  2166  	i386-sun)
  2159  	i386-sun)
  2167  		os=-sunos4.0.2
  2160  		os=-sunos4.0.2
  2194  	*-tti)	# must be before sparc entry or we get the wrong os.
  2187  	*-tti)	# must be before sparc entry or we get the wrong os.
  2195  		os=-sysv3
  2188  		os=-sysv3
  2196  		;;
  2189  		;;
  2197  	sparc-* | *-sun)
  2190  	sparc-* | *-sun)
  2198  		os=-sunos4.1.1
  2191  		os=-sunos4.1.1
  2199 @@ -1522,17 +1610,17 @@ case $basic_machine in
  2192 @@ -1522,17 +1609,17 @@ case $basic_machine in
  2200  		os=-beos
  2193  		os=-beos
  2201  		;;
  2194  		;;
  2202  	*-haiku)
  2195  	*-haiku)
  2203  		os=-haiku
  2196  		os=-haiku
  2204  		;;
  2197  		;;
  2213  		os=-proelf
  2206  		os=-proelf
  2214  		;;
  2207  		;;
  2215  	*-winbond)
  2208  	*-winbond)
  2216  		os=-proelf
  2209  		os=-proelf
  2217  		;;
  2210  		;;
  2218 @@ -1684,19 +1772,16 @@ case $basic_machine in
       
  2219  				vendor=apple
       
  2220  				;;
       
  2221  			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
       
  2222  				vendor=atari
       
  2223  				;;
       
  2224  			-vos*)
       
  2225  				vendor=stratus
       
  2226  				;;
       
  2227 -			*-android*|*-linuxandroid*)
       
  2228 -				vendor=linux-
       
  2229 -				;;
       
  2230  		esac
       
  2231  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
       
  2232  		;;
       
  2233  esac
       
  2234  
       
  2235  echo $basic_machine$os
       
  2236  exit
       
  2237  
       
  2238 diff --git a/configure.in b/configure.in
  2211 diff --git a/configure.in b/configure.in
  2239 --- a/configure.in
  2212 --- a/configure.in
  2240 +++ b/configure.in
  2213 +++ b/configure.in
  2241 @@ -1082,17 +1082,17 @@ esac
  2214 @@ -1121,17 +1121,17 @@ esac
  2242  
  2215  
  2243  # Only set CPU_ARCH if we recognize the value of OS_TEST
  2216  # Only set CPU_ARCH if we recognize the value of OS_TEST
  2244  
  2217  
  2245  case "$OS_TEST" in
  2218  case "$OS_TEST" in
  2246  *86 | i86pc)
  2219  *86 | i86pc)
  2255  powerpc | ppc | rs6000)
  2228  powerpc | ppc | rs6000)
  2256      CPU_ARCH=ppc
  2229      CPU_ARCH=ppc
  2257      ;;
  2230      ;;
  2258  
  2231  
  2259  Alpha | alpha | ALPHA)
  2232  Alpha | alpha | ALPHA)
  2260 diff --git a/js/src/build/autoconf/config.guess b/js/src/build/autoconf/config.guess
       
  2261 --- a/js/src/build/autoconf/config.guess
       
  2262 +++ b/js/src/build/autoconf/config.guess
       
  2263 @@ -1,47 +1,41 @@
       
  2264  #! /bin/sh
       
  2265  # Attempt to guess a canonical system name.
       
  2266 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
       
  2267 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
       
  2268 -#   Free Software Foundation, Inc.
       
  2269 +#   Copyright 1992-2014 Free Software Foundation, Inc.
       
  2270  
       
  2271 -timestamp='2009-08-19'
       
  2272 +timestamp='2014-02-12'
       
  2273  
       
  2274  # This file is free software; you can redistribute it and/or modify it
       
  2275  # under the terms of the GNU General Public License as published by
       
  2276 -# the Free Software Foundation; either version 2 of the License, or
       
  2277 +# the Free Software Foundation; either version 3 of the License, or
       
  2278  # (at your option) any later version.
       
  2279  #
       
  2280  # This program is distributed in the hope that it will be useful, but
       
  2281  # WITHOUT ANY WARRANTY; without even the implied warranty of
       
  2282  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       
  2283  # General Public License for more details.
       
  2284  #
       
  2285  # You should have received a copy of the GNU General Public License
       
  2286 -# along with this program; if not, write to the Free Software
       
  2287 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
       
  2288 -# 02110-1301, USA.
       
  2289 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
       
  2290  #
       
  2291  # As a special exception to the GNU General Public License, if you
       
  2292  # distribute this file as part of a program that contains a
       
  2293  # configuration script generated by Autoconf, you may include it under
       
  2294 -# the same distribution terms that you use for the rest of that program.
       
  2295 -
       
  2296 -
       
  2297 -# Originally written by Per Bothner.  Please send patches (context
       
  2298 -# diff format) to <config-patches@gnu.org> and include a ChangeLog
       
  2299 -# entry.
       
  2300 +# the same distribution terms that you use for the rest of that
       
  2301 +# program.  This Exception is an additional permission under section 7
       
  2302 +# of the GNU General Public License, version 3 ("GPLv3").
       
  2303  #
       
  2304 -# This script attempts to guess a canonical system name similar to
       
  2305 -# config.sub.  If it succeeds, it prints the system name on stdout, and
       
  2306 -# exits with 0.  Otherwise, it exits with 1.
       
  2307 +# Originally written by Per Bothner.
       
  2308  #
       
  2309  # You can get the latest version of this script from:
       
  2310  # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
       
  2311 +#
       
  2312 +# Please send patches with a ChangeLog entry to config-patches@gnu.org.
       
  2313 +
       
  2314  
       
  2315  me=`echo "$0" | sed -e 's,.*/,,'`
       
  2316  
       
  2317  usage="\
       
  2318  Usage: $0 [OPTION]
       
  2319  
       
  2320  Output the configuration name of the system \`$me' is run on.
       
  2321  
       
  2322 @@ -51,18 +45,17 @@ Operation modes:
       
  2323    -v, --version      print version number, then exit
       
  2324  
       
  2325  Report bugs and patches to <config-patches@gnu.org>."
       
  2326  
       
  2327  version="\
       
  2328  GNU config.guess ($timestamp)
       
  2329  
       
  2330  Originally written by Per Bothner.
       
  2331 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
       
  2332 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
       
  2333 +Copyright 1992-2014 Free Software Foundation, Inc.
       
  2334  
       
  2335  This is free software; see the source for copying conditions.  There is NO
       
  2336  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
       
  2337  
       
  2338  help="
       
  2339  Try \`$me --help' for more information."
       
  2340  
       
  2341  # Parse command line
       
  2342 @@ -134,22 +127,43 @@ if (test -f /.attbin/uname) >/dev/null 2
       
  2343  	PATH=$PATH:/.attbin ; export PATH
       
  2344  fi
       
  2345  
       
  2346  UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
       
  2347  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
       
  2348  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
       
  2349  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
       
  2350  
       
  2351 +case "${UNAME_SYSTEM}" in
       
  2352 +Linux|GNU|GNU/*)
       
  2353 +	# If the system lacks a compiler, then just pick glibc.
       
  2354 +	# We could probably try harder.
       
  2355 +	LIBC=gnu
       
  2356 +
       
  2357 +	eval $set_cc_for_build
       
  2358 +	cat <<-EOF > $dummy.c
       
  2359 +	#include <features.h>
       
  2360 +	#if defined(__UCLIBC__)
       
  2361 +	LIBC=uclibc
       
  2362 +	#elif defined(__dietlibc__)
       
  2363 +	LIBC=dietlibc
       
  2364 +	#else
       
  2365 +	LIBC=gnu
       
  2366 +	#endif
       
  2367 +	EOF
       
  2368 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
       
  2369 +	;;
       
  2370 +esac
       
  2371 +
       
  2372  # Note: order is significant - the case branches are not exclusive.
       
  2373  
       
  2374  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
       
  2375      *:NetBSD:*:*)
       
  2376  	# NetBSD (nbsd) targets should (where applicable) match one or
       
  2377 -	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
       
  2378 +	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
       
  2379  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
       
  2380  	# switched to ELF, *-*-netbsd* would select the old
       
  2381  	# object file format.  This provides both forward
       
  2382  	# compatibility and a consistent mechanism for selecting the
       
  2383  	# object file format.
       
  2384  	#
       
  2385  	# Note: NetBSD doesn't particularly care about the vendor
       
  2386  	# portion of the name.  We always set it to "unknown".
       
  2387 @@ -175,17 +189,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2388  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
       
  2389  		    # Return netbsd for either.  FIX?
       
  2390  		    os=netbsd
       
  2391  		else
       
  2392  		    os=netbsdelf
       
  2393  		fi
       
  2394  		;;
       
  2395  	    *)
       
  2396 -	        os=netbsd
       
  2397 +		os=netbsd
       
  2398  		;;
       
  2399  	esac
       
  2400  	# The OS release
       
  2401  	# Debian GNU/NetBSD machines have a different userland, and
       
  2402  	# thus, need a distinct triplet. However, they do not need
       
  2403  	# kernel version information, so it can be replaced with a
       
  2404  	# suitable tag, in the style of linux-gnu.
       
  2405  	case "${UNAME_VERSION}" in
       
  2406 @@ -196,16 +210,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2407  		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
       
  2408  		;;
       
  2409  	esac
       
  2410  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
       
  2411  	# contains redundant information, the shorter form:
       
  2412  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
       
  2413  	echo "${machine}-${os}${release}"
       
  2414  	exit ;;
       
  2415 +    *:Bitrig:*:*)
       
  2416 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
       
  2417 +	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
       
  2418 +	exit ;;
       
  2419      *:OpenBSD:*:*)
       
  2420  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
       
  2421  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
       
  2422  	exit ;;
       
  2423      *:ekkoBSD:*:*)
       
  2424  	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
       
  2425  	exit ;;
       
  2426      *:SolidBSD:*:*)
       
  2427 @@ -218,17 +236,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2428  	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
       
  2429  	exit ;;
       
  2430      alpha:OSF1:*:*)
       
  2431  	case $UNAME_RELEASE in
       
  2432  	*4.0)
       
  2433  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
       
  2434  		;;
       
  2435  	*5.*)
       
  2436 -	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
       
  2437 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
       
  2438  		;;
       
  2439  	esac
       
  2440  	# According to Compaq, /usr/sbin/psrinfo has been available on
       
  2441  	# OSF/1 and Tru64 systems produced since 1995.  I hope that
       
  2442  	# covers most systems running today.  This code pipes the CPU
       
  2443  	# types through head -n 1, so we only detect the type of CPU 0.
       
  2444  	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
       
  2445  	case "$ALPHA_CPU_TYPE" in
       
  2446 @@ -264,17 +282,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2447  		UNAME_MACHINE="alphaev79" ;;
       
  2448  	esac
       
  2449  	# A Pn.n version is a patched version.
       
  2450  	# A Vn.n version is a released version.
       
  2451  	# A Tn.n version is a released field test version.
       
  2452  	# A Xn.n version is an unreleased experimental baselevel.
       
  2453  	# 1.2 uses "1.2" for uname -r.
       
  2454  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
       
  2455 -	exit ;;
       
  2456 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
       
  2457 +	exitcode=$?
       
  2458 +	trap '' 0
       
  2459 +	exit $exitcode ;;
       
  2460      Alpha\ *:Windows_NT*:*)
       
  2461  	# How do we know it's Interix rather than the generic POSIX subsystem?
       
  2462  	# Should we change UNAME_MACHINE based on the output of uname instead
       
  2463  	# of the specific Alpha model?
       
  2464  	echo alpha-pc-interix
       
  2465  	exit ;;
       
  2466      21064:Windows_NT:50:3)
       
  2467  	echo alpha-dec-winnt3.5
       
  2468 @@ -290,22 +311,22 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2469  	exit ;;
       
  2470      *:OS/390:*:*)
       
  2471  	echo i370-ibm-openedition
       
  2472  	exit ;;
       
  2473      *:z/VM:*:*)
       
  2474  	echo s390-ibm-zvmoe
       
  2475  	exit ;;
       
  2476      *:OS400:*:*)
       
  2477 -        echo powerpc-ibm-os400
       
  2478 +	echo powerpc-ibm-os400
       
  2479  	exit ;;
       
  2480      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
       
  2481  	echo arm-acorn-riscix${UNAME_RELEASE}
       
  2482  	exit ;;
       
  2483 -    arm:riscos:*:*|arm:RISCOS:*:*)
       
  2484 +    arm*:riscos:*:*|arm*:RISCOS:*:*)
       
  2485  	echo arm-unknown-riscos
       
  2486  	exit ;;
       
  2487      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
       
  2488  	echo hppa1.1-hitachi-hiuxmpp
       
  2489  	exit ;;
       
  2490      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
       
  2491  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
       
  2492  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
       
  2493 @@ -328,16 +349,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2494  	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
       
  2495  	exit ;;
       
  2496      sun4H:SunOS:5.*:*)
       
  2497  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
       
  2498  	exit ;;
       
  2499      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
       
  2500  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
       
  2501  	exit ;;
       
  2502 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
       
  2503 +	echo i386-pc-auroraux${UNAME_RELEASE}
       
  2504 +	exit ;;
       
  2505      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
       
  2506  	eval $set_cc_for_build
       
  2507  	SUN_ARCH="i386"
       
  2508  	# If there is a compiler, see if it is configured for 64-bit objects.
       
  2509  	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
       
  2510  	# This test works for both compilers.
       
  2511  	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
       
  2512  	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
       
  2513 @@ -386,33 +410,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
       
  2514      # can be virtually everything (everything which is not
       
  2515      # "atarist" or "atariste" at least should have a processor
       
  2516      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
       
  2517      # to the lowercase version "mint" (or "freemint").  Finally
       
  2518      # the system name "TOS" denotes a system which is actually not
       
  2519      # MiNT.  But MiNT is downward compatible to TOS, so this should
       
  2520      # be no problem.
       
  2521      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
       
  2522 -        echo m68k-atari-mint${UNAME_RELEASE}
       
  2523 +	echo m68k-atari-mint${UNAME_RELEASE}
       
  2524  	exit ;;
       
  2525      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
       
  2526  	echo m68k-atari-mint${UNAME_RELEASE}
       
  2527 -        exit ;;
       
  2528 +	exit ;;
       
  2529      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
       
  2530 -        echo m68k-atari-mint${UNAME_RELEASE}
       
  2531 +	echo m68k-atari-mint${UNAME_RELEASE}
       
  2532  	exit ;;
       
  2533      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
       
  2534 -        echo m68k-milan-mint${UNAME_RELEASE}
       
  2535 -        exit ;;
       
  2536 +	echo m68k-milan-mint${UNAME_RELEASE}
       
  2537 +	exit ;;
       
  2538      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
       
  2539 -        echo m68k-hades-mint${UNAME_RELEASE}
       
  2540 -        exit ;;
       
  2541 +	echo m68k-hades-mint${UNAME_RELEASE}
       
  2542 +	exit ;;
       
  2543      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
       
  2544 -        echo m68k-unknown-mint${UNAME_RELEASE}
       
  2545 -        exit ;;
       
  2546 +	echo m68k-unknown-mint${UNAME_RELEASE}
       
  2547 +	exit ;;
       
  2548      m68k:machten:*:*)
       
  2549  	echo m68k-apple-machten${UNAME_RELEASE}
       
  2550  	exit ;;
       
  2551      powerpc:machten:*:*)
       
  2552  	echo powerpc-apple-machten${UNAME_RELEASE}
       
  2553  	exit ;;
       
  2554      RISC*:Mach:*:*)
       
  2555  	echo mips-dec-mach_bsd4.3
       
  2556 @@ -472,31 +496,31 @@ EOF
       
  2557  	exit ;;
       
  2558      m88k:*:4*:R4*)
       
  2559  	echo m88k-motorola-sysv4
       
  2560  	exit ;;
       
  2561      m88k:*:3*:R3*)
       
  2562  	echo m88k-motorola-sysv3
       
  2563  	exit ;;
       
  2564      AViiON:dgux:*:*)
       
  2565 -        # DG/UX returns AViiON for all architectures
       
  2566 -        UNAME_PROCESSOR=`/usr/bin/uname -p`
       
  2567 +	# DG/UX returns AViiON for all architectures
       
  2568 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
       
  2569  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
       
  2570  	then
       
  2571  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
       
  2572  	       [ ${TARGET_BINARY_INTERFACE}x = x ]
       
  2573  	    then
       
  2574  		echo m88k-dg-dgux${UNAME_RELEASE}
       
  2575  	    else
       
  2576  		echo m88k-dg-dguxbcs${UNAME_RELEASE}
       
  2577  	    fi
       
  2578  	else
       
  2579  	    echo i586-dg-dgux${UNAME_RELEASE}
       
  2580  	fi
       
  2581 - 	exit ;;
       
  2582 +	exit ;;
       
  2583      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
       
  2584  	echo m88k-dolphin-sysv3
       
  2585  	exit ;;
       
  2586      M88*:*:R3*:*)
       
  2587  	# Delta 88k system running SVR3
       
  2588  	echo m88k-motorola-sysv3
       
  2589  	exit ;;
       
  2590      XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
       
  2591 @@ -543,17 +567,17 @@ EOF
       
  2592  			echo rs6000-ibm-aix3.2.5
       
  2593  		fi
       
  2594  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
       
  2595  		echo rs6000-ibm-aix3.2.4
       
  2596  	else
       
  2597  		echo rs6000-ibm-aix3.2
       
  2598  	fi
       
  2599  	exit ;;
       
  2600 -    *:AIX:*:[456])
       
  2601 +    *:AIX:*:[4567])
       
  2602  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
       
  2603  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
       
  2604  		IBM_ARCH=rs6000
       
  2605  	else
       
  2606  		IBM_ARCH=powerpc
       
  2607  	fi
       
  2608  	if [ -x /usr/bin/oslevel ] ; then
       
  2609  		IBM_REV=`/usr/bin/oslevel`
       
  2610 @@ -586,62 +610,62 @@ EOF
       
  2611      9000/[34678]??:HP-UX:*:*)
       
  2612  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
       
  2613  	case "${UNAME_MACHINE}" in
       
  2614  	    9000/31? )            HP_ARCH=m68000 ;;
       
  2615  	    9000/[34]?? )         HP_ARCH=m68k ;;
       
  2616  	    9000/[678][0-9][0-9])
       
  2617  		if [ -x /usr/bin/getconf ]; then
       
  2618  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
       
  2619 -                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
       
  2620 -                    case "${sc_cpu_version}" in
       
  2621 -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
       
  2622 -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
       
  2623 -                      532)                      # CPU_PA_RISC2_0
       
  2624 -                        case "${sc_kernel_bits}" in
       
  2625 -                          32) HP_ARCH="hppa2.0n" ;;
       
  2626 -                          64) HP_ARCH="hppa2.0w" ;;
       
  2627 +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
       
  2628 +		    case "${sc_cpu_version}" in
       
  2629 +		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
       
  2630 +		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
       
  2631 +		      532)                      # CPU_PA_RISC2_0
       
  2632 +			case "${sc_kernel_bits}" in
       
  2633 +			  32) HP_ARCH="hppa2.0n" ;;
       
  2634 +			  64) HP_ARCH="hppa2.0w" ;;
       
  2635  			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
       
  2636 -                        esac ;;
       
  2637 -                    esac
       
  2638 +			esac ;;
       
  2639 +		    esac
       
  2640  		fi
       
  2641  		if [ "${HP_ARCH}" = "" ]; then
       
  2642  		    eval $set_cc_for_build
       
  2643 -		    sed 's/^              //' << EOF >$dummy.c
       
  2644 +		    sed 's/^		//' << EOF >$dummy.c
       
  2645  
       
  2646 -              #define _HPUX_SOURCE
       
  2647 -              #include <stdlib.h>
       
  2648 -              #include <unistd.h>
       
  2649 +		#define _HPUX_SOURCE
       
  2650 +		#include <stdlib.h>
       
  2651 +		#include <unistd.h>
       
  2652  
       
  2653 -              int main ()
       
  2654 -              {
       
  2655 -              #if defined(_SC_KERNEL_BITS)
       
  2656 -                  long bits = sysconf(_SC_KERNEL_BITS);
       
  2657 -              #endif
       
  2658 -                  long cpu  = sysconf (_SC_CPU_VERSION);
       
  2659 +		int main ()
       
  2660 +		{
       
  2661 +		#if defined(_SC_KERNEL_BITS)
       
  2662 +		    long bits = sysconf(_SC_KERNEL_BITS);
       
  2663 +		#endif
       
  2664 +		    long cpu  = sysconf (_SC_CPU_VERSION);
       
  2665  
       
  2666 -                  switch (cpu)
       
  2667 -              	{
       
  2668 -              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
       
  2669 -              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
       
  2670 -              	case CPU_PA_RISC2_0:
       
  2671 -              #if defined(_SC_KERNEL_BITS)
       
  2672 -              	    switch (bits)
       
  2673 -              		{
       
  2674 -              		case 64: puts ("hppa2.0w"); break;
       
  2675 -              		case 32: puts ("hppa2.0n"); break;
       
  2676 -              		default: puts ("hppa2.0"); break;
       
  2677 -              		} break;
       
  2678 -              #else  /* !defined(_SC_KERNEL_BITS) */
       
  2679 -              	    puts ("hppa2.0"); break;
       
  2680 -              #endif
       
  2681 -              	default: puts ("hppa1.0"); break;
       
  2682 -              	}
       
  2683 -                  exit (0);
       
  2684 -              }
       
  2685 +		    switch (cpu)
       
  2686 +			{
       
  2687 +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
       
  2688 +			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
       
  2689 +			case CPU_PA_RISC2_0:
       
  2690 +		#if defined(_SC_KERNEL_BITS)
       
  2691 +			    switch (bits)
       
  2692 +				{
       
  2693 +				case 64: puts ("hppa2.0w"); break;
       
  2694 +				case 32: puts ("hppa2.0n"); break;
       
  2695 +				default: puts ("hppa2.0"); break;
       
  2696 +				} break;
       
  2697 +		#else  /* !defined(_SC_KERNEL_BITS) */
       
  2698 +			    puts ("hppa2.0"); break;
       
  2699 +		#endif
       
  2700 +			default: puts ("hppa1.0"); break;
       
  2701 +			}
       
  2702 +		    exit (0);
       
  2703 +		}
       
  2704  EOF
       
  2705  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
       
  2706  		    test -z "$HP_ARCH" && HP_ARCH=hppa
       
  2707  		fi ;;
       
  2708  	esac
       
  2709  	if [ ${HP_ARCH} = "hppa2.0w" ]
       
  2710  	then
       
  2711  	    eval $set_cc_for_build
       
  2712 @@ -722,32 +746,32 @@ EOF
       
  2713  	    echo ${UNAME_MACHINE}-unknown-osf1
       
  2714  	fi
       
  2715  	exit ;;
       
  2716      parisc*:Lites*:*:*)
       
  2717  	echo hppa1.1-hp-lites
       
  2718  	exit ;;
       
  2719      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
       
  2720  	echo c1-convex-bsd
       
  2721 -        exit ;;
       
  2722 +	exit ;;
       
  2723      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
       
  2724  	if getsysinfo -f scalar_acc
       
  2725  	then echo c32-convex-bsd
       
  2726  	else echo c2-convex-bsd
       
  2727  	fi
       
  2728 -        exit ;;
       
  2729 +	exit ;;
       
  2730      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
       
  2731  	echo c34-convex-bsd
       
  2732 -        exit ;;
       
  2733 +	exit ;;
       
  2734      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
       
  2735  	echo c38-convex-bsd
       
  2736 -        exit ;;
       
  2737 +	exit ;;
       
  2738      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
       
  2739  	echo c4-convex-bsd
       
  2740 -        exit ;;
       
  2741 +	exit ;;
       
  2742      CRAY*Y-MP:*:*:*)
       
  2743  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
       
  2744  	exit ;;
       
  2745      CRAY*[A-Z]90:*:*:*)
       
  2746  	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
       
  2747  	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
       
  2748  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
       
  2749  	      -e 's/\.[^.]*$/.X/'
       
  2750 @@ -761,63 +785,68 @@ EOF
       
  2751      CRAY*SV1:*:*:*)
       
  2752  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
       
  2753  	exit ;;
       
  2754      *:UNICOS/mp:*:*)
       
  2755  	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
       
  2756  	exit ;;
       
  2757      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
       
  2758  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
       
  2759 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
       
  2760 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
       
  2761 -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
       
  2762 -        exit ;;
       
  2763 +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
       
  2764 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
       
  2765 +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
       
  2766 +	exit ;;
       
  2767      5000:UNIX_System_V:4.*:*)
       
  2768 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
       
  2769 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
       
  2770 -        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
       
  2771 +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
       
  2772 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
       
  2773 +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
       
  2774  	exit ;;
       
  2775      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
       
  2776  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
       
  2777  	exit ;;
       
  2778      sparc*:BSD/OS:*:*)
       
  2779  	echo sparc-unknown-bsdi${UNAME_RELEASE}
       
  2780  	exit ;;
       
  2781      *:BSD/OS:*:*)
       
  2782  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
       
  2783  	exit ;;
       
  2784      *:FreeBSD:*:*)
       
  2785 -	case ${UNAME_MACHINE} in
       
  2786 -	    pc98)
       
  2787 -		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
       
  2788 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
       
  2789 +	case ${UNAME_PROCESSOR} in
       
  2790  	    amd64)
       
  2791  		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
       
  2792  	    *)
       
  2793 -		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
       
  2794 +		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
       
  2795  	esac
       
  2796  	exit ;;
       
  2797      i*:CYGWIN*:*)
       
  2798  	echo ${UNAME_MACHINE}-pc-cygwin
       
  2799  	exit ;;
       
  2800 +    *:MINGW64*:*)
       
  2801 +	echo ${UNAME_MACHINE}-pc-mingw64
       
  2802 +	exit ;;
       
  2803      *:MINGW*:*)
       
  2804  	echo ${UNAME_MACHINE}-pc-mingw32
       
  2805  	exit ;;
       
  2806 +    i*:MSYS*:*)
       
  2807 +	echo ${UNAME_MACHINE}-pc-msys
       
  2808 +	exit ;;
       
  2809      i*:windows32*:*)
       
  2810 -    	# uname -m includes "-pc" on this system.
       
  2811 -    	echo ${UNAME_MACHINE}-mingw32
       
  2812 +	# uname -m includes "-pc" on this system.
       
  2813 +	echo ${UNAME_MACHINE}-mingw32
       
  2814  	exit ;;
       
  2815      i*:PW*:*)
       
  2816  	echo ${UNAME_MACHINE}-pc-pw32
       
  2817  	exit ;;
       
  2818 -    *:Interix*:[3456]*)
       
  2819 -    	case ${UNAME_MACHINE} in
       
  2820 +    *:Interix*:*)
       
  2821 +	case ${UNAME_MACHINE} in
       
  2822  	    x86)
       
  2823  		echo i586-pc-interix${UNAME_RELEASE}
       
  2824  		exit ;;
       
  2825 -	    EM64T | authenticamd | genuineintel)
       
  2826 +	    authenticamd | genuineintel | EM64T)
       
  2827  		echo x86_64-unknown-interix${UNAME_RELEASE}
       
  2828  		exit ;;
       
  2829  	    IA64)
       
  2830  		echo ia64-unknown-interix${UNAME_RELEASE}
       
  2831  		exit ;;
       
  2832  	esac ;;
       
  2833      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
       
  2834  	echo i${UNAME_MACHINE}-pc-mks
       
  2835 @@ -840,55 +869,91 @@ EOF
       
  2836      p*:CYGWIN*:*)
       
  2837  	echo powerpcle-unknown-cygwin
       
  2838  	exit ;;
       
  2839      prep*:SunOS:5.*:*)
       
  2840  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
       
  2841  	exit ;;
       
  2842      *:GNU:*:*)
       
  2843  	# the GNU system
       
  2844 -	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
       
  2845 +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
       
  2846  	exit ;;
       
  2847      *:GNU/*:*:*)
       
  2848  	# other systems with GNU libc and userland
       
  2849 -	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
       
  2850 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
       
  2851  	exit ;;
       
  2852      i*86:Minix:*:*)
       
  2853  	echo ${UNAME_MACHINE}-pc-minix
       
  2854  	exit ;;
       
  2855 +    aarch64:Linux:*:*)
       
  2856 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2857 +	exit ;;
       
  2858 +    aarch64_be:Linux:*:*)
       
  2859 +	UNAME_MACHINE=aarch64_be
       
  2860 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2861 +	exit ;;
       
  2862 +    alpha:Linux:*:*)
       
  2863 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
       
  2864 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
       
  2865 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
       
  2866 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
       
  2867 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
       
  2868 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
       
  2869 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
       
  2870 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
       
  2871 +	esac
       
  2872 +	objdump --private-headers /bin/sh | grep -q ld.so.1
       
  2873 +	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
       
  2874 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2875 +	exit ;;
       
  2876 +    arc:Linux:*:* | arceb:Linux:*:*)
       
  2877 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2878 +	exit ;;
       
  2879      arm*:Linux:*:*)
       
  2880  	eval $set_cc_for_build
       
  2881  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
       
  2882  	    | grep -q __ARM_EABI__
       
  2883  	then
       
  2884 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  2885 +	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2886  	else
       
  2887 -	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
       
  2888 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
       
  2889 +		| grep -q __ARM_PCS_VFP
       
  2890 +	    then
       
  2891 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
       
  2892 +	    else
       
  2893 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
       
  2894 +	    fi
       
  2895  	fi
       
  2896  	exit ;;
       
  2897      avr32*:Linux:*:*)
       
  2898 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  2899 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2900  	exit ;;
       
  2901      cris:Linux:*:*)
       
  2902 -	echo cris-axis-linux-gnu
       
  2903 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
       
  2904  	exit ;;
       
  2905      crisv32:Linux:*:*)
       
  2906 -	echo crisv32-axis-linux-gnu
       
  2907 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
       
  2908  	exit ;;
       
  2909      frv:Linux:*:*)
       
  2910 -    	echo frv-unknown-linux-gnu
       
  2911 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2912 +	exit ;;
       
  2913 +    hexagon:Linux:*:*)
       
  2914 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2915 +	exit ;;
       
  2916 +    i*86:Linux:*:*)
       
  2917 +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
       
  2918  	exit ;;
       
  2919      ia64:Linux:*:*)
       
  2920 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  2921 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2922  	exit ;;
       
  2923      m32r*:Linux:*:*)
       
  2924 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  2925 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2926  	exit ;;
       
  2927      m68*:Linux:*:*)
       
  2928 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  2929 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2930  	exit ;;
       
  2931      mips:Linux:*:* | mips64:Linux:*:*)
       
  2932  	eval $set_cc_for_build
       
  2933  	sed 's/^	//' << EOF >$dummy.c
       
  2934  	#undef CPU
       
  2935  	#undef ${UNAME_MACHINE}
       
  2936  	#undef ${UNAME_MACHINE}el
       
  2937  	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
       
  2938 @@ -896,145 +961,87 @@ EOF
       
  2939  	#else
       
  2940  	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
       
  2941  	CPU=${UNAME_MACHINE}
       
  2942  	#else
       
  2943  	CPU=
       
  2944  	#endif
       
  2945  	#endif
       
  2946  EOF
       
  2947 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
       
  2948 -	    /^CPU/{
       
  2949 -		s: ::g
       
  2950 -		p
       
  2951 -	    }'`"
       
  2952 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
       
  2953 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
       
  2954 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
       
  2955  	;;
       
  2956 +    or1k:Linux:*:*)
       
  2957 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2958 +	exit ;;
       
  2959      or32:Linux:*:*)
       
  2960 -	echo or32-unknown-linux-gnu
       
  2961 -	exit ;;
       
  2962 -    ppc:Linux:*:*)
       
  2963 -	echo powerpc-unknown-linux-gnu
       
  2964 -	exit ;;
       
  2965 -    ppc64:Linux:*:*)
       
  2966 -	echo powerpc64-unknown-linux-gnu
       
  2967 -	exit ;;
       
  2968 -    alpha:Linux:*:*)
       
  2969 -	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
       
  2970 -	  EV5)   UNAME_MACHINE=alphaev5 ;;
       
  2971 -	  EV56)  UNAME_MACHINE=alphaev56 ;;
       
  2972 -	  PCA56) UNAME_MACHINE=alphapca56 ;;
       
  2973 -	  PCA57) UNAME_MACHINE=alphapca56 ;;
       
  2974 -	  EV6)   UNAME_MACHINE=alphaev6 ;;
       
  2975 -	  EV67)  UNAME_MACHINE=alphaev67 ;;
       
  2976 -	  EV68*) UNAME_MACHINE=alphaev68 ;;
       
  2977 -        esac
       
  2978 -	objdump --private-headers /bin/sh | grep -q ld.so.1
       
  2979 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
       
  2980 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
       
  2981 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  2982  	exit ;;
       
  2983      padre:Linux:*:*)
       
  2984 -	echo sparc-unknown-linux-gnu
       
  2985 +	echo sparc-unknown-linux-${LIBC}
       
  2986 +	exit ;;
       
  2987 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
       
  2988 +	echo hppa64-unknown-linux-${LIBC}
       
  2989  	exit ;;
       
  2990      parisc:Linux:*:* | hppa:Linux:*:*)
       
  2991  	# Look for CPU level
       
  2992  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
       
  2993 -	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
       
  2994 -	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
       
  2995 -	  *)    echo hppa-unknown-linux-gnu ;;
       
  2996 +	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
       
  2997 +	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
       
  2998 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
       
  2999  	esac
       
  3000  	exit ;;
       
  3001 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
       
  3002 -	echo hppa64-unknown-linux-gnu
       
  3003 +    ppc64:Linux:*:*)
       
  3004 +	echo powerpc64-unknown-linux-${LIBC}
       
  3005 +	exit ;;
       
  3006 +    ppc:Linux:*:*)
       
  3007 +	echo powerpc-unknown-linux-${LIBC}
       
  3008 +	exit ;;
       
  3009 +    ppc64le:Linux:*:*)
       
  3010 +	echo powerpc64le-unknown-linux-${LIBC}
       
  3011 +	exit ;;
       
  3012 +    ppcle:Linux:*:*)
       
  3013 +	echo powerpcle-unknown-linux-${LIBC}
       
  3014  	exit ;;
       
  3015      s390:Linux:*:* | s390x:Linux:*:*)
       
  3016 -	echo ${UNAME_MACHINE}-ibm-linux
       
  3017 +	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
       
  3018  	exit ;;
       
  3019      sh64*:Linux:*:*)
       
  3020 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  3021 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  3022  	exit ;;
       
  3023      sh*:Linux:*:*)
       
  3024 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  3025 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  3026  	exit ;;
       
  3027      sparc:Linux:*:* | sparc64:Linux:*:*)
       
  3028 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  3029 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  3030 +	exit ;;
       
  3031 +    tile*:Linux:*:*)
       
  3032 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  3033  	exit ;;
       
  3034      vax:Linux:*:*)
       
  3035 -	echo ${UNAME_MACHINE}-dec-linux-gnu
       
  3036 +	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
       
  3037  	exit ;;
       
  3038      x86_64:Linux:*:*)
       
  3039 -	echo x86_64-unknown-linux-gnu
       
  3040 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  3041  	exit ;;
       
  3042      xtensa*:Linux:*:*)
       
  3043 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
       
  3044 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
       
  3045  	exit ;;
       
  3046 -    i*86:Linux:*:*)
       
  3047 -	# The BFD linker knows what the default object file format is, so
       
  3048 -	# first see if it will tell us. cd to the root directory to prevent
       
  3049 -	# problems with other programs or directories called `ld' in the path.
       
  3050 -	# Set LC_ALL=C to ensure ld outputs messages in English.
       
  3051 -	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
       
  3052 -			 | sed -ne '/supported targets:/!d
       
  3053 -				    s/[ 	][ 	]*/ /g
       
  3054 -				    s/.*supported targets: *//
       
  3055 -				    s/ .*//
       
  3056 -				    p'`
       
  3057 -        case "$ld_supported_targets" in
       
  3058 -	  elf32-i386)
       
  3059 -		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
       
  3060 -		;;
       
  3061 -	esac
       
  3062 -	# Determine whether the default compiler is a.out or elf
       
  3063 -	eval $set_cc_for_build
       
  3064 -	sed 's/^	//' << EOF >$dummy.c
       
  3065 -	#include <features.h>
       
  3066 -	#ifdef __ELF__
       
  3067 -	# ifdef __GLIBC__
       
  3068 -	#  if __GLIBC__ >= 2
       
  3069 -	LIBC=gnu
       
  3070 -	#  else
       
  3071 -	LIBC=gnulibc1
       
  3072 -	#  endif
       
  3073 -	# else
       
  3074 -	LIBC=gnulibc1
       
  3075 -	# endif
       
  3076 -	#else
       
  3077 -	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
       
  3078 -	LIBC=gnu
       
  3079 -	#else
       
  3080 -	LIBC=gnuaout
       
  3081 -	#endif
       
  3082 -	#endif
       
  3083 -	#ifdef __dietlibc__
       
  3084 -	LIBC=dietlibc
       
  3085 -	#endif
       
  3086 -EOF
       
  3087 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
       
  3088 -	    /^LIBC/{
       
  3089 -		s: ::g
       
  3090 -		p
       
  3091 -	    }'`"
       
  3092 -	test x"${LIBC}" != x && {
       
  3093 -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
       
  3094 -		exit
       
  3095 -	}
       
  3096 -	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
       
  3097 -	;;
       
  3098      i*86:DYNIX/ptx:4*:*)
       
  3099  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
       
  3100  	# earlier versions are messed up and put the nodename in both
       
  3101  	# sysname and nodename.
       
  3102  	echo i386-sequent-sysv4
       
  3103  	exit ;;
       
  3104      i*86:UNIX_SV:4.2MP:2.*)
       
  3105 -        # Unixware is an offshoot of SVR4, but it has its own version
       
  3106 -        # number series starting with 2...
       
  3107 -        # I am not positive that other SVR4 systems won't match this,
       
  3108 +	# Unixware is an offshoot of SVR4, but it has its own version
       
  3109 +	# number series starting with 2...
       
  3110 +	# I am not positive that other SVR4 systems won't match this,
       
  3111  	# I just have to hope.  -- rms.
       
  3112 -        # Use sysv4.2uw... so that sysv4* matches it.
       
  3113 +	# Use sysv4.2uw... so that sysv4* matches it.
       
  3114  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
       
  3115  	exit ;;
       
  3116      i*86:OS/2:*:*)
       
  3117  	# If we were able to find `uname', then EMX Unix compatibility
       
  3118  	# is probably installed.
       
  3119  	echo ${UNAME_MACHINE}-pc-os2-emx
       
  3120  	exit ;;
       
  3121      i*86:XTS-300:*:STOP)
       
  3122 @@ -1056,17 +1063,17 @@ EOF
       
  3123  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
       
  3124  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
       
  3125  		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
       
  3126  	else
       
  3127  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
       
  3128  	fi
       
  3129  	exit ;;
       
  3130      i*86:*:5:[678]*)
       
  3131 -    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
       
  3132 +	# UnixWare 7.x, OpenUNIX and OpenServer 6.
       
  3133  	case `/bin/uname -X | grep "^Machine"` in
       
  3134  	    *486*)	     UNAME_MACHINE=i486 ;;
       
  3135  	    *Pentium)	     UNAME_MACHINE=i586 ;;
       
  3136  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
       
  3137  	esac
       
  3138  	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
       
  3139  	exit ;;
       
  3140      i*86:*:3.2:*)
       
  3141 @@ -1084,23 +1091,23 @@ EOF
       
  3142  			&& UNAME_MACHINE=i686
       
  3143  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
       
  3144  	else
       
  3145  		echo ${UNAME_MACHINE}-pc-sysv32
       
  3146  	fi
       
  3147  	exit ;;
       
  3148      pc:*:*:*)
       
  3149  	# Left here for compatibility:
       
  3150 -        # uname -m prints for DJGPP always 'pc', but it prints nothing about
       
  3151 -        # the processor, so we play safe by assuming i586.
       
  3152 +	# uname -m prints for DJGPP always 'pc', but it prints nothing about
       
  3153 +	# the processor, so we play safe by assuming i586.
       
  3154  	# Note: whatever this is, it MUST be the same as what config.sub
       
  3155  	# prints for the "djgpp" host, or else GDB configury will decide that
       
  3156  	# this is a cross-build.
       
  3157  	echo i586-pc-msdosdjgpp
       
  3158 -        exit ;;
       
  3159 +	exit ;;
       
  3160      Intel:Mach:3*:*)
       
  3161  	echo i386-pc-mach3
       
  3162  	exit ;;
       
  3163      paragon:*:*:*)
       
  3164  	echo i860-intel-osf1
       
  3165  	exit ;;
       
  3166      i860:*:4.*:*) # i860-SVR4
       
  3167  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
       
  3168 @@ -1125,18 +1132,18 @@ EOF
       
  3169  	OS_REL=''
       
  3170  	test -r /etc/.relid \
       
  3171  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
       
  3172  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
       
  3173  	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
       
  3174  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
       
  3175  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
       
  3176      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
       
  3177 -        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
       
  3178 -          && { echo i486-ncr-sysv4; exit; } ;;
       
  3179 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
       
  3180 +	  && { echo i486-ncr-sysv4; exit; } ;;
       
  3181      NCR*:*:4.2:* | MPRAS*:*:4.2:*)
       
  3182  	OS_REL='.3'
       
  3183  	test -r /etc/.relid \
       
  3184  	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
       
  3185  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
       
  3186  	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
       
  3187  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
       
  3188  	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
       
  3189 @@ -1169,20 +1176,20 @@ EOF
       
  3190      *:SINIX-*:*:*)
       
  3191  	if uname -p 2>/dev/null >/dev/null ; then
       
  3192  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
       
  3193  		echo ${UNAME_MACHINE}-sni-sysv4
       
  3194  	else
       
  3195  		echo ns32k-sni-sysv
       
  3196  	fi
       
  3197  	exit ;;
       
  3198 -    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
       
  3199 -                      # says <Richard.M.Bartel@ccMail.Census.GOV>
       
  3200 -        echo i586-unisys-sysv4
       
  3201 -        exit ;;
       
  3202 +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
       
  3203 +			# says <Richard.M.Bartel@ccMail.Census.GOV>
       
  3204 +	echo i586-unisys-sysv4
       
  3205 +	exit ;;
       
  3206      *:UNIX_System_V:4*:FTX*)
       
  3207  	# From Gerald Hewes <hewes@openmarket.com>.
       
  3208  	# How about differentiating between stratus architectures? -djm
       
  3209  	echo hppa1.1-stratus-sysv4
       
  3210  	exit ;;
       
  3211      *:*:*:FTX*)
       
  3212  	# From seanf@swdc.stratus.com.
       
  3213  	echo i860-stratus-sysv4
       
  3214 @@ -1198,33 +1205,36 @@ EOF
       
  3215      mc68*:A/UX:*:*)
       
  3216  	echo m68k-apple-aux${UNAME_RELEASE}
       
  3217  	exit ;;
       
  3218      news*:NEWS-OS:6*:*)
       
  3219  	echo mips-sony-newsos6
       
  3220  	exit ;;
       
  3221      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
       
  3222  	if [ -d /usr/nec ]; then
       
  3223 -	        echo mips-nec-sysv${UNAME_RELEASE}
       
  3224 +		echo mips-nec-sysv${UNAME_RELEASE}
       
  3225  	else
       
  3226 -	        echo mips-unknown-sysv${UNAME_RELEASE}
       
  3227 +		echo mips-unknown-sysv${UNAME_RELEASE}
       
  3228  	fi
       
  3229 -        exit ;;
       
  3230 +	exit ;;
       
  3231      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
       
  3232  	echo powerpc-be-beos
       
  3233  	exit ;;
       
  3234      BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
       
  3235  	echo powerpc-apple-beos
       
  3236  	exit ;;
       
  3237      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
       
  3238  	echo i586-pc-beos
       
  3239  	exit ;;
       
  3240      BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
       
  3241  	echo i586-pc-haiku
       
  3242  	exit ;;
       
  3243 +    x86_64:Haiku:*:*)
       
  3244 +	echo x86_64-unknown-haiku
       
  3245 +	exit ;;
       
  3246      SX-4:SUPER-UX:*:*)
       
  3247  	echo sx4-nec-superux${UNAME_RELEASE}
       
  3248  	exit ;;
       
  3249      SX-5:SUPER-UX:*:*)
       
  3250  	echo sx5-nec-superux${UNAME_RELEASE}
       
  3251  	exit ;;
       
  3252      SX-6:SUPER-UX:*:*)
       
  3253  	echo sx6-nec-superux${UNAME_RELEASE}
       
  3254 @@ -1241,37 +1251,58 @@ EOF
       
  3255      Power*:Rhapsody:*:*)
       
  3256  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
       
  3257  	exit ;;
       
  3258      *:Rhapsody:*:*)
       
  3259  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
       
  3260  	exit ;;
       
  3261      *:Darwin:*:*)
       
  3262  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
       
  3263 -	case $UNAME_PROCESSOR in
       
  3264 -	    i386) eval $set_cc_for_build
       
  3265 -	          if $CC_FOR_BUILD -E -dM -x c /dev/null | grep __LP64__>/dev/null 2>&1 ; then
       
  3266 -	            UNAME_PROCESSOR=x86_64
       
  3267 -	          fi ;;
       
  3268 -	    unknown) UNAME_PROCESSOR=powerpc ;;
       
  3269 -	esac
       
  3270 +	eval $set_cc_for_build
       
  3271 +	if test "$UNAME_PROCESSOR" = unknown ; then
       
  3272 +	    UNAME_PROCESSOR=powerpc
       
  3273 +	fi
       
  3274 +	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
       
  3275 +	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
       
  3276 +		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
       
  3277 +		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
       
  3278 +		    grep IS_64BIT_ARCH >/dev/null
       
  3279 +		then
       
  3280 +		    case $UNAME_PROCESSOR in
       
  3281 +			i386) UNAME_PROCESSOR=x86_64 ;;
       
  3282 +			powerpc) UNAME_PROCESSOR=powerpc64 ;;
       
  3283 +		    esac
       
  3284 +		fi
       
  3285 +	    fi
       
  3286 +	elif test "$UNAME_PROCESSOR" = i386 ; then
       
  3287 +	    # Avoid executing cc on OS X 10.9, as it ships with a stub
       
  3288 +	    # that puts up a graphical alert prompting to install
       
  3289 +	    # developer tools.  Any system running Mac OS X 10.7 or
       
  3290 +	    # later (Darwin 11 and later) is required to have a 64-bit
       
  3291 +	    # processor. This is not true of the ARM version of Darwin
       
  3292 +	    # that Apple uses in portable devices.
       
  3293 +	    UNAME_PROCESSOR=x86_64
       
  3294 +	fi
       
  3295  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
       
  3296  	exit ;;
       
  3297      *:procnto*:*:* | *:QNX:[0123456789]*:*)
       
  3298  	UNAME_PROCESSOR=`uname -p`
       
  3299  	if test "$UNAME_PROCESSOR" = "x86"; then
       
  3300  		UNAME_PROCESSOR=i386
       
  3301  		UNAME_MACHINE=pc
       
  3302  	fi
       
  3303  	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
       
  3304  	exit ;;
       
  3305      *:QNX:*:4*)
       
  3306  	echo i386-pc-qnx
       
  3307  	exit ;;
       
  3308 -    NSE-?:NONSTOP_KERNEL:*:*)
       
  3309 +    NEO-?:NONSTOP_KERNEL:*:*)
       
  3310 +	echo neo-tandem-nsk${UNAME_RELEASE}
       
  3311 +	exit ;;
       
  3312 +    NSE-*:NONSTOP_KERNEL:*:*)
       
  3313  	echo nse-tandem-nsk${UNAME_RELEASE}
       
  3314  	exit ;;
       
  3315      NSR-?:NONSTOP_KERNEL:*:*)
       
  3316  	echo nsr-tandem-nsk${UNAME_RELEASE}
       
  3317  	exit ;;
       
  3318      *:NonStop-UX:*:*)
       
  3319  	echo mips-compaq-nonstopux
       
  3320  	exit ;;
       
  3321 @@ -1306,23 +1337,23 @@ EOF
       
  3322  	exit ;;
       
  3323      *:TOPS-20:*:*)
       
  3324  	echo pdp10-unknown-tops20
       
  3325  	exit ;;
       
  3326      *:ITS:*:*)
       
  3327  	echo pdp10-unknown-its
       
  3328  	exit ;;
       
  3329      SEI:*:*:SEIUX)
       
  3330 -        echo mips-sei-seiux${UNAME_RELEASE}
       
  3331 +	echo mips-sei-seiux${UNAME_RELEASE}
       
  3332  	exit ;;
       
  3333      *:DragonFly:*:*)
       
  3334  	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
       
  3335  	exit ;;
       
  3336      *:*VMS:*:*)
       
  3337 -    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
       
  3338 +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
       
  3339  	case "${UNAME_MACHINE}" in
       
  3340  	    A*) echo alpha-dec-vms ; exit ;;
       
  3341  	    I*) echo ia64-dec-vms ; exit ;;
       
  3342  	    V*) echo vax-dec-vms ; exit ;;
       
  3343  	esac ;;
       
  3344      *:XENIX:*:SysV)
       
  3345  	echo i386-pc-xenix
       
  3346  	exit ;;
       
  3347 @@ -1330,169 +1361,21 @@ EOF
       
  3348  	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
       
  3349  	exit ;;
       
  3350      i*86:rdos:*:*)
       
  3351  	echo ${UNAME_MACHINE}-pc-rdos
       
  3352  	exit ;;
       
  3353      i*86:AROS:*:*)
       
  3354  	echo ${UNAME_MACHINE}-pc-aros
       
  3355  	exit ;;
       
  3356 +    x86_64:VMkernel:*:*)
       
  3357 +	echo ${UNAME_MACHINE}-unknown-esx
       
  3358 +	exit ;;
       
  3359  esac
       
  3360  
       
  3361 -#echo '(No uname command or uname output not recognized.)' 1>&2
       
  3362 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
       
  3363 -
       
  3364 -eval $set_cc_for_build
       
  3365 -cat >$dummy.c <<EOF
       
  3366 -#ifdef _SEQUENT_
       
  3367 -# include <sys/types.h>
       
  3368 -# include <sys/utsname.h>
       
  3369 -#endif
       
  3370 -main ()
       
  3371 -{
       
  3372 -#if defined (sony)
       
  3373 -#if defined (MIPSEB)
       
  3374 -  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
       
  3375 -     I don't know....  */
       
  3376 -  printf ("mips-sony-bsd\n"); exit (0);
       
  3377 -#else
       
  3378 -#include <sys/param.h>
       
  3379 -  printf ("m68k-sony-newsos%s\n",
       
  3380 -#ifdef NEWSOS4
       
  3381 -          "4"
       
  3382 -#else
       
  3383 -	  ""
       
  3384 -#endif
       
  3385 -         ); exit (0);
       
  3386 -#endif
       
  3387 -#endif
       
  3388 -
       
  3389 -#if defined (__arm) && defined (__acorn) && defined (__unix)
       
  3390 -  printf ("arm-acorn-riscix\n"); exit (0);
       
  3391 -#endif
       
  3392 -
       
  3393 -#if defined (hp300) && !defined (hpux)
       
  3394 -  printf ("m68k-hp-bsd\n"); exit (0);
       
  3395 -#endif
       
  3396 -
       
  3397 -#if defined (NeXT)
       
  3398 -#if !defined (__ARCHITECTURE__)
       
  3399 -#define __ARCHITECTURE__ "m68k"
       
  3400 -#endif
       
  3401 -  int version;
       
  3402 -  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
       
  3403 -  if (version < 4)
       
  3404 -    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
       
  3405 -  else
       
  3406 -    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
       
  3407 -  exit (0);
       
  3408 -#endif
       
  3409 -
       
  3410 -#if defined (MULTIMAX) || defined (n16)
       
  3411 -#if defined (UMAXV)
       
  3412 -  printf ("ns32k-encore-sysv\n"); exit (0);
       
  3413 -#else
       
  3414 -#if defined (CMU)
       
  3415 -  printf ("ns32k-encore-mach\n"); exit (0);
       
  3416 -#else
       
  3417 -  printf ("ns32k-encore-bsd\n"); exit (0);
       
  3418 -#endif
       
  3419 -#endif
       
  3420 -#endif
       
  3421 -
       
  3422 -#if defined (__386BSD__)
       
  3423 -  printf ("i386-pc-bsd\n"); exit (0);
       
  3424 -#endif
       
  3425 -
       
  3426 -#if defined (sequent)
       
  3427 -#if defined (i386)
       
  3428 -  printf ("i386-sequent-dynix\n"); exit (0);
       
  3429 -#endif
       
  3430 -#if defined (ns32000)
       
  3431 -  printf ("ns32k-sequent-dynix\n"); exit (0);
       
  3432 -#endif
       
  3433 -#endif
       
  3434 -
       
  3435 -#if defined (_SEQUENT_)
       
  3436 -    struct utsname un;
       
  3437 -
       
  3438 -    uname(&un);
       
  3439 -
       
  3440 -    if (strncmp(un.version, "V2", 2) == 0) {
       
  3441 -	printf ("i386-sequent-ptx2\n"); exit (0);
       
  3442 -    }
       
  3443 -    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
       
  3444 -	printf ("i386-sequent-ptx1\n"); exit (0);
       
  3445 -    }
       
  3446 -    printf ("i386-sequent-ptx\n"); exit (0);
       
  3447 -
       
  3448 -#endif
       
  3449 -
       
  3450 -#if defined (vax)
       
  3451 -# if !defined (ultrix)
       
  3452 -#  include <sys/param.h>
       
  3453 -#  if defined (BSD)
       
  3454 -#   if BSD == 43
       
  3455 -      printf ("vax-dec-bsd4.3\n"); exit (0);
       
  3456 -#   else
       
  3457 -#    if BSD == 199006
       
  3458 -      printf ("vax-dec-bsd4.3reno\n"); exit (0);
       
  3459 -#    else
       
  3460 -      printf ("vax-dec-bsd\n"); exit (0);
       
  3461 -#    endif
       
  3462 -#   endif
       
  3463 -#  else
       
  3464 -    printf ("vax-dec-bsd\n"); exit (0);
       
  3465 -#  endif
       
  3466 -# else
       
  3467 -    printf ("vax-dec-ultrix\n"); exit (0);
       
  3468 -# endif
       
  3469 -#endif
       
  3470 -
       
  3471 -#if defined (alliant) && defined (i860)
       
  3472 -  printf ("i860-alliant-bsd\n"); exit (0);
       
  3473 -#endif
       
  3474 -
       
  3475 -  exit (1);
       
  3476 -}
       
  3477 -EOF
       
  3478 -
       
  3479 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
       
  3480 -	{ echo "$SYSTEM_NAME"; exit; }
       
  3481 -
       
  3482 -# Apollos put the system type in the environment.
       
  3483 -
       
  3484 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
       
  3485 -
       
  3486 -# Convex versions that predate uname can use getsysinfo(1)
       
  3487 -
       
  3488 -if [ -x /usr/convex/getsysinfo ]
       
  3489 -then
       
  3490 -    case `getsysinfo -f cpu_type` in
       
  3491 -    c1*)
       
  3492 -	echo c1-convex-bsd
       
  3493 -	exit ;;
       
  3494 -    c2*)
       
  3495 -	if getsysinfo -f scalar_acc
       
  3496 -	then echo c32-convex-bsd
       
  3497 -	else echo c2-convex-bsd
       
  3498 -	fi
       
  3499 -	exit ;;
       
  3500 -    c34*)
       
  3501 -	echo c34-convex-bsd
       
  3502 -	exit ;;
       
  3503 -    c38*)
       
  3504 -	echo c38-convex-bsd
       
  3505 -	exit ;;
       
  3506 -    c4*)
       
  3507 -	echo c4-convex-bsd
       
  3508 -	exit ;;
       
  3509 -    esac
       
  3510 -fi
       
  3511 -
       
  3512  cat >&2 <<EOF
       
  3513  $0: unable to guess system type
       
  3514  
       
  3515  This script, last modified $timestamp, has failed to recognize
       
  3516  the operating system you are using. It is advised that you
       
  3517  download the most up to date version of the config scripts from
       
  3518  
       
  3519    http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
       
  3520 diff --git a/js/src/build/autoconf/config.sub b/js/src/build/autoconf/config.sub
       
  3521 --- a/js/src/build/autoconf/config.sub
       
  3522 +++ b/js/src/build/autoconf/config.sub
       
  3523 @@ -1,43 +1,36 @@
       
  3524  #! /bin/sh
       
  3525  # Configuration validation subroutine script.
       
  3526 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
       
  3527 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
       
  3528 -#   Free Software Foundation, Inc.
       
  3529 +#   Copyright 1992-2014 Free Software Foundation, Inc.
       
  3530  
       
  3531 -timestamp='2011-01-03'
       
  3532 +timestamp='2014-01-01'
       
  3533  
       
  3534 -# This file is (in principle) common to ALL GNU software.
       
  3535 -# The presence of a machine in this file suggests that SOME GNU software
       
  3536 -# can handle that machine.  It does not imply ALL GNU software can.
       
  3537 -#
       
  3538 -# This file is free software; you can redistribute it and/or modify
       
  3539 -# it under the terms of the GNU General Public License as published by
       
  3540 -# the Free Software Foundation; either version 2 of the License, or
       
  3541 +# This file is free software; you can redistribute it and/or modify it
       
  3542 +# under the terms of the GNU General Public License as published by
       
  3543 +# the Free Software Foundation; either version 3 of the License, or
       
  3544  # (at your option) any later version.
       
  3545  #
       
  3546 -# This program is distributed in the hope that it will be useful,
       
  3547 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
       
  3548 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
       
  3549 -# GNU General Public License for more details.
       
  3550 +# This program is distributed in the hope that it will be useful, but
       
  3551 +# WITHOUT ANY WARRANTY; without even the implied warranty of
       
  3552 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       
  3553 +# General Public License for more details.
       
  3554  #
       
  3555  # You should have received a copy of the GNU General Public License
       
  3556 -# along with this program; if not, write to the Free Software
       
  3557 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
       
  3558 -# 02110-1301, USA.
       
  3559 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
       
  3560  #
       
  3561  # As a special exception to the GNU General Public License, if you
       
  3562  # distribute this file as part of a program that contains a
       
  3563  # configuration script generated by Autoconf, you may include it under
       
  3564 -# the same distribution terms that you use for the rest of that program.
       
  3565 +# the same distribution terms that you use for the rest of that
       
  3566 +# program.  This Exception is an additional permission under section 7
       
  3567 +# of the GNU General Public License, version 3 ("GPLv3").
       
  3568  
       
  3569  
       
  3570 -# Please send patches to <config-patches@gnu.org>.  Submit a context
       
  3571 -# diff and a properly formatted GNU ChangeLog entry.
       
  3572 +# Please send patches with a ChangeLog entry to config-patches@gnu.org.
       
  3573  #
       
  3574  # Configuration subroutine to validate and canonicalize a configuration type.
       
  3575  # Supply the specified configuration type as an argument.
       
  3576  # If it is invalid, we print an error message on stderr and exit with code 1.
       
  3577  # Otherwise, we print the canonical config type on stdout and succeed.
       
  3578  
       
  3579  # You can get the latest version of this script from:
       
  3580  # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
       
  3581 @@ -70,18 +63,17 @@ Operation modes:
       
  3582    -t, --time-stamp   print date of last modification, then exit
       
  3583    -v, --version      print version number, then exit
       
  3584  
       
  3585  Report bugs and patches to <config-patches@gnu.org>."
       
  3586  
       
  3587  version="\
       
  3588  GNU config.sub ($timestamp)
       
  3589  
       
  3590 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
       
  3591 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
       
  3592 +Copyright 1992-2014 Free Software Foundation, Inc.
       
  3593  
       
  3594  This is free software; see the source for copying conditions.  There is NO
       
  3595  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
       
  3596  
       
  3597  help="
       
  3598  Try \`$me --help' for more information."
       
  3599  
       
  3600  # Parse command line
       
  3601 @@ -118,23 +110,28 @@ case $# in
       
  3602   *) echo "$me: too many arguments$help" >&2
       
  3603      exit 1;;
       
  3604  esac
       
  3605  
       
  3606  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
       
  3607  # Here we must recognize all the valid KERNEL-OS combinations.
       
  3608  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
       
  3609  case $maybe_os in
       
  3610 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
       
  3611 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
       
  3612 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
       
  3613 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
       
  3614 +  knetbsd*-gnu* | netbsd*-gnu* | \
       
  3615    kopensolaris*-gnu* | \
       
  3616 -  storm-chaos* | os2-emx* | rtmk-nova* | wince-winmo*)
       
  3617 +  storm-chaos* | os2-emx* | rtmk-nova*)
       
  3618      os=-$maybe_os
       
  3619      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
       
  3620      ;;
       
  3621 +  android-linux)
       
  3622 +    os=-linux-android
       
  3623 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
       
  3624 +    ;;
       
  3625    *)
       
  3626      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
       
  3627      if [ $basic_machine != $1 ]
       
  3628      then os=`echo $1 | sed 's/.*-/-/'`
       
  3629      else os=; fi
       
  3630      ;;
       
  3631  esac
       
  3632  
       
  3633 @@ -147,41 +144,41 @@ case $os in
       
  3634  		# Prevent following clause from handling this invalid input.
       
  3635  		;;
       
  3636  	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
       
  3637  	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
       
  3638  	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
       
  3639  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
       
  3640  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
       
  3641  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
       
  3642 -	-apple | -axis | -knuth | -cray | -microblaze)
       
  3643 +	-apple | -axis | -knuth | -cray | -microblaze*)
       
  3644  		os=
       
  3645  		basic_machine=$1
       
  3646  		;;
       
  3647 -        -bluegene*)
       
  3648 -	        os=-cnk
       
  3649 +	-bluegene*)
       
  3650 +		os=-cnk
       
  3651  		;;
       
  3652  	-sim | -cisco | -oki | -wec | -winbond)
       
  3653  		os=
       
  3654  		basic_machine=$1
       
  3655  		;;
       
  3656  	-scout)
       
  3657  		;;
       
  3658  	-wrs)
       
  3659  		os=-vxworks
       
  3660  		basic_machine=$1
       
  3661  		;;
       
  3662  	-chorusos*)
       
  3663  		os=-chorusos
       
  3664  		basic_machine=$1
       
  3665  		;;
       
  3666 - 	-chorusrdb)
       
  3667 - 		os=-chorusrdb
       
  3668 +	-chorusrdb)
       
  3669 +		os=-chorusrdb
       
  3670  		basic_machine=$1
       
  3671 - 		;;
       
  3672 +		;;
       
  3673  	-hiux*)
       
  3674  		os=-hiuxwe2
       
  3675  		;;
       
  3676  	-sco6)
       
  3677  		os=-sco5v6
       
  3678  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
       
  3679  		;;
       
  3680  	-sco5)
       
  3681 @@ -216,16 +213,22 @@ case $os in
       
  3682  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
       
  3683  		;;
       
  3684  	-clix*)
       
  3685  		basic_machine=clipper-intergraph
       
  3686  		;;
       
  3687  	-isc*)
       
  3688  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
       
  3689  		;;
       
  3690 +	-lynx*178)
       
  3691 +		os=-lynxos178
       
  3692 +		;;
       
  3693 +	-lynx*5)
       
  3694 +		os=-lynxos5
       
  3695 +		;;
       
  3696  	-lynx*)
       
  3697  		os=-lynxos
       
  3698  		;;
       
  3699  	-ptx*)
       
  3700  		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
       
  3701  		;;
       
  3702  	-windowsnt*)
       
  3703  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
       
  3704 @@ -240,30 +243,38 @@ case $os in
       
  3705  esac
       
  3706  
       
  3707  # Decode aliases for certain CPU-COMPANY combinations.
       
  3708  case $basic_machine in
       
  3709  	# Recognize the basic CPU types without company name.
       
  3710  	# Some are omitted here because they have special meanings below.
       
  3711  	1750a | 580 \
       
  3712  	| a29k \
       
  3713 +	| aarch64 | aarch64_be \
       
  3714  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
       
  3715  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
       
  3716  	| am33_2.0 \
       
  3717 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
       
  3718 +	| arc | arceb \
       
  3719 +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
       
  3720 +	| avr | avr32 \
       
  3721 +	| be32 | be64 \
       
  3722  	| bfin \
       
  3723 -	| c4x | clipper \
       
  3724 +	| c4x | c8051 | clipper \
       
  3725  	| d10v | d30v | dlx | dsp16xx \
       
  3726 +	| epiphany \
       
  3727  	| fido | fr30 | frv \
       
  3728  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
       
  3729 +	| hexagon \
       
  3730  	| i370 | i860 | i960 | ia64 \
       
  3731  	| ip2k | iq2000 \
       
  3732 +	| k1om \
       
  3733 +	| le32 | le64 \
       
  3734  	| lm32 \
       
  3735  	| m32c | m32r | m32rle | m68000 | m68k | m88k \
       
  3736 -	| maxq | mb | microblaze | mcore | mep | metag \
       
  3737 +	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
       
  3738  	| mips | mipsbe | mipseb | mipsel | mipsle \
       
  3739  	| mips16 \
       
  3740  	| mips64 | mips64el \
       
  3741  	| mips64octeon | mips64octeonel \
       
  3742  	| mips64orion | mips64orionel \
       
  3743  	| mips64r5900 | mips64r5900el \
       
  3744  	| mips64vr | mips64vrel \
       
  3745  	| mips64vr4100 | mips64vr4100el \
       
  3746 @@ -271,84 +282,118 @@ case $basic_machine in
       
  3747  	| mips64vr5000 | mips64vr5000el \
       
  3748  	| mips64vr5900 | mips64vr5900el \
       
  3749  	| mipsisa32 | mipsisa32el \
       
  3750  	| mipsisa32r2 | mipsisa32r2el \
       
  3751  	| mipsisa64 | mipsisa64el \
       
  3752  	| mipsisa64r2 | mipsisa64r2el \
       
  3753  	| mipsisa64sb1 | mipsisa64sb1el \
       
  3754  	| mipsisa64sr71k | mipsisa64sr71kel \
       
  3755 +	| mipsr5900 | mipsr5900el \
       
  3756  	| mipstx39 | mipstx39el \
       
  3757  	| mn10200 | mn10300 \
       
  3758  	| moxie \
       
  3759  	| mt \
       
  3760  	| msp430 \
       
  3761 -	| nios | nios2 \
       
  3762 +	| nds32 | nds32le | nds32be \
       
  3763 +	| nios | nios2 | nios2eb | nios2el \
       
  3764  	| ns16k | ns32k \
       
  3765 -	| or32 \
       
  3766 +	| open8 \
       
  3767 +	| or1k | or32 \
       
  3768  	| pdp10 | pdp11 | pj | pjl \
       
  3769 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
       
  3770 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
       
  3771  	| pyramid \
       
  3772 +	| rl78 | rx \
       
  3773  	| score \
       
  3774  	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
       
  3775  	| sh64 | sh64le \
       
  3776  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
       
  3777  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
       
  3778 -	| spu | strongarm \
       
  3779 -	| tahoe | thumb | tic4x | tic80 | tron \
       
  3780 -	| v850 | v850e \
       
  3781 +	| spu \
       
  3782 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
       
  3783 +	| ubicom32 \
       
  3784 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
       
  3785  	| we32k \
       
  3786 -	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
       
  3787 +	| x86 | xc16x | xstormy16 | xtensa \
       
  3788  	| z8k | z80)
       
  3789  		basic_machine=$basic_machine-unknown
       
  3790  		;;
       
  3791 -	m6811 | m68hc11 | m6812 | m68hc12)
       
  3792 -		# Motorola 68HC11/12.
       
  3793 +	c54x)
       
  3794 +		basic_machine=tic54x-unknown
       
  3795 +		;;
       
  3796 +	c55x)
       
  3797 +		basic_machine=tic55x-unknown
       
  3798 +		;;
       
  3799 +	c6x)
       
  3800 +		basic_machine=tic6x-unknown
       
  3801 +		;;
       
  3802 +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
       
  3803  		basic_machine=$basic_machine-unknown
       
  3804  		os=-none
       
  3805  		;;
       
  3806  	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
       
  3807  		;;
       
  3808  	ms1)
       
  3809  		basic_machine=mt-unknown
       
  3810  		;;
       
  3811  
       
  3812 +	strongarm | thumb | xscale)
       
  3813 +		basic_machine=arm-unknown
       
  3814 +		;;
       
  3815 +	xgate)
       
  3816 +		basic_machine=$basic_machine-unknown
       
  3817 +		os=-none
       
  3818 +		;;
       
  3819 +	xscaleeb)
       
  3820 +		basic_machine=armeb-unknown
       
  3821 +		;;
       
  3822 +
       
  3823 +	xscaleel)
       
  3824 +		basic_machine=armel-unknown
       
  3825 +		;;
       
  3826 +
       
  3827  	# We use `pc' rather than `unknown'
       
  3828  	# because (1) that's what they normally are, and
       
  3829  	# (2) the word "unknown" tends to confuse beginning users.
       
  3830  	i*86 | x86_64)
       
  3831  	  basic_machine=$basic_machine-pc
       
  3832  	  ;;
       
  3833  	# Object if more than one company name word.
       
  3834  	*-*-*)
       
  3835  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
       
  3836  		exit 1
       
  3837  		;;
       
  3838  	# Recognize the basic CPU types with company name.
       
  3839  	580-* \
       
  3840  	| a29k-* \
       
  3841 +	| aarch64-* | aarch64_be-* \
       
  3842  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
       
  3843  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
       
  3844 -	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
       
  3845 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
       
  3846  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
       
  3847  	| avr-* | avr32-* \
       
  3848 +	| be32-* | be64-* \
       
  3849  	| bfin-* | bs2000-* \
       
  3850 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
       
  3851 -	| clipper-* | craynv-* | cydra-* \
       
  3852 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
       
  3853 +	| c8051-* | clipper-* | craynv-* | cydra-* \
       
  3854  	| d10v-* | d30v-* | dlx-* \
       
  3855  	| elxsi-* \
       
  3856  	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
       
  3857  	| h8300-* | h8500-* \
       
  3858  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
       
  3859 +	| hexagon-* \
       
  3860  	| i*86-* | i860-* | i960-* | ia64-* \
       
  3861  	| ip2k-* | iq2000-* \
       
  3862 +	| k1om-* \
       
  3863 +	| le32-* | le64-* \
       
  3864  	| lm32-* \
       
  3865  	| m32c-* | m32r-* | m32rle-* \
       
  3866  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
       
  3867 -	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
       
  3868 +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
       
  3869 +	| microblaze-* | microblazeel-* \
       
  3870  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
       
  3871  	| mips16-* \
       
  3872  	| mips64-* | mips64el-* \
       
  3873  	| mips64octeon-* | mips64octeonel-* \
       
  3874  	| mips64orion-* | mips64orionel-* \
       
  3875  	| mips64r5900-* | mips64r5900el-* \
       
  3876  	| mips64vr-* | mips64vrel-* \
       
  3877  	| mips64vr4100-* | mips64vr4100el-* \
       
  3878 @@ -356,38 +401,44 @@ case $basic_machine in
       
  3879  	| mips64vr5000-* | mips64vr5000el-* \
       
  3880  	| mips64vr5900-* | mips64vr5900el-* \
       
  3881  	| mipsisa32-* | mipsisa32el-* \
       
  3882  	| mipsisa32r2-* | mipsisa32r2el-* \
       
  3883  	| mipsisa64-* | mipsisa64el-* \
       
  3884  	| mipsisa64r2-* | mipsisa64r2el-* \
       
  3885  	| mipsisa64sb1-* | mipsisa64sb1el-* \
       
  3886  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
       
  3887 +	| mipsr5900-* | mipsr5900el-* \
       
  3888  	| mipstx39-* | mipstx39el-* \
       
  3889  	| mmix-* \
       
  3890  	| mt-* \
       
  3891  	| msp430-* \
       
  3892 -	| nios-* | nios2-* \
       
  3893 +	| nds32-* | nds32le-* | nds32be-* \
       
  3894 +	| nios-* | nios2-* | nios2eb-* | nios2el-* \
       
  3895  	| none-* | np1-* | ns16k-* | ns32k-* \
       
  3896 +	| open8-* \
       
  3897  	| orion-* \
       
  3898  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
       
  3899 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
       
  3900 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
       
  3901  	| pyramid-* \
       
  3902 -	| romp-* | rs6000-* \
       
  3903 +	| rl78-* | romp-* | rs6000-* | rx-* \
       
  3904  	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
       
  3905  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
       
  3906  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
       
  3907  	| sparclite-* \
       
  3908 -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
       
  3909 -	| tahoe-* | thumb-* \
       
  3910 -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
       
  3911 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
       
  3912 +	| tahoe-* \
       
  3913 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
       
  3914 +	| tile*-* \
       
  3915  	| tron-* \
       
  3916 -	| v850-* | v850e-* | vax-* \
       
  3917 +	| ubicom32-* \
       
  3918 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
       
  3919 +	| vax-* \
       
  3920  	| we32k-* \
       
  3921 -	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
       
  3922 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
       
  3923  	| xstormy16-* | xtensa*-* \
       
  3924  	| ymp-* \
       
  3925  	| z8k-* | z80-*)
       
  3926  		;;
       
  3927  	# Recognize the basic CPU types without company name, with glob match.
       
  3928  	xtensa*)
       
  3929  		basic_machine=$basic_machine-unknown
       
  3930  		;;
       
  3931 @@ -402,17 +453,17 @@ case $basic_machine in
       
  3932  		;;
       
  3933  	3b*)
       
  3934  		basic_machine=we32k-att
       
  3935  		;;
       
  3936  	a29khif)
       
  3937  		basic_machine=a29k-amd
       
  3938  		os=-udi
       
  3939  		;;
       
  3940 -    	abacus)
       
  3941 +	abacus)
       
  3942  		basic_machine=abacus-unknown
       
  3943  		;;
       
  3944  	adobe68k)
       
  3945  		basic_machine=m68010-adobe
       
  3946  		os=-scout
       
  3947  		;;
       
  3948  	alliant | fx80)
       
  3949  		basic_machine=fx80-alliant
       
  3950 @@ -472,21 +523,30 @@ case $basic_machine in
       
  3951  	blackfin-*)
       
  3952  		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  3953  		os=-linux
       
  3954  		;;
       
  3955  	bluegene*)
       
  3956  		basic_machine=powerpc-ibm
       
  3957  		os=-cnk
       
  3958  		;;
       
  3959 +	c54x-*)
       
  3960 +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  3961 +		;;
       
  3962 +	c55x-*)
       
  3963 +		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  3964 +		;;
       
  3965 +	c6x-*)
       
  3966 +		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  3967 +		;;
       
  3968  	c90)
       
  3969  		basic_machine=c90-cray
       
  3970  		os=-unicos
       
  3971  		;;
       
  3972 -        cegcc)
       
  3973 +	cegcc)
       
  3974  		basic_machine=arm-unknown
       
  3975  		os=-cegcc
       
  3976  		;;
       
  3977  	convex-c1)
       
  3978  		basic_machine=c1-convex
       
  3979  		os=-bsd
       
  3980  		;;
       
  3981  	convex-c2)
       
  3982 @@ -508,17 +568,17 @@ case $basic_machine in
       
  3983  	cray | j90)
       
  3984  		basic_machine=j90-cray
       
  3985  		os=-unicos
       
  3986  		;;
       
  3987  	craynv)
       
  3988  		basic_machine=craynv-cray
       
  3989  		os=-unicosmp
       
  3990  		;;
       
  3991 -	cr16)
       
  3992 +	cr16 | cr16-*)
       
  3993  		basic_machine=cr16-unknown
       
  3994  		os=-elf
       
  3995  		;;
       
  3996  	crds | unos)
       
  3997  		basic_machine=m68k-crds
       
  3998  		;;
       
  3999  	crisv32 | crisv32-* | etraxfs*)
       
  4000  		basic_machine=crisv32-axis
       
  4001 @@ -666,17 +726,16 @@ case $basic_machine in
       
  4002  		;;
       
  4003  	hppro)
       
  4004  		basic_machine=hppa1.1-hp
       
  4005  		os=-proelf
       
  4006  		;;
       
  4007  	i370-ibm* | ibm*)
       
  4008  		basic_machine=i370-ibm
       
  4009  		;;
       
  4010 -# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
       
  4011  	i*86v32)
       
  4012  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
       
  4013  		os=-sysv32
       
  4014  		;;
       
  4015  	i*86v4*)
       
  4016  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
       
  4017  		os=-sysv4
       
  4018  		;;
       
  4019 @@ -724,21 +783,25 @@ case $basic_machine in
       
  4020  	magnum | m3230)
       
  4021  		basic_machine=mips-mips
       
  4022  		os=-sysv
       
  4023  		;;
       
  4024  	merlin)
       
  4025  		basic_machine=ns32k-utek
       
  4026  		os=-sysv
       
  4027  		;;
       
  4028 -        microblaze)
       
  4029 +	microblaze*)
       
  4030  		basic_machine=microblaze-xilinx
       
  4031  		;;
       
  4032 +	mingw64)
       
  4033 +		basic_machine=x86_64-pc
       
  4034 +		os=-mingw64
       
  4035 +		;;
       
  4036  	mingw32)
       
  4037 -		basic_machine=i386-pc
       
  4038 +		basic_machine=i686-pc
       
  4039  		os=-mingw32
       
  4040  		;;
       
  4041  	mingw32ce)
       
  4042  		basic_machine=arm-unknown
       
  4043  		os=-mingw32ce
       
  4044  		;;
       
  4045  	miniframe)
       
  4046  		basic_machine=m68000-convergent
       
  4047 @@ -763,20 +826,28 @@ case $basic_machine in
       
  4048  		;;
       
  4049  	msdos)
       
  4050  		basic_machine=i386-pc
       
  4051  		os=-msdos
       
  4052  		;;
       
  4053  	ms1-*)
       
  4054  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
       
  4055  		;;
       
  4056 +	msys)
       
  4057 +		basic_machine=i686-pc
       
  4058 +		os=-msys
       
  4059 +		;;
       
  4060  	mvs)
       
  4061  		basic_machine=i370-ibm
       
  4062  		os=-mvs
       
  4063  		;;
       
  4064 +	nacl)
       
  4065 +		basic_machine=le32-unknown
       
  4066 +		os=-nacl
       
  4067 +		;;
       
  4068  	ncr3000)
       
  4069  		basic_machine=i486-ncr
       
  4070  		os=-sysv4
       
  4071  		;;
       
  4072  	netbsd386)
       
  4073  		basic_machine=i386-unknown
       
  4074  		os=-netbsd
       
  4075  		;;
       
  4076 @@ -831,16 +902,22 @@ case $basic_machine in
       
  4077  		;;
       
  4078  	nonstopux)
       
  4079  		basic_machine=mips-compaq
       
  4080  		os=-nonstopux
       
  4081  		;;
       
  4082  	np1)
       
  4083  		basic_machine=np1-gould
       
  4084  		;;
       
  4085 +	neo-tandem)
       
  4086 +		basic_machine=neo-tandem
       
  4087 +		;;
       
  4088 +	nse-tandem)
       
  4089 +		basic_machine=nse-tandem
       
  4090 +		;;
       
  4091  	nsr-tandem)
       
  4092  		basic_machine=nsr-tandem
       
  4093  		;;
       
  4094  	op50n-* | op60c-*)
       
  4095  		basic_machine=hppa1.1-oki
       
  4096  		os=-proelf
       
  4097  		;;
       
  4098  	openrisc | openrisc-*)
       
  4099 @@ -913,19 +990,20 @@ case $basic_machine in
       
  4100  	pentium4-*)
       
  4101  		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  4102  		;;
       
  4103  	pn)
       
  4104  		basic_machine=pn-gould
       
  4105  		;;
       
  4106  	power)	basic_machine=power-ibm
       
  4107  		;;
       
  4108 -	ppc)	basic_machine=powerpc-unknown
       
  4109 +	ppc | ppcbe)	basic_machine=powerpc-unknown
       
  4110  		;;
       
  4111 -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  4112 +	ppc-* | ppcbe-*)
       
  4113 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  4114  		;;
       
  4115  	ppcle | powerpclittle | ppc-le | powerpc-little)
       
  4116  		basic_machine=powerpcle-unknown
       
  4117  		;;
       
  4118  	ppcle-* | powerpclittle-*)
       
  4119  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  4120  		;;
       
  4121  	ppc64)	basic_machine=powerpc64-unknown
       
  4122 @@ -940,17 +1018,21 @@ case $basic_machine in
       
  4123  		;;
       
  4124  	ps2)
       
  4125  		basic_machine=i386-ibm
       
  4126  		;;
       
  4127  	pw32)
       
  4128  		basic_machine=i586-unknown
       
  4129  		os=-pw32
       
  4130  		;;
       
  4131 -	rdos)
       
  4132 +	rdos | rdos64)
       
  4133 +		basic_machine=x86_64-pc
       
  4134 +		os=-rdos
       
  4135 +		;;
       
  4136 +	rdos32)
       
  4137  		basic_machine=i386-pc
       
  4138  		os=-rdos
       
  4139  		;;
       
  4140  	rom68k)
       
  4141  		basic_machine=m68k-rom68k
       
  4142  		os=-coff
       
  4143  		;;
       
  4144  	rm[46]00)
       
  4145 @@ -1009,16 +1091,19 @@ case $basic_machine in
       
  4146  		;;
       
  4147  	st2000)
       
  4148  		basic_machine=m68k-tandem
       
  4149  		;;
       
  4150  	stratus)
       
  4151  		basic_machine=i860-stratus
       
  4152  		os=-sysv4
       
  4153  		;;
       
  4154 +	strongarm-* | thumb-*)
       
  4155 +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
       
  4156 +		;;
       
  4157  	sun2)
       
  4158  		basic_machine=m68000-sun
       
  4159  		;;
       
  4160  	sun2os3)
       
  4161  		basic_machine=m68000-sun
       
  4162  		os=-sunos3
       
  4163  		;;
       
  4164  	sun2os4)
       
  4165 @@ -1065,30 +1150,18 @@ case $basic_machine in
       
  4166  	t3e)
       
  4167  		basic_machine=alphaev5-cray
       
  4168  		os=-unicos
       
  4169  		;;
       
  4170  	t90)
       
  4171  		basic_machine=t90-cray
       
  4172  		os=-unicos
       
  4173  		;;
       
  4174 -	tic54x | c54x*)
       
  4175 -		basic_machine=tic54x-unknown
       
  4176 -		os=-coff
       
  4177 -		;;
       
  4178 -	tic55x | c55x*)
       
  4179 -		basic_machine=tic55x-unknown
       
  4180 -		os=-coff
       
  4181 -		;;
       
  4182 -	tic6x | c6x*)
       
  4183 -		basic_machine=tic6x-unknown
       
  4184 -		os=-coff
       
  4185 -		;;
       
  4186  	tile*)
       
  4187 -		basic_machine=tile-unknown
       
  4188 +		basic_machine=$basic_machine-unknown
       
  4189  		os=-linux-gnu
       
  4190  		;;
       
  4191  	tx39)
       
  4192  		basic_machine=mipstx39-unknown
       
  4193  		;;
       
  4194  	tx39el)
       
  4195  		basic_machine=mipstx39el-unknown
       
  4196  		;;
       
  4197 @@ -1148,16 +1221,19 @@ case $basic_machine in
       
  4198  		;;
       
  4199  	xbox)
       
  4200  		basic_machine=i686-pc
       
  4201  		os=-mingw32
       
  4202  		;;
       
  4203  	xps | xps100)
       
  4204  		basic_machine=xps100-honeywell
       
  4205  		;;
       
  4206 +	xscale-* | xscalee[bl]-*)
       
  4207 +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
       
  4208 +		;;
       
  4209  	ymp)
       
  4210  		basic_machine=ymp-cray
       
  4211  		os=-unicos
       
  4212  		;;
       
  4213  	z8k-*-coff)
       
  4214  		basic_machine=z8k-unknown
       
  4215  		os=-sim
       
  4216  		;;
       
  4217 @@ -1245,19 +1321,22 @@ case $basic_machine in
       
  4218  		;;
       
  4219  esac
       
  4220  
       
  4221  # Decode manufacturer-specific aliases for certain operating systems.
       
  4222  
       
  4223  if [ x"$os" != x"" ]
       
  4224  then
       
  4225  case $os in
       
  4226 -        # First match some system type aliases
       
  4227 -        # that might get confused with valid system types.
       
  4228 +	# First match some system type aliases
       
  4229 +	# that might get confused with valid system types.
       
  4230  	# -solaris* is a basic system type, with this one exception.
       
  4231 +	-auroraux)
       
  4232 +		os=-auroraux
       
  4233 +		;;
       
  4234  	-solaris1 | -solaris1.*)
       
  4235  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
       
  4236  		;;
       
  4237  	-solaris)
       
  4238  		os=-solaris2
       
  4239  		;;
       
  4240  	-svr4*)
       
  4241  		os=-sysv4
       
  4242 @@ -1269,39 +1348,40 @@ case $os in
       
  4243  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
       
  4244  		;;
       
  4245  	# First accept the basic system types.
       
  4246  	# The portable systems comes first.
       
  4247  	# Each alternative MUST END IN A *, to match a version number.
       
  4248  	# -sysv* is not here because it comes later, after sysvr4.
       
  4249  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
       
  4250  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
       
  4251 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
       
  4252 -	      | -kopensolaris* \
       
  4253 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
       
  4254 +	      | -sym* | -kopensolaris* | -plan9* \
       
  4255  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
       
  4256  	      | -aos* | -aros* \
       
  4257  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
       
  4258  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
       
  4259  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
       
  4260 -	      | -openbsd* | -solidbsd* \
       
  4261 +	      | -bitrig* | -openbsd* | -solidbsd* \
       
  4262  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
       
  4263  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
       
  4264  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
       
  4265  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
       
  4266  	      | -chorusos* | -chorusrdb* | -cegcc* \
       
  4267 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
       
  4268 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
       
  4269 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
       
  4270 +	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
       
  4271 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
       
  4272  	      | -uxpv* | -beos* | -mpeix* | -udk* \
       
  4273  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
       
  4274  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
       
  4275  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
       
  4276  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
       
  4277  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
       
  4278  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
       
  4279 -	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -winmo*)
       
  4280 +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
       
  4281  	# Remember, each alternative MUST END IN *, to match a version number.
       
  4282  		;;
       
  4283  	-qnx*)
       
  4284  		case $basic_machine in
       
  4285  		    x86-* | i*86-*)
       
  4286  			;;
       
  4287  		    *)
       
  4288  			os=-nto$os
       
  4289 @@ -1330,22 +1410,19 @@ case $os in
       
  4290  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
       
  4291  		;;
       
  4292  	-sunos6*)
       
  4293  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
       
  4294  		;;
       
  4295  	-opened*)
       
  4296  		os=-openedition
       
  4297  		;;
       
  4298 -        -os400*)
       
  4299 +	-os400*)
       
  4300  		os=-os400
       
  4301  		;;
       
  4302 -	-wince-winmo*)
       
  4303 -		os=-wince-winmo
       
  4304 -		;;
       
  4305  	-wince*)
       
  4306  		os=-wince
       
  4307  		;;
       
  4308  	-osfrose*)
       
  4309  		os=-osfrose
       
  4310  		;;
       
  4311  	-osf*)
       
  4312  		os=-osf
       
  4313 @@ -1382,17 +1459,17 @@ case $os in
       
  4314  		;;
       
  4315  	# Preserve the version number of sinix5.
       
  4316  	-sinix5.*)
       
  4317  		os=`echo $os | sed -e 's|sinix|sysv|'`
       
  4318  		;;
       
  4319  	-sinix*)
       
  4320  		os=-sysv4
       
  4321  		;;
       
  4322 -        -tpf*)
       
  4323 +	-tpf*)
       
  4324  		os=-tpf
       
  4325  		;;
       
  4326  	-triton*)
       
  4327  		os=-sysv3
       
  4328  		;;
       
  4329  	-oss*)
       
  4330  		os=-sysv3
       
  4331  		;;
       
  4332 @@ -1418,28 +1495,24 @@ case $os in
       
  4333  		os=-xenix
       
  4334  		;;
       
  4335  	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
       
  4336  		os=-mint
       
  4337  		;;
       
  4338  	-aros*)
       
  4339  		os=-aros
       
  4340  		;;
       
  4341 -	-kaos*)
       
  4342 -		os=-kaos
       
  4343 -		;;
       
  4344  	-zvmoe)
       
  4345  		os=-zvmoe
       
  4346  		;;
       
  4347  	-dicos*)
       
  4348  		os=-dicos
       
  4349  		;;
       
  4350 -        -android*)
       
  4351 -	        os=-android
       
  4352 -                ;;
       
  4353 +	-nacl*)
       
  4354 +		;;
       
  4355  	-none)
       
  4356  		;;
       
  4357  	*)
       
  4358  		# Get rid of the `-' at the beginning of $os.
       
  4359  		os=`echo $os | sed 's/[^-]*-//'`
       
  4360  		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
       
  4361  		exit 1
       
  4362  		;;
       
  4363 @@ -1452,33 +1525,48 @@ else
       
  4364  
       
  4365  # Note that if you're going to try to match "-MANUFACTURER" here (say,
       
  4366  # "-sun"), then you have to tell the case statement up towards the top
       
  4367  # that MANUFACTURER isn't an operating system.  Otherwise, code above
       
  4368  # will signal an error saying that MANUFACTURER isn't an operating
       
  4369  # system, and we'll never get to this point.
       
  4370  
       
  4371  case $basic_machine in
       
  4372 -        score-*)
       
  4373 +	score-*)
       
  4374  		os=-elf
       
  4375  		;;
       
  4376 -        spu-*)
       
  4377 +	spu-*)
       
  4378  		os=-elf
       
  4379  		;;
       
  4380  	*-acorn)
       
  4381  		os=-riscix1.2
       
  4382  		;;
       
  4383  	arm*-rebel)
       
  4384  		os=-linux
       
  4385  		;;
       
  4386  	arm*-semi)
       
  4387  		os=-aout
       
  4388  		;;
       
  4389 -        c4x-* | tic4x-*)
       
  4390 -        	os=-coff
       
  4391 +	c4x-* | tic4x-*)
       
  4392 +		os=-coff
       
  4393 +		;;
       
  4394 +	c8051-*)
       
  4395 +		os=-elf
       
  4396 +		;;
       
  4397 +	hexagon-*)
       
  4398 +		os=-elf
       
  4399 +		;;
       
  4400 +	tic54x-*)
       
  4401 +		os=-coff
       
  4402 +		;;
       
  4403 +	tic55x-*)
       
  4404 +		os=-coff
       
  4405 +		;;
       
  4406 +	tic6x-*)
       
  4407 +		os=-coff
       
  4408  		;;
       
  4409  	# This must come before the *-dec entry.
       
  4410  	pdp10-*)
       
  4411  		os=-tops20
       
  4412  		;;
       
  4413  	pdp11-*)
       
  4414  		os=-none
       
  4415  		;;
       
  4416 @@ -1488,32 +1576,32 @@ case $basic_machine in
       
  4417  	m68*-apollo)
       
  4418  		os=-domain
       
  4419  		;;
       
  4420  	i386-sun)
       
  4421  		os=-sunos4.0.2
       
  4422  		;;
       
  4423  	m68000-sun)
       
  4424  		os=-sunos3
       
  4425 -		# This also exists in the configure program, but was not the
       
  4426 -		# default.
       
  4427 -		# os=-sunos4
       
  4428  		;;
       
  4429  	m68*-cisco)
       
  4430  		os=-aout
       
  4431  		;;
       
  4432 -        mep-*)
       
  4433 +	mep-*)
       
  4434  		os=-elf
       
  4435  		;;
       
  4436  	mips*-cisco)
       
  4437  		os=-elf
       
  4438  		;;
       
  4439  	mips*-*)
       
  4440  		os=-elf
       
  4441  		;;
       
  4442 +	or1k-*)
       
  4443 +		os=-elf
       
  4444 +		;;
       
  4445  	or32-*)
       
  4446  		os=-coff
       
  4447  		;;
       
  4448  	*-tti)	# must be before sparc entry or we get the wrong os.
       
  4449  		os=-sysv3
       
  4450  		;;
       
  4451  	sparc-* | *-sun)
       
  4452  		os=-sunos4.1.1
       
  4453 @@ -1522,17 +1610,17 @@ case $basic_machine in
       
  4454  		os=-beos
       
  4455  		;;
       
  4456  	*-haiku)
       
  4457  		os=-haiku
       
  4458  		;;
       
  4459  	*-ibm)
       
  4460  		os=-aix
       
  4461  		;;
       
  4462 -    	*-knuth)
       
  4463 +	*-knuth)
       
  4464  		os=-mmixware
       
  4465  		;;
       
  4466  	*-wec)
       
  4467  		os=-proelf
       
  4468  		;;
       
  4469  	*-winbond)
       
  4470  		os=-proelf
       
  4471  		;;
       
  4472 @@ -1684,19 +1772,16 @@ case $basic_machine in
       
  4473  				vendor=apple
       
  4474  				;;
       
  4475  			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
       
  4476  				vendor=atari
       
  4477  				;;
       
  4478  			-vos*)
       
  4479  				vendor=stratus
       
  4480  				;;
       
  4481 -			*-android*|*-linuxandroid*)
       
  4482 -				vendor=linux-
       
  4483 -				;;
       
  4484  		esac
       
  4485  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
       
  4486  		;;
       
  4487  esac
       
  4488  
       
  4489  echo $basic_machine$os
       
  4490  exit
       
  4491