diff options
Diffstat (limited to 'lib/librthread')
| -rw-r--r-- | lib/librthread/arch/vax/cerror.S | 10 | ||||
| -rw-r--r-- | lib/librthread/rthread.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/librthread/arch/vax/cerror.S b/lib/librthread/arch/vax/cerror.S index b5c468deeac..e860dadbf70 100644 --- a/lib/librthread/arch/vax/cerror.S +++ b/lib/librthread/arch/vax/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.1 2011/10/17 06:39:20 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.2 2013/07/05 21:10:50 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -32,9 +32,9 @@ .globl _C_LABEL(__errno) _C_LABEL(_cerror): - pushl r0 + pushl %r0 calls $0, _C_LABEL(__errno) - movl (sp)+, (r0) - mnegl $1,r0 - movl r0,r1 + movl (%sp)+, (%r0) + mnegl $1,%r0 + movl %r0,%r1 ret diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c index bf9eff0dd4d..030fbfd6454 100644 --- a/lib/librthread/rthread.c +++ b/lib/librthread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.71 2013/06/01 23:06:26 tedu Exp $ */ +/* $OpenBSD: rthread.c,v 1.72 2013/07/05 21:10:50 miod Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -184,7 +184,7 @@ _rthread_init(void) _rthread_debug(1, "rthread init\n"); -#if defined(__ELF__) +#if defined(__ELF__) && !defined(__vax__) if (_DYNAMIC) { /* * To avoid recursion problems in ld.so, we need to trigger the |