AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

Browse Source
This commit is contained in:
Ulrich Drepper 2011-08-16 11:20:14 -04:00
commit 794bf65aac
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

18
sysdeps/i386/i486/bits/atomic.h
View File

@ -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) \