summaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-08-01 03:44:35 +0000
committerUlrich Drepper <drepper@redhat.com>2007-08-01 03:44:35 +0000
commit1475e2012f267f69dab879ce146f99128fd21653 (patch)
tree811bc01b3abd62840d8b3bc285cca9575d50cba4 /nptl
parent6f59d56e61305b665aecbaab1440b07b6c80bdc7 (diff)
downloadglibc-1475e2012f267f69dab879ce146f99128fd21653.tar.gz
* stdlib/tst-strtod2.c (do_test): Use %tu in fmt string for ptrdiff_t
value. * stdio-common/tst-fmemopen2.c (do_test): Avoid fmt string warning if off_t is different rank from size_t. * sysdeps/generic/unwind-dw2.c (extract_cie_info, execute_cfa_program, uw_frame_state_for): Avoid type punning warnings. * sysdeps/generic/unwind-dw2-fde-glibc.c (_Unwind_IteratePhdrCallback): Likewise. * sysdeps/generic/unwind-dw2-fde.c (_Unwind_Find_FDE): Likewise. (binary_search_single_encoding_fdes, binary_search_mixed_encoding_fdes, get_cie_encoding, linear_search_fdes): Don't mix char and unsigned char pointers.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog2
-rw-r--r--nptl/tst-rwlock14.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index eda7e80613..7ad935c96d 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,7 @@
2007-07-30 Jakub Jelinek <jakub@redhat.com>
+ * tst-rwlock14.c (do_test): Avoid warnings on 32-bit arches.
+
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
(pthread_rwlock_timedrdlock): Copy futex retval to %esi rather than
%ecx.
diff --git a/nptl/tst-rwlock14.c b/nptl/tst-rwlock14.c
index fc0d3d219f..00e1becbfa 100644
--- a/nptl/tst-rwlock14.c
+++ b/nptl/tst-rwlock14.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
@@ -130,8 +130,8 @@ do_test (void)
result = 1;
}
- ts.tv_nsec = 0x100001000LL;
- if (ts.tv_nsec != 0x100001000LL)
+ ts.tv_nsec = (__typeof (ts.tv_nsec)) 0x100001000LL;
+ if ((__typeof (ts.tv_nsec)) 0x100001000LL != 0x100001000LL)
ts.tv_nsec = 2000000000;
e = pthread_rwlock_timedrdlock (&r, &ts);