2003-11-24  Robert Millan  <address@hidden>

	* abi-tags: Add GNU/KNetBSD and update GNU/KFreeBSD triplet.
	* configure.in: Likewise.
	* configure: Regenerate.
	* shlib-versions: Add GNU/KNetBSD and GNU/KFreeBSD.
	* scripts/config.{guess,sub}: Update.

diff -ur glibc.old/abi-tags glibc/abi-tags
--- glibc.old/abi-tags	2002-09-21 00:00:22.000000000 +0200
+++ glibc/abi-tags	2003-11-24 14:04:15.000000000 +0100
@@ -22,7 +22,9 @@
 
 .*-sun-solaris2.*	2	2.0.0	# just an arbitrary value
 
-.*-.*-freebsd.*-gnu.*	3	4.0.0	# earliest compatible kernel version
+.*-.*-kfreebsd.*-gnu	3	4.0.0	# earliest compatible kernel version
+
+.*-.*-knetbsd.*-gnu	4	1.6.0	# earliest compatible kernel version
 
 # There is no catch-all default here because every supported OS that uses
 # ELF must have its own unique ABI tag.
diff -ur glibc.old/configure.in glibc/configure.in
--- glibc.old/configure.in	2003-11-12 01:37:03.000000000 +0100
+++ glibc/configure.in	2003-11-24 14:08:49.000000000 +0100
@@ -308,7 +308,7 @@
 
 # Some configurations imply other options.
 case "$host_os" in
-gnu* | linux* | bsd4.4* | netbsd* | freebsd*)
+gnu* | linux* | bsd4.4* | k*bsd*-gnu | netbsd* | freebsd*)
   # These systems always use GNU tools.
   gnu_ld=yes gnu_as=yes ;;
 esac
@@ -316,7 +316,7 @@
 # i586-linuxaout is mangled into i586-pc-linux-gnuaout
 linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
   ;;
-gnu* | linux* | freebsd* | netbsd* | sysv4* | solaris2* | irix6*)
+gnu* | linux* | k*bsd*-gnu | freebsd* | netbsd* | sysv4* | solaris2* | irix6*)
   # These systems (almost) always use the ELF format.
   elf=yes
   ;;
@@ -453,8 +453,12 @@
 case "$os" in
 gnu*)
   base_os=mach/hurd ;;
-netbsd* | 386bsd* | freebsd* | bsdi*)
+386bsd* | freebsd* | bsdi*)
   base_os=unix/bsd/bsd4.4 ;;
+kfreebsd* | freebsd*)
+  base_os=unix/bsd/bsd4.4/kfreebsd ;;
+knetbsd* | netbsd*)
+  base_os=unix/bsd/bsd4.4/knetbsd ;;
 osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
   base_os=unix/bsd ;;
 sysv* | isc* | esix* | sco* | minix* | irix4* | linux*)
diff -ur glibc.old/shlib-versions glibc/shlib-versions
--- glibc.old/shlib-versions	2002-09-05 11:32:03.000000000 +0200
+++ glibc/shlib-versions	2003-11-24 14:09:59.000000000 +0100
@@ -26,6 +26,8 @@
 x86_64-.*-linux.*       DEFAULT			GLIBC_2.2.5
 powerpc64-.*-linux.*	DEFAULT			GLIBC_2.3
 .*-.*-gnu-gnu.*		DEFAULT			GLIBC_2.2.6
+.*-.*-kfreebsd.*-gnu	DEFAULT			GLIBC_2.3
+.*-.*-knetbsd.*-gnu	DEFAULT			GLIBC_2.3.1
 
 # Configuration		Library=version		Earliest symbol set (optional)
 # -------------		---------------		------------------------------
@@ -39,6 +41,8 @@
 hppa.*-.*-.*		libm=6			GLIBC_2.2
 .*-.*-linux.*		libm=6
 .*-.*-gnu-gnu.*		libm=6
+.*-.*-kfreebsd.*-gnu	libm=1
+.*-.*-knetbsd.*-gnu	libm=1
 
 # We provide libc.so.6 for Linux kernel versions 2.0 and later.
 alpha.*-.*-linux.*	libc=6.1
@@ -49,6 +53,8 @@
 sparc64-.*-linux.*	libc=6			GLIBC_2.2
 hppa.*-.*-.*		libc=6			GLIBC_2.2
 .*-.*-linux.*		libc=6
+.*-.*-kfreebsd.*-gnu	libc=1
+.*-.*-knetbsd.*-gnu	libc=1
 
 # libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
 .*-.*-gnu-gnu.*		libmachuser=1