* abi-tags (.*-.*-knetbsd.*-gnu.*): New match, with ABI value 4.

	* elf/cache.c (print_entry): Match the kNetBSD ABI tag.

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 45653ddd0b..b0ffe2c7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-03  Robert Millan  <robertmh@gnu.org>
+
+	* abi-tags (.*-.*-knetbsd.*-gnu.*): New match, with ABI value 4.
+	* elf/cache.c (print_entry): Match the kNetBSD ABI tag.
+
 2005-10-16  Alfred M. Szmidt  <ams@gnu.org>
 
 	* sysdeps/generic/bits/mman.h
diff --git a/abi-tags b/abi-tags
index 7adc62ef2d..31c14c2bc2 100644
--- a/abi-tags
+++ b/abi-tags
@@ -24,5 +24,7 @@
 
 .*-.*-freebsd.*-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 --git a/elf/cache.c b/elf/cache.c
index 9324f3dc6c..d5f313657c 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -108,7 +108,8 @@ print_entry (const char *lib, int flag, unsigned int osversion,
 	[1] = "Hurd",
 	[2] = "Solaris",
 	[3] = "FreeBSD",
-	[4] = N_("Unknown OS")
+	[4] = "kNetBSD",
+	[5] = N_("Unknown OS")
       };
 #define MAXTAG (sizeof abi_tag_os / sizeof abi_tag_os[0] - 1)
       unsigned int os = osversion >> 24;