Update.

2004-01-20  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/readahead.c (__readahead): Use off64_t
	instead of loff_t.  Include <fcntl.h>.
	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Add readahead prototype.
	* sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/cris/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.

	* elf/dl-load.c: Don't add attribute_relro to max_dirnamelen.

	* sysdeps/generic/inttypes.h: Fix PRI*FAST{16,32} macros.

	* include/unistd.h (__libc_enable_secure): Mark attribute_relro.
	(__libc_enable_secure_internal): Likewise.
	* elf/dl-load.c: Don't declare __libc_stack_end.
	* sysdeps/generic/libc-start.c: Likewise.
	* sysdeps/unix/sysv/linux/dl-execstack.c: Likewise.
	* sysdeps/generic/segfault.c: Likewise.  Include ldsodefs.h.
	* sysdeps/generic/backtrace.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8ec757bea532454eb303bb0d896ad4d44ecca6af..5d3628a539d92ee14995ef68c2539d13f42bc190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2004-01-20  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/readahead.c (__readahead): Use off64_t
+       instead of loff_t.  Include <fcntl.h>.
+       * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Add readahead prototype.
+       * sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/cris/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
+
+       * elf/dl-load.c: Don't add attribute_relro to max_dirnamelen.
+
+       * sysdeps/generic/inttypes.h: Fix PRI*FAST{16,32} macros.
+
 2003-12-31  Bruno Haible  <bruno@clisp.org>
 
        * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E.
@@ -36,14 +57,14 @@
 
 2004-01-16  Richard Henderson  <rth@redhat.com>
 
-        * include/unistd.h (__libc_enable_secure): Mark attribute_relro.
-        (__libc_enable_secure_internal): Likewise.
+       * include/unistd.h (__libc_enable_secure): Mark attribute_relro.
+       (__libc_enable_secure_internal): Likewise.
 
-        * elf/dl-load.c: Don't declare __libc_stack_end.
-        * sysdeps/generic/libc-start.c: Likewise.
-        * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise.
-        * sysdeps/generic/segfault.c: Likewise.  Include ldsodefs.h.
-        * sysdeps/generic/backtrace.c: Likewise.
+       * elf/dl-load.c: Don't declare __libc_stack_end.
+       * sysdeps/generic/libc-start.c: Likewise.
+       * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise.
+       * sysdeps/generic/segfault.c: Likewise.  Include ldsodefs.h.
+       * sysdeps/generic/backtrace.c: Likewise.
 
 2004-01-15  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/elf/dl-load.c b/elf/dl-load.c
index f9e2bcbbe3df5bf427d30cecd0e793fb6aa960b6..a3b853295579bb5e67f7da398f8e15495c01577e 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -359,7 +359,7 @@ add_name_to_object (struct link_map *l, const char *name)
 /* Standard search directories.  */
 static struct r_search_path_struct rtld_search_dirs attribute_relro;
 
-static size_t max_dirnamelen attribute_relro;
+static size_t max_dirnamelen;
 
 static struct r_search_path_elem **
 fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,

diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 518c6215722a1335aa97e06f82974a27ec92d28b..20f1e9f17f98405739e03bb44a03a421659d99c3 100644 (file)
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -242,7 +242,6 @@ nl_NL/ISO-8859-1 \
 nl_NL@euro/ISO-8859-15 \
 nn_NO.UTF-8/UTF-8 \
 nn_NO/ISO-8859-1 \
-no_NO.UTF-8/UTF-8 \
 oc_FR/ISO-8859-1 \
 om_ET/UTF-8 \
 om_KE/ISO-8859-1 \

diff --git a/sysdeps/generic/inttypes.h b/sysdeps/generic/inttypes.h
index 18264e7c12831e48a029b2ea57c525b456f486b9..4ac6815623a42164886555bbbb41a77828cc9a4e 100644 (file)
--- a/sysdeps/generic/inttypes.h
+++ b/sysdeps/generic/inttypes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2001, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -68,8 +68,8 @@ typedef wchar_t __gwchar_t;
 # define PRIdLEAST64   __PRI64_PREFIX "d"
 
 # define PRIdFAST8     "d"
-# define PRIdFAST16    "d"
-# define PRIdFAST32    "d"
+# define PRIdFAST16    __PRIPTR_PREFIX "d"
+# define PRIdFAST32    __PRIPTR_PREFIX "d"
 # define PRIdFAST64    __PRI64_PREFIX "d"
 
 
@@ -84,8 +84,8 @@ typedef wchar_t __gwchar_t;
 # define PRIiLEAST64   __PRI64_PREFIX "i"
 
 # define PRIiFAST8     "i"
-# define PRIiFAST16    "i"
-# define PRIiFAST32    "i"
+# define PRIiFAST16    __PRIPTR_PREFIX "i"
+# define PRIiFAST32    __PRIPTR_PREFIX "i"
 # define PRIiFAST64    __PRI64_PREFIX "i"
 
 /* Octal notation.  */
@@ -100,8 +100,8 @@ typedef wchar_t __gwchar_t;
 # define PRIoLEAST64   __PRI64_PREFIX "o"
 
 # define PRIoFAST8     "o"
-# define PRIoFAST16    "o"
-# define PRIoFAST32    "o"
+# define PRIoFAST16    __PRIPTR_PREFIX "o"
+# define PRIoFAST32    __PRIPTR_PREFIX "o"
 # define PRIoFAST64    __PRI64_PREFIX "o"
 
 /* Unsigned integers.  */
@@ -116,8 +116,8 @@ typedef wchar_t __gwchar_t;
 # define PRIuLEAST64   __PRI64_PREFIX "u"
 
 # define PRIuFAST8     "u"
-# define PRIuFAST16    "u"
-# define PRIuFAST32    "u"
+# define PRIuFAST16    __PRIPTR_PREFIX "u"
+# define PRIuFAST32    __PRIPTR_PREFIX "u"
 # define PRIuFAST64    __PRI64_PREFIX "u"
 
 /* lowercase hexadecimal notation.  */
@@ -132,8 +132,8 @@ typedef wchar_t __gwchar_t;
 # define PRIxLEAST64   __PRI64_PREFIX "x"
 
 # define PRIxFAST8     "x"
-# define PRIxFAST16    "x"
-# define PRIxFAST32    "x"
+# define PRIxFAST16    __PRIPTR_PREFIX "x"
+# define PRIxFAST32    __PRIPTR_PREFIX "x"
 # define PRIxFAST64    __PRI64_PREFIX "x"
 
 /* UPPERCASE hexadecimal notation.  */
@@ -148,8 +148,8 @@ typedef wchar_t __gwchar_t;
 # define PRIXLEAST64   __PRI64_PREFIX "X"
 
 # define PRIXFAST8     "X"
-# define PRIXFAST16    "X"
-# define PRIXFAST32    "X"
+# define PRIXFAST16    __PRIPTR_PREFIX "X"
+# define PRIXFAST32    __PRIPTR_PREFIX "X"
 # define PRIXFAST64    __PRI64_PREFIX "X"
 
 

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
index a84d33572de94de3de8c3e838e24a53735ab6d80..7d1197a8eacac8db5ef7e4b028db2a39fba2808e 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
@@ -171,3 +171,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
index 152858d9f64ea7c5c15764fd0abbfc6d481b9405..ce17d68038ca1d4bcf9bfb9d13ebb105f49ac65a 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
@@ -178,3 +178,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/cris/bits/fcntl.h b/sysdeps/unix/sysv/linux/cris/bits/fcntl.h
index 7e841f831a6e4abdafe6ddab126fc31d21b4239f..69ce6a506b5af0190d3fddceff414f13c196c103 100644 (file)
--- a/sysdeps/unix/sysv/linux/cris/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/cris/bits/fcntl.h
@@ -177,3 +177,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h b/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
index fca17b1b771e01cd542782c528f232257b8b0e08..6f13871d832de2d00a98fe21ceae9fdfb03227ce 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
@@ -170,3 +170,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index 36b504a54388157dd2ded14a71637a36e92dc400..bd27ae54df0590dd30d5f90c4eb693e24f2a3867 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -177,3 +177,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
index 0dbd56a462d4699ebb56f9b160c0ed1683d451a0..e141e98cb7337cff5614ae7e7fbe1e978ca9664d 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
@@ -172,3 +172,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
index 7de111adb72e53c0d7bfd5aa72f65ad54c05118e..af7c0ea9ac22b8eeff176adcf318adef0beab5cb 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
@@ -177,3 +177,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index 98608c554fc0c6b2e03b84e44614614339517dd2..dc9c05d29725767a12e3be7426230258dbfcc45b 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -177,3 +177,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/readahead.c b/sysdeps/unix/sysv/linux/readahead.c
index 18e48dafe4ea64de05e09e33db1df3b316047287..dc628b2b2c43672d5345cec716c9cc55b2ca0347 100644 (file)
--- a/sysdeps/unix/sysv/linux/readahead.c
+++ b/sysdeps/unix/sysv/linux/readahead.c
@@ -1,5 +1,5 @@
 /* Provide kernel hint to read ahead.
-   Copyright (C) 2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include <errno.h>
+#include <fcntl.h>
 #include <sys/types.h>
 
 #include <sysdep.h>
@@ -27,14 +28,14 @@
 #ifdef __NR_readahead
 
 ssize_t
-__readahead (int fd, loff_t offset, size_t count)
+__readahead (int fd, off64_t offset, size_t count)
 {
   return INLINE_SYSCALL (readahead, 4, fd, (off_t) (offset >> 32),
                         (off_t) (offset & 0xffffffff), count);
 }
 #else
 ssize_t
-__readahead (int fd, loff_t offset, size_t count)
+__readahead (int fd, off64_t offset, size_t count)
 {
   __set_errno (ENOSYS);
   return -1;

diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index 3fd044a934db2316ffda8da5da6915ed07ee78a7..fe04f96279959f8ba1646d2d4228ed9f75df7c41 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -197,3 +197,11 @@ struct flock64
 #  define POSIX_FADV_NOREUSE   5 /* Data will be accessed once.  */
 # endif
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
index 0889a705497a9e05c62794d894924a8611f7297c..d3a8d821220e932a6c320f96bdab7b06093c74b5 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
@@ -153,3 +153,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index 13d1fc20292c68ff83ad2844eebd1fbf902f3d0c..27fc3f839111c7776c57873cf3839640354447f3 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -196,3 +196,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
index fda18a7bd03e0597e47a6175b705363c5571d3d8..f41af70f97c61ee15697df055ae64544e1885625 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
@@ -181,3 +181,11 @@ struct flock64
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */
 #endif
+
+__BEGIN_DECLS
+
+/* Provide kernel hint to read ahead.  */
+extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
+    __THROW;
+
+__END_DECLS