Index: /trunk/psModules/config.guess
===================================================================
--- /trunk/psModules/config.guess	(revision 3454)
+++ /trunk/psModules/config.guess	(revision 3455)
@@ -2,7 +2,7 @@
 # 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.
-
-timestamp='2003-06-17'
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+timestamp='2004-08-11'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -54,5 +54,5 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
@@ -137,10 +137,13 @@
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
-    VENDOR=redhat ;
-else
-    VENDOR= ;
-fi
+case "${UNAME_MACHINE}" in
+    i?86)
+	test -z "$VENDOR" && VENDOR=pc
+	;;
+    *)
+	test -z "$VENDOR" && VENDOR=unknown
+	;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
 
 # Note: order is significant - the case branches are not exclusive.
@@ -205,4 +208,7 @@
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -211,7 +217,13 @@
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -244,8 +256,22 @@
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
@@ -285,12 +311,10 @@
 		UNAME_MACHINE="alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -314,4 +338,7 @@
     *:OS/390:*:*)
 	echo i370-ibm-openedition
+	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
 	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
@@ -407,4 +434,7 @@
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
@@ -742,5 +772,5 @@
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
@@ -750,4 +780,9 @@
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -759,17 +794,6 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     i*:CYGWIN*:*)
@@ -804,5 +828,10 @@
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit 0 ;;
     i*86:Minix:*:*)
@@ -810,14 +839,17 @@
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo cris-axis-linux
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     mips:Linux:*:*)
@@ -838,5 +870,5 @@
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     mips64:Linux:*:*)
@@ -857,11 +889,11 @@
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR:-unknown}-linux-gnu
+	echo powerpc-${VENDOR}-linux
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR:-unknown}-linux-gnu
+	echo powerpc64-${VENDOR}-linux
 	exit 0 ;;
     alpha:Linux:*:*)
@@ -876,32 +908,32 @@
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	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}-${VENDOR}-linux${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+	  *)    echo hppa-${VENDOR}-linux ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR:-unknown}-linux-gnu
+	echo x86_64-${VENDOR}-linux
 	exit 0 ;;
     i*86:Linux:*:*)
@@ -918,16 +950,16 @@
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# Either a pre-BFD a.out linker (linuxoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
 		exit 0 ;;
 	esac
@@ -953,7 +985,10 @@
 	#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}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -982,4 +1017,7 @@
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
 	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
@@ -1052,7 +1090,7 @@
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
@@ -1152,7 +1190,8 @@
 	exit 0 ;;
     *:Darwin:*:*)
-	case `uname -p` in
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
 	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1169,5 +1208,5 @@
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
@@ -1213,4 +1252,14 @@
         echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac
 
Index: /trunk/psModules/config.sub
===================================================================
--- /trunk/psModules/config.sub	(revision 3454)
+++ /trunk/psModules/config.sub	(revision 3455)
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-06-18'
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+timestamp='2004-06-24'
 
 # This file is (in principle) common to ALL GNU software.
@@ -71,5 +71,5 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
@@ -119,5 +119,6 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -145,5 +146,5 @@
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
@@ -229,4 +230,5 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
@@ -235,6 +237,6 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
@@ -248,4 +250,5 @@
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
@@ -258,8 +261,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
@@ -299,5 +301,5 @@
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -306,6 +308,6 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
@@ -321,9 +323,11 @@
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -331,9 +335,8 @@
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -362,4 +365,7 @@
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
@@ -379,4 +385,7 @@
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
@@ -438,4 +447,12 @@
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
@@ -443,4 +460,8 @@
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
 		;;
 	da30 | da30-*)
@@ -643,8 +664,4 @@
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
 		;;
 	monitor)
@@ -728,8 +745,4 @@
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
@@ -743,4 +756,8 @@
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -834,4 +851,10 @@
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
@@ -956,4 +979,8 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
 		;;
 	udi29k)
@@ -1030,4 +1057,7 @@
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
@@ -1052,5 +1082,5 @@
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1125,11 +1155,12 @@
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1137,5 +1168,5 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
@@ -1161,6 +1192,6 @@
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+	-linux-dietlibc)
+		os=-linux-dietlibc
 		;;
 	-sunos5*)
@@ -1173,4 +1204,7 @@
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
@@ -1193,4 +1227,7 @@
 	-atheos*)
 		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
 		;;
 	-386bsd)
@@ -1215,4 +1252,7 @@
 	-sinix*)
 		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
 		;;
 	-triton*)
@@ -1283,7 +1323,7 @@
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1331,4 +1371,7 @@
 	*-ibm)
 		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
 		;;
 	*-wec)
@@ -1464,6 +1507,12 @@
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
 				;;
 			-vxsim* | -vxworks* | -windiss*)
Index: /trunk/psModules/src/Makefile.am
===================================================================
--- /trunk/psModules/src/Makefile.am	(revision 3454)
+++ /trunk/psModules/src/Makefile.am	(revision 3455)
@@ -2,9 +2,9 @@
 
 libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c \
-  pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c \
+  pmSubtractBias.c pmSubtractBias.c pmNonLinear.c \
   pmReadoutCombine.c pmSubtractSky.c pmObjects.c
 
 libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h \
-  pmSubtractBias.h psTest.h pmSubtractBias.h pmNonLinear.h \
+  pmSubtractBias.h pmSubtractBias.h pmNonLinear.h \
   pmReadoutCombine.h pmSubtractSky.h pmObjects.h
 
Index: unk/psModules/src/psTest.c
===================================================================
--- /trunk/psModules/src/psTest.c	(revision 3454)
+++ 	(revision )
@@ -1,245 +1,0 @@
-//
-// C Implementation: psTest
-//
-// Description:
-//
-//
-// Author: Robert DeSonia <robert.desonia@mhpcc.hpc.mil>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "psTest.h"
-#include "psMemory.h"
-#include "psError.h"
-#include "psTrace.h"
-
-#define HEADER_TOP    "/***************************** TESTPOINT ******************************************\\\n"
-#define HEADER_LINE_STRING   "* %20s: %-58s *\n"
-#define HEADER_LINE_INT      "* %20s: %-58d *\n"
-#define HEADER_BOTTOM "\\**********************************************************************************/\n\n"
-
-psBool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName,
-                       testDescription tests[], psS32 argc, char * const argv[] )
-{
-    psBool success = true;
-    psBool runAll = true;
-    psBool useFork = true;
-    psBool found;
-    psS32 c;
-    psS32 n;
-    extern char *optarg;
-
-    if ( argc > 0 ) {
-        while ( ( c = getopt( argc, argv, "lhn:dt:" ) ) != -1 ) {
-            switch ( c ) {
-            case 'h':
-                printf( "Usage: %s [-l] [-d] [-h] [-n=Testpoint#] [-t=TestpointName]\n"
-                        "    where:\n"
-                        "           -l  : lists the testpoints contained in this test driver executable\n"
-                        "           -d  : turns on debugger-friendly mode (no forking, aborts/signals are not handled)\n"
-                        "           -h  : prints this help\n"
-                        "           -n  : specifies a particular testpoint by number to run\n"
-                        "           -t  : specifies a particular testpoint by name to run\n"
-                        "    (if no -l, -n or -t options are given, all testpoints are run)\n",
-                        argv[ 0 ] );
-                runAll = false;
-                break;
-            case 'd':
-                useFork = false;
-                break;
-            case 'l':
-                printf( "Test Driver:  %s\n", testPointFile );
-                printf( "Package Name: %s\n", packageName );
-                printf( "Testpoints:\n" );
-                runAll = false;
-                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
-                    printf( "    %6d - %s \n", tests[ index ].testPointNumber,
-                            tests[ index ].testPointName );
-                }
-                printf( "\n" );
-                break;
-            case 't':
-                runAll = false;
-                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
-                    if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) {
-                        success = p_runTest( fp,
-                                             testPointFile,
-                                             packageName,
-                                             tests[ index ].testPointName,
-                                             tests[ index ].fcn,
-                                             tests[ index ].expectedReturn,
-                                             useFork ) && success;
-                    }
-                }
-                break;
-            case 'n':
-                runAll = false;
-                if ( sscanf( optarg, "%i", &n ) != 1 ) {
-                    psError(PS_ERR_UNKNOWN, true, "Failed to parse the testpoint number (%s).",
-                            optarg );
-                    break;
-                }
-                found = false;
-                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
-                    if ( n == tests[ index ].testPointNumber ) {
-                        found = true;
-                        success = p_runTest( fp,
-                                             testPointFile,
-                                             packageName,
-                                             tests[ index ].testPointName,
-                                             tests[ index ].fcn,
-                                             tests[ index ].expectedReturn,
-                                             useFork ) && success;
-                    }
-                }
-                if ( ! found ) {
-                    psError(PS_ERR_UNKNOWN, true, "The specified testpoint number (%d) doesn't exist in this test driver.",
-                            n );
-                    break;
-                }
-                break;
-            case '?':
-                psError(PS_ERR_UNKNOWN, true, "Option %s is not recognized and is ignored.", optarg );
-                break;
-            }
-        }
-    }
-
-    if ( runAll ) {
-        for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
-            if ( ! tests[ index ].isDuplicateEntry ) {
-                success = p_runTest( fp,
-                                     testPointFile,
-                                     packageName,
-                                     tests[ index ].testPointName,
-                                     tests[ index ].fcn,
-                                     tests[ index ].expectedReturn,
-                                     useFork ) && success;
-            }
-        }
-    }
-
-    if ( ! success ) {
-        psError( PS_ERR_UNKNOWN, true,
-                 "One or more tests failed" );
-    }
-
-    return success;
-}
-
-psBool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
-                  testFcn fcn, psS32 expectedReturn, psBool useFork )
-{
-    psS32 childReturn = 0;
-    pid_t child;
-
-    p_printPositiveTestHeader( fp, testPointFile, packageName, testPointName );
-
-    if ( useFork ) {
-        child = fork();
-        if ( child == 0 ) {                   // I am the child process, run the test
-            psS32 currentId = psMemGetId();
-            psS32 retVal = fcn();
-            if ( retVal == 0 ) { // only bother checking memory if test executed to end.
-                if ( psMemCheckLeaks( currentId, NULL, stderr, false ) != 0 ) {
-                    psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" );
-                    retVal = 64;
-                }
-                psMemCheckCorruption( 1 );
-            }
-            exit( retVal );
-        } else
-            if ( child < 0 ) {
-                fprintf( fp, "Couldn't fork a process to run a negative test (%s|%s)",
-                         packageName, testPointName );
-                abort();
-            }
-
-        waitpid( child, &childReturn, 0 );
-        if ( WIFSIGNALED( childReturn ) ) {
-            childReturn = -WTERMSIG( childReturn );
-        } else {
-            childReturn = WEXITSTATUS( childReturn );
-        }
-    } else {
-        psS32 currentId = psMemGetId();
-        childReturn = fcn();
-        if ( childReturn == 0 ) { // only bother checking memory if test executed to end.
-            if ( psMemCheckLeaks( currentId, NULL, stderr, false ) != 0 ) {
-                psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" );
-                childReturn = 64;
-            }
-            psMemCheckCorruption( 1 );
-        }
-    }
-
-
-    if ( childReturn != expectedReturn ) {
-        fprintf( fp, "Return value mismatch: expected %d, got %d",
-                 expectedReturn, childReturn );
-    }
-
-    p_printFooter( fp, testPointFile, packageName, testPointName,
-                   ( childReturn == expectedReturn ) );
-
-    return ( childReturn == expectedReturn );
-}
-
-void p_printPositiveTestHeader( FILE *fp,
-                                const char* testPointFile,
-                                const char* packageName,
-                                const char* testPointName )
-{
-    char TP[ 80 ];
-
-    snprintf( TP, 80, "%s{%s}", packageName, testPointName );
-
-    fprintf( fp, HEADER_TOP );
-    fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
-    fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
-    fprintf( fp, HEADER_LINE_STRING, "TestType", "Positive" );
-    fprintf( fp, HEADER_BOTTOM );
-}
-
-void p_printNegativeTestHeader( FILE *fp,
-                                const char* testPointFile,
-                                const char* packageName,
-                                const char* testPointName,
-                                const char* expectedError,
-                                psS32 exitValue )
-{
-    char TP[ 80 ];
-
-    snprintf( TP, 80, "%s{%s}", packageName, testPointName );
-
-    fprintf( fp, HEADER_TOP );
-    fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
-    fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
-    fprintf( fp, HEADER_LINE_STRING, "TestType", "Negative" );
-    fprintf( fp, HEADER_LINE_STRING, "ExpectedErrorText", expectedError );
-    fprintf( fp, HEADER_LINE_INT, "ExpectedStatusValue", exitValue );
-    fprintf( fp, HEADER_BOTTOM );
-}
-
-
-void p_printFooter( FILE *fp,
-                    const char* testPointFile,
-                    const char* packageName,
-                    const char* testPointName,
-                    psBool success )
-{
-    if ( success ) {
-        fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
-    } else {
-        fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
-    }
-}
Index: unk/psModules/src/psTest.h
===================================================================
--- /trunk/psModules/src/psTest.h	(revision 3454)
+++ 	(revision )
@@ -1,81 +1,0 @@
-
-#ifndef PSTEST_H
-#define PSTEST_H
-
-#include <stdio.h>
-#include <stdbool.h>
-
-#define printPositiveTestHeader(filePtr, packageName, testPointName) \
-p_printPositiveTestHeader(filePtr, __FILE__, packageName, testPointName)
-
-#define printNegativeTestHeader(filePtr, packageName, testPointName, expectedError, exitValue) \
-p_printNegativeTestHeader(filePtr, __FILE__, packageName, testPointName, expectedError, exitValue)
-
-#define printFooter(filePtr, packageName, testPointName, success) \
-p_printFooter(filePtr, __FILE__, packageName, testPointName, success)
-
-typedef int (*testFcn)(void);
-
-typedef struct
-{
-    testFcn     fcn;
-    int         testPointNumber;
-    const char* testPointName;
-    int         expectedReturn;
-    bool        isDuplicateEntry;
-}
-testDescription;
-
-#define runTest(filePtr, packageName, testPointName, fcn, expectedReturn, useFork) \
-p_runTest(filePtr, __FILE__, packageName, testPointName, fcn, expectedReturn, useFork)
-
-#define runTestSuite(filePtr, packageName, tests, argc, argv) \
-p_runTestSuite(filePtr, __FILE__, packageName, tests, argc, argv)
-
-
-/////////////////////////// PRIVATE FUNCTIONS //////////////////////////////
-
-bool p_runTest(
-    FILE *fp,
-    const char* testPointFile,
-    const char* packageName,
-    const char* testPointName,
-    testFcn fcn,
-    int expectedReturn,
-    bool useFork
-);
-
-bool p_runTestSuite(
-    FILE *fp,
-    const char* testPointFile,
-    const char* packageName,
-    testDescription tests[],
-    int argc,
-    char * const argv[]
-);
-
-void p_printPositiveTestHeader(
-    FILE *fp,
-    const char* testPointFile,
-    const char* packageName,
-    const char* testPointName
-);
-
-void p_printNegativeTestHeader(
-    FILE *fp,
-    const char* testPointFile,
-    const char* packageName,
-    const char* testPointName,
-    const char* expectedError,
-    int exitValue
-);
-
-void p_printFooter(
-    FILE *fp,
-    const char* testPointFile,
-    const char* packageName,
-    const char* testPointName,
-    bool success
-);
-
-#endif