summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-01-04 17:14:58 +0000
committerRoland McGrath <roland@gnu.org>2006-01-04 17:14:58 +0000
commit8e856b5a9aeb2cf6c468b65be5a6efef2dd1bbb5 (patch)
treec8b54f7ed1ab43a2349b9b16b940700d5870c2dd
parente7cbb3a8c251898e69811ed198aba46e42d6113c (diff)
downloadglibc-8e856b5a9aeb2cf6c468b65be5a6efef2dd1bbb5.tar.gz
* abi-tags (*-.*-syllable.*): New match, with ABI value 5.
* elf/cache.c (print_entry): Match the Syllable ABI tag.
-rw-r--r--ChangeLog5
-rw-r--r--abi-tags2
-rw-r--r--elf/cache.c3
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/tst-mbswcs1.c16
5 files changed, 23 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f96202eb6a..657c7f26fe 100644
--- 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 31c14c2bc2..87cd6816a9 100644
--- 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 c13918ccb4..9462ac1b53 100644
--- 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 67a60bd8be..f4c29fc173 100644
--- 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 93795beb9e..fb2ea84cdd 100644
--- 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;
}