aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/030_config-debian-fix.patch
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2011-05-04 07:38:13 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2011-05-04 07:38:13 +0000
commitddd965984492e74c3e5fc0fb922d4362fd3aebda (patch)
tree1f554ce14b66a9b4c344d62948a473fb1d367262 /debian/patches/030_config-debian-fix.patch
parentReleasing debian version 0.5.2-7 (diff)
downloadw3m-ddd965984492e74c3e5fc0fb922d4362fd3aebda.tar.gz
w3m-ddd965984492e74c3e5fc0fb922d4362fd3aebda.zip
Releasing debian version 0.5.2-8debian/0.5.2-8
Diffstat (limited to '')
-rw-r--r--debian/patches/020_config-guess.patch (renamed from debian/patches/030_config-debian-fix.patch)445
1 files changed, 278 insertions, 167 deletions
diff --git a/debian/patches/030_config-debian-fix.patch b/debian/patches/020_config-guess.patch
index 0f0818d..bcad7a3 100644
--- a/debian/patches/030_config-debian-fix.patch
+++ b/debian/patches/020_config-guess.patch
@@ -1,23 +1,24 @@
-From: Tatsuya Kinoshita <tats@debian.org>
-Subject: Update config.guess and config.sub.
+Description: Update config.guess and config.sub using autotools-dev 20100122.1
+Author: Tatsuya Kinoshita <tats@debian.org>
+Bug-Debian: http://bugs.debian.org/216785
diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
--- w3m-0.5.2.orig/config.guess 2004-08-05 02:32:27.000000000 +0900
-+++ w3m-0.5.2/config.guess 2009-07-24 05:36:54.000000000 +0900
++++ w3m-0.5.2/config.guess 2010-03-06 22:24:27.000000000 +0900
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Free Software Foundation, Inc.
-timestamp='2004-03-12'
-+timestamp='2009-06-10'
++timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -17,13 +18,15 @@
+@@ -17,23 +18,25 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -30,22 +31,38 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
+
- # Originally written by Per Bothner <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>. Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -53,8 +56,8 @@
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -53,8 +56,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -66,11 +69,11 @@
+@@ -66,11 +70,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
@@ -60,7 +77,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
-@@ -104,7 +107,7 @@
+@@ -104,7 +108,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
@@ -69,7 +86,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -123,7 +126,7 @@
+@@ -123,7 +127,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
@@ -78,7 +95,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -158,6 +161,7 @@
+@@ -158,6 +162,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
@@ -86,7 +103,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
-@@ -166,7 +170,7 @@
+@@ -166,7 +171,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -95,7 +112,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -196,64 +200,23 @@
+@@ -196,64 +201,23 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
@@ -171,7 +188,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
-@@ -306,40 +269,43 @@
+@@ -306,40 +270,43 @@
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -228,7 +245,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -347,32 +313,48 @@
+@@ -347,32 +314,51 @@
else
echo pyramid-pyramid-bsd
fi
@@ -262,6 +279,9 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
@@ -288,7 +308,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
-@@ -381,10 +363,10 @@
+@@ -381,10 +367,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -301,7 +321,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -396,10 +378,10 @@
+@@ -396,10 +382,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
@@ -314,7 +334,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
-@@ -410,40 +392,40 @@
+@@ -410,40 +396,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
@@ -367,7 +387,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
-@@ -467,32 +449,33 @@
+@@ -467,32 +453,33 @@
exit (-1);
}
EOF
@@ -412,7 +432,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -508,29 +491,29 @@
+@@ -508,29 +495,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -451,7 +471,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
-@@ -538,7 +521,7 @@
+@@ -538,7 +525,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -460,7 +480,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
-@@ -553,15 +536,19 @@
+@@ -553,15 +540,19 @@
exit(0);
}
EOF
@@ -484,7 +504,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
-@@ -574,28 +561,28 @@
+@@ -574,28 +565,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -521,7 +541,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
-@@ -657,9 +644,19 @@
+@@ -657,9 +648,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
@@ -544,7 +564,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
then
HP_ARCH="hppa2.0w"
else
-@@ -667,11 +664,11 @@
+@@ -667,11 +668,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -558,7 +578,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
-@@ -699,210 +696,227 @@
+@@ -699,224 +700,248 @@
exit (0);
}
EOF
@@ -722,12 +742,12 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
-+ *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
-+ EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
@@ -777,6 +797,20 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -801,6 +835,17 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
@@ -855,53 +900,56 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
-+ or32:Linux:*:*)
-+ echo or32-unknown-linux-gnu
-+ exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
-@@ -913,10 +927,13 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit 0 ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit 0 ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
++ or32:Linux:*:*)
++ echo or32-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -924,25 +941,31 @@
+@@ -924,87 +949,40 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
-+ exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
++ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
@@ -924,17 +972,21 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
-+ exit ;;
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
-@@ -958,17 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
@@ -946,36 +998,40 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -985,7 +997,7 @@
- LIBC=gnulibc1
- # endif
- #else
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
- #ifdef __INTEL_COMPILER
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
-@@ -995,16 +1007,23 @@
- LIBC=dietlibc
- #endif
- EOF
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^LIBC/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${LIBC}" != x && {
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ exit
-+ }
-+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
+- ;;
++ exit ;;
++ xtensa*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -986,7 +1042,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
-@@ -1012,27 +1031,27 @@
+@@ -1012,27 +990,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
@@ -1023,7 +1079,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1040,15 +1059,16 @@
+@@ -1040,15 +1018,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
@@ -1043,7 +1099,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1066,73 +1086,86 @@
+@@ -1066,73 +1045,86 @@
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
@@ -1155,7 +1211,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1140,68 +1173,84 @@
+@@ -1140,68 +1132,94 @@
else
echo ns32k-sni-sysv
fi
@@ -1252,6 +1308,16 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1260,7 +1326,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1209,22 +1258,25 @@
+@@ -1209,22 +1227,25 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
@@ -1292,7 +1358,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
-@@ -1235,31 +1287,50 @@
+@@ -1235,31 +1256,50 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
@@ -1352,7 +1418,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1291,7 +1362,7 @@
+@@ -1291,7 +1331,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
@@ -1361,7 +1427,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
#endif
#if defined (hp300) && !defined (hpux)
-@@ -1380,11 +1451,12 @@
+@@ -1380,11 +1420,12 @@
}
EOF
@@ -1376,7 +1442,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
# Convex versions that predate uname can use getsysinfo(1)
-@@ -1393,22 +1465,22 @@
+@@ -1393,22 +1434,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
@@ -1404,7 +1470,7 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
esac
fi
-@@ -1419,7 +1491,9 @@
+@@ -1419,7 +1460,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
@@ -1417,21 +1483,21 @@ diff -urN w3m-0.5.2.orig/config.guess w3m-0.5.2/config.guess
send the following data and any information you think might be
diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
--- w3m-0.5.2.orig/config.sub 2004-08-05 02:32:27.000000000 +0900
-+++ w3m-0.5.2/config.sub 2009-07-24 05:36:54.000000000 +0900
++++ w3m-0.5.2/config.sub 2010-03-06 22:24:27.000000000 +0900
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Free Software Foundation, Inc.
-timestamp='2004-03-12'
-+timestamp='2009-06-11'
++timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -21,14 +22,15 @@
+@@ -21,22 +22,26 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -1448,20 +1514,33 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
+
# Please send patches to <config-patches@gnu.org>. Submit a context
- # diff and a properly formatted ChangeLog entry.
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
#
-@@ -70,8 +72,8 @@
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -70,8 +75,9 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -83,11 +85,11 @@
+@@ -83,11 +89,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
@@ -1476,7 +1555,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
-@@ -99,7 +101,7 @@
+@@ -99,7 +105,7 @@
*local*)
# First pass through any local machine types.
echo $1
@@ -1485,7 +1564,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
* )
break ;;
-@@ -118,8 +120,10 @@
+@@ -118,8 +124,10 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
@@ -1498,12 +1577,12 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
-@@ -145,10 +149,13 @@
+@@ -145,10 +153,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
-+ -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
@@ -1513,7 +1592,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -170,6 +177,10 @@
+@@ -170,6 +181,10 @@
-hiux*)
os=-hiuxwe2
;;
@@ -1524,7 +1603,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -186,6 +197,10 @@
+@@ -186,6 +201,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -1535,7 +1614,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -230,22 +245,28 @@
+@@ -230,22 +249,28 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
@@ -1568,7 +1647,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
-@@ -254,21 +275,26 @@
+@@ -254,30 +279,40 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
@@ -1583,6 +1662,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -1592,6 +1672,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
@@ -1600,8 +1681,11 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
-@@ -278,6 +304,9 @@
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
@@ -1611,7 +1695,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
-@@ -297,28 +326,32 @@
+@@ -297,28 +332,32 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
@@ -1635,7 +1719,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -1651,7 +1735,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
-@@ -326,26 +359,34 @@
+@@ -326,26 +365,36 @@
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
@@ -1665,8 +1749,9 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
+- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
@@ -1675,9 +1760,10 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
| tron-* \
++ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -1694,7 +1780,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
-@@ -409,6 +450,10 @@
+@@ -409,6 +458,10 @@
basic_machine=m68k-apollo
os=-bsd
;;
@@ -1705,7 +1791,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
aux)
basic_machine=m68k-apple
os=-aux
-@@ -417,10 +462,26 @@
+@@ -417,10 +470,26 @@
basic_machine=ns32k-sequent
os=-dynix
;;
@@ -1732,7 +1818,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -445,13 +506,20 @@
+@@ -445,13 +514,20 @@
basic_machine=j90-cray
os=-unicos
;;
@@ -1755,7 +1841,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
-@@ -481,6 +549,14 @@
+@@ -481,6 +557,14 @@
basic_machine=m88k-motorola
os=-sysv3
;;
@@ -1770,7 +1856,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
-@@ -631,6 +707,14 @@
+@@ -631,6 +715,14 @@
basic_machine=m68k-isi
os=-sysv
;;
@@ -1785,7 +1871,14 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
m88k-omron*)
basic_machine=m88k-omron
;;
-@@ -646,6 +730,10 @@
+@@ -642,10 +734,17 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
basic_machine=i386-pc
os=-mingw32
;;
@@ -1796,7 +1889,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
miniframe)
basic_machine=m68000-convergent
;;
-@@ -659,10 +747,6 @@
+@@ -659,10 +758,6 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
@@ -1807,7 +1900,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
monitor)
basic_machine=m68k-rom68k
os=-coff
-@@ -675,6 +759,9 @@
+@@ -675,6 +770,9 @@
basic_machine=i386-pc
os=-msdos
;;
@@ -1817,7 +1910,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
mvs)
basic_machine=i370-ibm
os=-mvs
-@@ -743,10 +830,6 @@
+@@ -743,10 +841,6 @@
np1)
basic_machine=np1-gould
;;
@@ -1828,7 +1921,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
nsr-tandem)
basic_machine=nsr-tandem
;;
-@@ -754,9 +837,8 @@
+@@ -754,9 +848,8 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
@@ -1839,7 +1932,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
;;
os400)
basic_machine=powerpc-ibm
-@@ -778,6 +860,14 @@
+@@ -778,6 +871,14 @@
basic_machine=i860-intel
os=-osf
;;
@@ -1854,7 +1947,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
pbd)
basic_machine=sparc-tti
;;
-@@ -787,6 +877,12 @@
+@@ -787,6 +888,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
@@ -1867,7 +1960,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
-@@ -843,6 +939,10 @@
+@@ -843,6 +950,10 @@
basic_machine=i586-unknown
os=-pw32
;;
@@ -1878,7 +1971,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
rom68k)
basic_machine=m68k-rom68k
os=-coff
-@@ -869,6 +969,10 @@
+@@ -869,6 +980,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
@@ -1889,7 +1982,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
sei)
basic_machine=mips-sei
os=-seiux
-@@ -880,6 +984,9 @@
+@@ -880,6 +995,9 @@
basic_machine=sh-hitachi
os=-hms
;;
@@ -1899,10 +1992,15 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
sh64)
basic_machine=sh64-unknown
;;
-@@ -969,6 +1076,10 @@
+@@ -969,6 +1087,15 @@
basic_machine=tic6x-unknown
os=-coff
;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
@@ -1910,7 +2008,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
tx39)
basic_machine=mipstx39-unknown
;;
-@@ -1029,6 +1140,10 @@
+@@ -1029,6 +1156,10 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
@@ -1921,7 +2019,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
xps | xps100)
basic_machine=xps100-honeywell
;;
-@@ -1040,6 +1155,10 @@
+@@ -1040,6 +1171,10 @@
basic_machine=z8k-unknown
os=-sim
;;
@@ -1932,7 +2030,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
none)
basic_machine=none-none
os=-none
-@@ -1059,6 +1178,9 @@
+@@ -1059,6 +1194,9 @@
romp)
basic_machine=romp-ibm
;;
@@ -1942,7 +2040,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
rs6000)
basic_machine=rs6000-ibm
;;
-@@ -1075,13 +1197,10 @@
+@@ -1075,13 +1213,10 @@
we32k)
basic_machine=we32k-att
;;
@@ -1958,14 +2056,25 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
basic_machine=sparc-sun
;;
cydra)
-@@ -1148,26 +1267,30 @@
+@@ -1128,6 +1263,9 @@
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1148,26 +1286,30 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
@@ -1991,11 +2100,11 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1185,7 +1308,7 @@
+@@ -1185,7 +1327,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -2004,7 +2113,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
-@@ -1294,6 +1417,12 @@
+@@ -1294,6 +1436,14 @@
-kaos*)
os=-kaos
;;
@@ -2014,10 +2123,12 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
-none)
;;
*)
-@@ -1316,6 +1445,12 @@
+@@ -1316,6 +1466,12 @@
# system, and we'll never get to this point.
case $basic_machine in
@@ -2030,7 +2141,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
*-acorn)
os=-riscix1.2
;;
-@@ -1325,9 +1460,9 @@
+@@ -1325,9 +1481,9 @@
arm*-semi)
os=-aout
;;
@@ -2043,7 +2154,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
-@@ -1353,6 +1488,9 @@
+@@ -1353,6 +1509,9 @@
m68*-cisco)
os=-aout
;;
@@ -2053,7 +2164,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
mips*-cisco)
os=-elf
;;
-@@ -1371,9 +1509,15 @@
+@@ -1371,9 +1530,15 @@
*-be)
os=-beos
;;
@@ -2069,7 +2180,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
*-wec)
os=-proelf
;;
-@@ -1476,7 +1620,7 @@
+@@ -1476,7 +1641,7 @@
-sunos*)
vendor=sun
;;
@@ -2078,7 +2189,7 @@ diff -urN w3m-0.5.2.orig/config.sub w3m-0.5.2/config.sub
vendor=ibm
;;
-beos*)
-@@ -1539,7 +1683,7 @@
+@@ -1539,7 +1704,7 @@
esac
echo $basic_machine$os
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 06:58:32 +0000