aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-08-14 19:26:36 -0700
committerRoland McGrath <roland@hack.frob.com>2011-08-14 19:26:36 -0700
commit85ae058936c5f6e2bf7fb26979389dd26c9690b5 (patch)
tree54415951ec1797a86d2f8f7b6c2dd7ca43a8b4f9
parentf3ed22607e8bf724b697c16876dbb76bb2418db6 (diff)
downloadglibc-85ae058936c5f6e2bf7fb26979389dd26c9690b5.zip
glibc-85ae058936c5f6e2bf7fb26979389dd26c9690b5.tar.gz
glibc-85ae058936c5f6e2bf7fb26979389dd26c9690b5.tar.bz2
More warning patrol, in dead code (sigh).
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/i486/bits/atomic.h18
2 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4092e50..2fa6d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
2011-08-14 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/i386/i486/bits/atomic.h
+ (__arch_compare_and_exchange_val_64_acq): Use RET alone at end of
+ statement expression, so as to suppress "set but not used" warning.
+ (__arch_c_compare_and_exchange_val_64_acq): Likewise.
+
* string/strncat.c (STRNCAT): Use prototype definition.
* locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
diff --git a/sysdeps/i386/i486/bits/atomic.h b/sysdeps/i386/i486/bits/atomic.h
index 4ee6fef..72986ca 100644
--- a/sysdeps/i386/i486/bits/atomic.h
+++ b/sysdeps/i386/i486/bits/atomic.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2004, 2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2004,2006,2007,2009,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -125,10 +125,18 @@ typedef uintmax_t uatomic_max_t;
really going to be used the code below can be used on Intel Pentium
and later, but NOT on i486. */
#if 1
-# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
- ({ __typeof (*mem) ret = *(mem); abort (); ret = (newval); ret = (oldval); })
-# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
- ({ __typeof (*mem) ret = *(mem); abort (); ret = (newval); ret = (oldval); })
+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+ ({ __typeof (*mem) ret = *(mem); \
+ abort (); \
+ ret = (newval); \
+ ret = (oldval); \
+ ret; })
+# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+ ({ __typeof (*mem) ret = *(mem); \
+ abort (); \
+ ret = (newval); \
+ ret = (oldval); \
+ ret; })
#else
# ifdef __PIC__
# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \