diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:00:19 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:00:19 -0600 |
| commit | 6b6ede3d15f04fe825cfa9f697507457e3640344 (patch) | |
| tree | efe9bf75eaf2200f89087ed0ef2ef350549ccd6d /libpthread/linuxthreads/sysdeps/m68k/pt-machine.h | |
| parent | f972c2262fd4efc2bbf9789dce145bb705acec24 (diff) | |
resolve merge
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/m68k/pt-machine.h')
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/m68k/pt-machine.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h index 1eb9fd57b..3be216524 100644 --- a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h @@ -28,7 +28,6 @@ #endif /* Spinlock implementation; required. */ -PT_EI long int testandset (int *spinlock); PT_EI long int testandset (int *spinlock) { @@ -36,11 +35,11 @@ testandset (int *spinlock) __asm__ __volatile__( #if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__m68000) - "tas %1; sne %0" + "tas %1; sne %0" #else - "bset #7,%1; sne %0" + "bset #7,%1; sne %0" #endif - : "=dm"(ret), "=m"(*spinlock) + : "=&dm"(ret), "=m"(*spinlock) : "m"(*spinlock) : "cc"); @@ -71,4 +70,5 @@ __compare_and_swap (long int *p, long int oldval, long int newval) return ret; } #endif + #endif /* pt-machine.h */ |