diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
| commit | e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a (patch) | |
| tree | 2c8d14e4dcc733f4227f0984ed05da5826b13acd /libpthread/linuxthreads/sysdeps/m68k/pt-machine.h | |
| parent | 6b6ede3d15f04fe825cfa9f697507457e3640344 (diff) | |
Revert "resolve merge"
This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.
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 3be216524..1eb9fd57b 100644 --- a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h @@ -28,6 +28,7 @@ #endif /* Spinlock implementation; required. */ +PT_EI long int testandset (int *spinlock); PT_EI long int testandset (int *spinlock) { @@ -35,11 +36,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"); @@ -70,5 +71,4 @@ __compare_and_swap (long int *p, long int oldval, long int newval) return ret; } #endif - #endif /* pt-machine.h */ |