aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--localedata/ChangeLog13
-rw-r--r--localedata/sort-test.sh1
-rw-r--r--localedata/tst-fmon.c4
-rwxr-xr-xlocaledata/tst-fmon.sh3
-rw-r--r--localedata/tst-numeric.c2
-rw-r--r--localedata/tst-numeric.sh3
-rw-r--r--malloc/malloc.c2
-rw-r--r--nptl/ChangeLog15
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h20
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h4
-rw-r--r--string/test-strcat.c4
13 files changed, 70 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ebc98ff4d..8e58f40d7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-01 Ulrich Drepper <drepper@redhat.com>
+
+ * malloc/malloc.c (mSTATs): Call ptmalloc_init if necessary.
+
+2003-04-29 Andreas Schwab <schwab@suse.de>
+
+ * string/test-strcat.c (do_one_test): Fix attribute name.
+
2003-04-30 Alexandre Oliva <aoliva@redhat.com>
* sysdeps/unix/sysv/linux/mips/sys/ucontext.h (ucontext): Make
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8322e01524..c5306f8c6d 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-30 Petter Reinholdtsen <pere@hungry.com>
+
+ * tst-fmon.c: Report name of locale if setlocale() fails.
+ * tst-numeric.c: Likewise.
+
+ * tst-fmon.sh: Ignore lines starting with hash '#' in the data file.
+ * tst-numeric.sh: Likewise.
+
+2003-04-30 Petter Reinholdtsen <pere@hungry.com>
+
+ * sort-test.sh: Output 'diff -u' when sorting test failed, to make
+ it easier to find out what was wrong with the sorting order.
+
2003-04-16 Petter Reinholdtsen <pere@hungry.com>
* Makefile (tests): Add LC_NUMERIC test tst-numeric.out.
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index d47f20911f..a1ec24060a 100644
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -27,6 +27,7 @@ for l in $lang; do
echo "$l OK"
else
echo "$l FAIL"
+ diff -u $cns.in ${common_objpfx}localedata/$cns.xout
status=1
fi
done
diff --git a/localedata/tst-fmon.c b/localedata/tst-fmon.c
index 4710efbd2b..af87335972 100644
--- a/localedata/tst-fmon.c
+++ b/localedata/tst-fmon.c
@@ -1,5 +1,5 @@
/* Testing the implementation of strfmon(3).
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
if (setlocale (LC_MONETARY, argv[1]) == NULL)
{
- perror ("setlocale");
+ fprintf (stderr, "setlocale(LC_MONETARY, \"%s\"): %m\n", argv[1]);
exit (EXIT_SETLOCALE);
}
/* This is locale-dependent! see setlocale(3) for details */
diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index 7b3cb2b02d..e58db1d344 100755
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Testing the implementation of strfmon(3).
-# Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
#
@@ -41,6 +41,7 @@ done
# Run the tests.
# There's a TAB for IFS
while IFS=" " read locale format value expect; do
+ case "$locale" in '#'*) continue ;; esac
if [ -n "$format" ]; then
LOCPATH=${common_objpfx}localedata \
GCONV_PATH=${common_objpfx}/iconvdata \
diff --git a/localedata/tst-numeric.c b/localedata/tst-numeric.c
index 86e6533f01..9d3c91d155 100644
--- a/localedata/tst-numeric.c
+++ b/localedata/tst-numeric.c
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
if (setlocale (LC_ALL, argv[1]) == NULL)
{
- perror ("setlocale");
+ fprintf (stderr, "setlocale(LC_ALL, \"%s\"): %m\n", argv[1]);
exit (EXIT_SETLOCALE);
}
diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh
index e6e973feba..f590dfd042 100644
--- a/localedata/tst-numeric.sh
+++ b/localedata/tst-numeric.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Testing the implementation of LC_NUMERIC and snprintf(3).
-# Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
#
@@ -27,6 +27,7 @@ datafile=$3
# Run the tests.
# There's a TAB for IFS
while IFS=" " read locale format value expect; do
+ case "$locale" in '#'*) continue ;; esac
if [ -n "$format" ]; then
LOCPATH=${common_objpfx}localedata \
GCONV_PATH=${common_objpfx}/iconvdata \
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 0586a0cb7f..8b862feb5b 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -5090,6 +5090,8 @@ void mSTATs()
long stat_lock_direct = 0, stat_lock_loop = 0, stat_lock_wait = 0;
#endif
+ if(__malloc_initialized < 0)
+ ptmalloc_init ();
for (i=0, ar_ptr = &main_arena;; i++) {
(void)mutex_lock(&ar_ptr->mutex);
mi = mALLINFo(ar_ptr);
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 36a32e2b08..e627616dcf 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,18 @@
+2003-04-29 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
+ (__SIZEOF_PTHREAD_COND_T): Define to 48.
+ (pthread_rwlock_t): Add 16 bytes of pad instead of 8 before __flags.
+ * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h (pthread_cond_t):
+ Make __align long long instead of long.
+ (pthread_rwlock_t): Formatting.
+ * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h
+ (pthread_rwlock_t): Formatting.
+ * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
+ (pthread_cond_t): Make __align long long instead of long.
+ (pthread_rwlock_t): Move __flags field to the same position as in
+ linuxthreads.
+
2003-04-30 Ulrich Drepper <drepper@redhat.com>
* tst-rwlock6.c (do_test): Use correct printf format specifiers.
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h
index 5b4127c76b..d3a5c91545 100644
--- a/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h
@@ -103,7 +103,7 @@ typedef int pthread_once_t;
structure of the attribute type is not exposed on purpose. */
typedef union
{
-struct
+ struct
{
int __lock;
unsigned int __nr_readers;
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
index 728712a8c6..fb4533633d 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
@@ -95,7 +95,7 @@ typedef union
unsigned long long int __woken_seq;
} __data;
char __size[__SIZEOF_PTHREAD_COND_T];
- long int __align;
+ long long int __align;
} pthread_cond_t;
typedef union
@@ -118,6 +118,7 @@ typedef int pthread_once_t;
structure of the attribute type is deliberately not exposed. */
typedef union
{
+# if __WORDSIZE == 64
struct
{
int __lock;
@@ -127,10 +128,27 @@ typedef union
unsigned int __nr_readers_queued;
unsigned int __nr_writers_queued;
pthread_t __writer;
+ unsigned long int __pad1;
+ unsigned long int __pad2;
+ /* FLAGS must stay at this position in the structure to maintain
+ binary compatibility. */
+ unsigned int __flags;
+ } __data;
+# else
+ struct
+ {
+ int __lock;
+ unsigned int __nr_readers;
+ unsigned int __readers_wakeup;
+ unsigned int __writer_wakeup;
+ unsigned int __nr_readers_queued;
+ unsigned int __nr_writers_queued;
/* FLAGS must stay at this position in the structure to maintain
binary compatibility. */
unsigned int __flags;
+ pthread_t __writer;
} __data;
+# endif
char __size[__SIZEOF_PTHREAD_RWLOCK_T];
long int __align;
} pthread_rwlock_t;
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
index aae8e90cdc..13dccc66dc 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
@@ -94,7 +94,7 @@ typedef union
unsigned long long int __woken_seq;
} __data;
char __size[__SIZEOF_PTHREAD_COND_T];
- long int __align;
+ long long int __align;
} pthread_cond_t;
typedef union
@@ -118,7 +118,7 @@ typedef int pthread_once_t;
typedef union
{
# if __WORDSIZE == 64
-struct
+ struct
{
int __lock;
unsigned int __nr_readers;
diff --git a/string/test-strcat.c b/string/test-strcat.c
index a3adfe3d8d..53c8462839 100644
--- a/string/test-strcat.c
+++ b/string/test-strcat.c
@@ -59,8 +59,8 @@ do_one_test (impl_t *impl, char *dst, const char *src)
if (HP_TIMING_AVAIL)
{
- hp_timing_t start __attribute ((used));
- hp_timing_t stop __attribute ((used));
+ hp_timing_t start __attribute ((unused));
+ hp_timing_t stop __attribute ((unused));
hp_timing_t best_time = ~ (hp_timing_t) 0;
size_t i;