diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-16 11:20:14 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-16 11:20:14 -0400 |
| commit | 794bf65aac54e8124b3d019158365d042a4fef43 (patch) | |
| tree | 76f265a507ff6d12da103354998e4d164b04c2c5 | |
| parent | 076fe0152b23f51b6493064ba7bb5ed965aee311 (diff) | |
| parent | 85ae058936c5f6e2bf7fb26979389dd26c9690b5 (diff) | |
| download | glibc-794bf65aac54e8124b3d019158365d042a4fef43.tar glibc-794bf65aac54e8124b3d019158365d042a4fef43.tar.gz glibc-794bf65aac54e8124b3d019158365d042a4fef43.tar.bz2 glibc-794bf65aac54e8124b3d019158365d042a4fef43.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/i386/i486/bits/atomic.h | 18 |
2 files changed, 18 insertions, 5 deletions
@@ -10,6 +10,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 4ee6fef692..72986cac90 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) \ |