diff options
| author |   miod <miod@openbsd.org> | 2013-01-05 11:20:52 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2013-01-05 11:20:52 +0000 |
| commit | 0b514a0798ffc86c581fc3611e7adb25cce99305 (patch) | |
| tree | 2b36cbda37a019f9cf96e473dab56a2daf9a1761 /lib/librthread | |
| parent | if defined(NOPIC), do not attempt to .include arch/Makefile.inc for it may (diff) | |
| download | wireguard-openbsd-0b514a0798ffc86c581fc3611e7adb25cce99305.tar.xz wireguard-openbsd-0b514a0798ffc86c581fc3611e7adb25cce99305.zip | |
Switch m88k ports to ELF.
Diffstat (limited to 'lib/librthread')
| -rw-r--r-- | lib/librthread/arch/m88k/_atomic_lock.c | 4 | ||||
| -rw-r--r-- | lib/librthread/arch/m88k/cerror.S | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/librthread/arch/m88k/_atomic_lock.c b/lib/librthread/arch/m88k/_atomic_lock.c index 5f1820f0695..e1ff84b76c4 100644 --- a/lib/librthread/arch/m88k/_atomic_lock.c +++ b/lib/librthread/arch/m88k/_atomic_lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: _atomic_lock.c,v 1.2 2006/01/05 22:33:24 marc Exp $ */ +/* $OpenBSD: _atomic_lock.c,v 1.3 2013/01/05 11:20:55 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -38,7 +38,7 @@ _atomic_lock(volatile _spinlock_lock_t *lock) old = _SPINLOCK_LOCKED; __asm__ __volatile__ - ("xmem %0, %2, r0" : "=r" (old) : "0" (old), "r" (lock)); + ("xmem %0, %2, %%r0" : "=r" (old) : "0" (old), "r" (lock)); return (old != _SPINLOCK_UNLOCKED); } diff --git a/lib/librthread/arch/m88k/cerror.S b/lib/librthread/arch/m88k/cerror.S index d9897800f69..bdc4c05029e 100644 --- a/lib/librthread/arch/m88k/cerror.S +++ b/lib/librthread/arch/m88k/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.1 2012/02/18 17:10:10 miod Exp $ */ +/* $OpenBSD: cerror.S,v 1.2 2013/01/05 11:20:55 miod Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -38,18 +38,18 @@ .globl _C_LABEL(__errno) ASENTRY(__cerror) - subu r31,r31,16 - st r25,r0,r31 - st r1,r31,4 + subu %r31,%r31,16 + st %r25,%r0,%r31 + st %r1,%r31,4 bsr.n _C_LABEL(__errno) - or r25,r0,r2 - st r25,r0,r2 + or %r25,%r0,%r2 + st %r25,%r0,%r2 - subu r2,r0,1 - or r3, r0, r2 + subu %r2,%r0,1 + or %r3, %r0, %r2 - ld r1,r31,4 - ld r25,r0,r31 - jmp.n r1 - addu r31,r31,16 + ld %r1,%r31,4 + ld %r25,%r0,%r31 + jmp.n %r1 + addu %r31,%r31,16 |