* abi-tags (*-.*-syllable.*): New match, with ABI value 5.

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

diff --git a/ChangeLog b/ChangeLog
index f96202eb6a2ba4580c06c5a6842929e3ddc17583..657c7f26fef967975eb239ce5459ed15cacd84c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-25  Kristian Van Der Vliet  <vanders@liqwyd.com>
+
+       * abi-tags (*-.*-syllable.*): New match, with ABI value 5.
+       * elf/cache.c (print_entry): Match the Syllable ABI tag.
+
 2006-01-04  Ulrich Drepper  <drepper@redhat.com>
 
        * include/stdlib.h: Make even more C++ compliant.

diff --git a/abi-tags b/abi-tags
index 31c14c2bc21f9fae341cb40487a6865472adb13f..87cd6816a91fe94b604f95969023937ed49a1d8e 100644 (file)
--- a/abi-tags
+++ b/abi-tags
@@ -26,5 +26,7 @@
 
 .*-.*-knetbsd.*-gnu.*  4       1.6.0   # earliest compatible kernel version
 
+.*-.*-syllable.*       5       2.0.0   # just an arbitrary value
+
 # 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 c13918ccb4c6fa63f6fe31fd0e162d112efbfb57..9462ac1b538215cd6f73052937796d2bc0582a1a 100644 (file)
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -107,7 +107,8 @@ print_entry (const char *lib, int flag, unsigned int osversion,
        [2] = "Solaris",
        [3] = "FreeBSD",
        [4] = "kNetBSD",
-       [5] = N_("Unknown OS")
+       [5] = "Syllable",
+       [6] = N_("Unknown OS")
       };
 #define MAXTAG (sizeof abi_tag_os / sizeof abi_tag_os[0] - 1)
       unsigned int os = osversion >> 24;

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 67a60bd8be2d987dcd6bfea07ce8fe697f53f736..f4c29fc173a63bda1132ee08643e5207ab14c148 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-27  Roland McGrath  <roland@redhat.com>
+
+       * tst-ctype.c (main): Add some casts.
+
+       * tst-mbswcs1.c (main): Make BUF const.  Add casts in mbrtowc calls.
+
 2006-01-02  Andreas Jaeger  <aj@suse.de>
 
        * locales/fi_FI: Fix date_fmt.

diff --git a/localedata/tst-mbswcs1.c b/localedata/tst-mbswcs1.c
index 93795beb9e71652045c9d7e40882e621a5ad71c3..fb2ea84cdd1181a778acfb18a25775f8681512c6 100644 (file)
--- a/localedata/tst-mbswcs1.c
+++ b/localedata/tst-mbswcs1.c
@@ -1,5 +1,5 @@
 /* Test restarting behaviour of mbrtowc.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Bruno Haible <haible@ilog.fr>.
 
@@ -37,7 +37,7 @@
 int
 main (void)
 {
-  unsigned char buf[6] = { 0x25,  0xe2, 0x82, 0xac,  0xce, 0xbb };
+  const unsigned char buf[6] = { 0x25,  0xe2, 0x82, 0xac,  0xce, 0xbb };
   mbstate_t state;
   wchar_t wc = 42;
   size_t n;
@@ -52,12 +52,12 @@ main (void)
 
   memset (&state, '\0', sizeof (state));
 
-  show (mbrtowc (&wc, buf + 0, 1, &state), 1, 37);
-  show (mbrtowc (&wc, buf + 1, 1, &state), -2, 37);
-  show (mbrtowc (&wc, buf + 2, 3, &state), 2, 8364);
-  show (mbrtowc (&wc, buf + 4, 1, &state), -2, 8364);
-  show (mbrtowc (&wc, buf + 5, 1, &state), 1, 955);
-  show (mbrtowc (&wc, buf + 5, 1, &state), -1, 955);
+  show (mbrtowc (&wc, (const char *) buf + 0, 1, &state), 1, 37);
+  show (mbrtowc (&wc, (const char *) buf + 1, 1, &state), -2, 37);
+  show (mbrtowc (&wc, (const char *) buf + 2, 3, &state), 2, 8364);
+  show (mbrtowc (&wc, (const char *) buf + 4, 1, &state), -2, 8364);
+  show (mbrtowc (&wc, (const char *) buf + 5, 1, &state), 1, 955);
+  show (mbrtowc (&wc, (const char *) buf + 5, 1, &state), -1, 955);
 
   return result;
 }