aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--locale/locarchive.h1
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/Makefile5
-rw-r--r--sysdeps/unix/sysv/linux/ia64/syscalls.list3
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list3
6 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9464fc0610..d51c0e4cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-09 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/ia64/syscalls.list (llseek): Add lseek
+ aliases.
+ (lseek): Dummy.
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (llseek, lseek):
+ Likewise.
+
2002-08-09 Roland McGrath <roland@redhat.com>
* locale/loadarchive.c (_nl_load_locale_from_archive): Parse locale
@@ -18,6 +26,7 @@
(parse_opt): Grok -A, set that.
* locale/programs/localedef.h: Declare it.
+ * locale/locarchive.h (struct locrecent): Add `refs' member.
* locale/programs/locarchive.c (insert_name): New function, broken out
of ...
(add_locale_to_archive): ... here. Call that.
diff --git a/locale/locarchive.h b/locale/locarchive.h
index 2005989598..f43a6b6734 100644
--- a/locale/locarchive.h
+++ b/locale/locarchive.h
@@ -70,6 +70,7 @@ struct sumhashent
struct locrecent
{
+ uint32_t refs; /* # of namehashent records that point here */
struct
{
uint32_t offset;
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 34dbb07190..abefa10d75 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-09 Roland McGrath <roland@redhat.com>
+
+ * Makefile ($(INSTALL-SUPPORTED-LOCALES)): Pass --alias-file option to
+ localedef.
+
2002-08-02 Ulrich Drepper <drepper@redhat.com>
* locales/fa_IR: Fixing the Alef Hamza vs Waw Hamza ordering bug.
diff --git a/localedata/Makefile b/localedata/Makefile
index 99819855bb..60c69b2cf2 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -213,8 +213,9 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
- $(LOCALEDEF) -i locales/$$input -c -f charmaps/$$charset \
- $(addprefix --prefix=,$(install_root)) $$locale; \
+ $(LOCALEDEF) --alias-file=../intl/locale.alias \
+ -i locales/$$input -c -f charmaps/$$charset \
+ $(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
# The mbwc-tests need some environment setup to find the locale data files
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index 0aca8a140f..23ab3cc0fc 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -3,7 +3,8 @@
umount2 - umount 2 __umount2 umount2
# Whee! 64-bit systems naturally implement llseek.
-llseek EXTRA lseek 3 __libc_lseek64 __lseek llseek __lseek64 lseek64
+llseek EXTRA lseek 3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+lseek llseek -
pread - pread 4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index 64f52cc02a..191e278591 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -1,6 +1,7 @@
# File name Caller Syscall name # args Strong name Weak names
-llseek EXTRA lseek 3 __libc_lseek64 __lseek llseek __lseek64 lseek64
+llseek EXTRA lseek 3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+lseek llseek -
pread - pread 4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64