diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-09 21:34:41 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-09 21:34:41 +0200 |
| commit | bc57f97ac6e4eae85a71771b09e2c1d3b7d9f46c (patch) | |
| tree | 26e2948ca5e7bd3130f1cd9d5d18e399aa9ab3d0 /sysdeps/i386/i486 | |
| parent | 0888005afb4f0e138659dfb1751ae3bd1a5e39be (diff) | |
| parent | 187da0aedcd9d0a2fb34477bef41549681ba1273 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
elf/elf.h
include/errno.h
sysdeps/ia64/elf/configure
sysdeps/mach/hurd/tls.h
sysdeps/powerpc/powerpc32/elf/configure
sysdeps/powerpc/powerpc64/elf/configure
sysdeps/s390/s390-32/elf/configure
sysdeps/s390/s390-64/elf/configure
sysdeps/sh/elf/configure
sysdeps/sparc/sparc32/elf/configure
sysdeps/sparc/sparc64/elf/configure
Diffstat (limited to 'sysdeps/i386/i486')
| -rw-r--r-- | sysdeps/i386/i486/bits/atomic.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sysdeps/i386/i486/bits/atomic.h b/sysdeps/i386/i486/bits/atomic.h index c8a081d142..ec94ff8f39 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. @@ -116,10 +116,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) \ |