about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-20 22:07:20 +0000
committerRoland McGrath <roland@gnu.org>2002-09-20 22:07:20 +0000
commit82c261269b2d8402958f7ee393d6c701b335ef7c (patch)
tree132948c73c62a04f8cf162b46a02e6ac67de88db /elf
parent800a312a56abc34e98c5b2474260adc8c4faccd7 (diff)
downloadglibc-82c261269b2d8402958f7ee393d6c701b335ef7c.tar.gz
glibc-82c261269b2d8402958f7ee393d6c701b335ef7c.tar.xz
glibc-82c261269b2d8402958f7ee393d6c701b335ef7c.zip
* sysdeps/generic/utmp-equal.h: New file, extracted from utmp_file.c.
	* sysdeps/generic/utmp_file.c (setutent_file): Invalidate last_entry
	also on platforms with !HAVE_UT_TYPE.
	(proc_utmp_eq): Remove function.
	(internal_getut_r, pututline_file): Call __utmp_equal instead.

2002-09-20  Bruno Haible  <bruno@clisp.org>

	* abi-tags: Add support for FreeBSD with ABI OS value 3.
	* elf/cache.c (print_entry): Support the GNU/FreeBSD ABI tag.
Diffstat (limited to 'elf')
-rw-r--r--elf/cache.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/cache.c b/elf/cache.c
index c1c4be0c3e..67874b3c9e 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -101,12 +101,14 @@ print_entry (const char *lib, int flag, unsigned int osversion,
 	[0] = "Linux",
 	[1] = "Hurd",
 	[2] = "Solaris",
-	[3] = N_("Unknown OS")
+	[3] = "FreeBSD",
+	[4] = N_("Unknown OS")
       };
+#define MAXTAG (sizeof abi_tag_os / sizeof abi_tag_os[0] - 1)
       unsigned int os = osversion >> 24;
 
       printf (_(", OS ABI: %s %d.%d.%d"),
-	      _(abi_tag_os[os > 3 ? 3 : os]),
+	      _(abi_tag_os[os > MAXTAG ? MAXTAG : os]),
 	      (osversion >> 16) & 0xff,
 	      (osversion >> 8) & 0xff,
 	      osversion & 0xff);