diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-01-20 17:59:53 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-01-20 17:59:53 +0000 |
| commit | 40c471dbe2bfff98f8b1030f2cadfb798320c72b (patch) | |
| tree | c75201a0df9d0f381f04129c4ca3a5a23f237e8f | |
| parent | 7bff3aca9d4d5ea111bbd14f169280c63b44d861 (diff) | |
PIC-related code should follow the #ifdef __PIC__ line, not the #else line.
Doh!
| -rw-r--r-- | lib/libc/arch/m88k/gen/_setjmp.S | 8 | ||||
| -rw-r--r-- | lib/libc/arch/m88k/gen/setjmp.S | 12 | ||||
| -rw-r--r-- | lib/libc/arch/m88k/gen/sigsetjmp.S | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/lib/libc/arch/m88k/gen/_setjmp.S b/lib/libc/arch/m88k/gen/_setjmp.S index aef1c448517..8c7d306bc34 100644 --- a/lib/libc/arch/m88k/gen/_setjmp.S +++ b/lib/libc/arch/m88k/gen/_setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: _setjmp.S,v 1.11 2013/01/11 21:23:24 miod Exp $ */ +/* $OpenBSD: _setjmp.S,v 1.12 2013/01/20 17:59:52 miod Exp $ */ /*- * Copyright (c) 2002 Steve Murphree, Jr. * All rights reserved. @@ -116,11 +116,11 @@ ENTRY(_longjmp) 2: subu %r31,%r31,16 /* get a temporary stack */ st %r1,%r31,0 /* save r1 on stack (return address) */ #ifdef __PIC__ - bsr _C_LABEL(longjmperror) - bsr _C_LABEL(abort) /* NO RETURN */ -#else bsr _C_LABEL(longjmperror)#plt bsr _C_LABEL(abort)#plt /* NO RETURN */ +#else + bsr _C_LABEL(longjmperror) + bsr _C_LABEL(abort) /* NO RETURN */ #endif ld %r1,%r31,0 /* restore r1 from stack */ jmp.n %r1 /* this should not happen but we are prepared */ diff --git a/lib/libc/arch/m88k/gen/setjmp.S b/lib/libc/arch/m88k/gen/setjmp.S index 1d4abb12af5..41c152e80e8 100644 --- a/lib/libc/arch/m88k/gen/setjmp.S +++ b/lib/libc/arch/m88k/gen/setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.S,v 1.12 2013/01/11 21:23:24 miod Exp $ */ +/* $OpenBSD: setjmp.S,v 1.13 2013/01/20 17:59:52 miod Exp $ */ /*- * Copyright (c) 2002 Steve Murphree, Jr. * All rights reserved. @@ -77,9 +77,9 @@ ENTRY(setjmp) st %r4,%r2,80 /* setjmp type to _setjmp */ or %r14,%r2,0 /* store address of env in r14 */ #ifdef __PIC__ - bsr.n _C_LABEL(sigblock) /* r2 = sigblock(0) */ -#else bsr.n _C_LABEL(sigblock)#plt /* r2 = sigblock(0) */ +#else + bsr.n _C_LABEL(sigblock) /* r2 = sigblock(0) */ #endif or %r2,%r0,0 st %r2,%r14,4 /* save signal set in offset 4 of env */ @@ -136,11 +136,11 @@ ENTRY(longjmp) 2: subu %r31,%r31,16 /* get a temporary stack */ st %r1,%r31,0 /* save r1 on stack (return address) */ #ifdef __PIC__ - bsr _C_LABEL(longjmperror) - bsr _C_LABEL(abort) /* NO RETURN */ -#else bsr _C_LABEL(longjmperror)#plt bsr _C_LABEL(abort)#plt /* NO RETURN */ +#else + bsr _C_LABEL(longjmperror) + bsr _C_LABEL(abort) /* NO RETURN */ #endif ld %r1,%r31,0 /* restore r1 from stack */ jmp.n %r1 /* this should not happen but we are prepared */ diff --git a/lib/libc/arch/m88k/gen/sigsetjmp.S b/lib/libc/arch/m88k/gen/sigsetjmp.S index fba8cd3dc4d..fa199466343 100644 --- a/lib/libc/arch/m88k/gen/sigsetjmp.S +++ b/lib/libc/arch/m88k/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.13 2013/01/11 21:23:24 miod Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.14 2013/01/20 17:59:52 miod Exp $ */ /*- * Copyright (c) 2002 Steve Murphree, Jr. * All rights reserved. @@ -145,11 +145,11 @@ ENTRY(siglongjmp) 2: subu %r31,%r31,16 /* get a temporary stack */ st %r1,%r31,0 /* save r1 on stack (return address) */ #ifdef __PIC__ - bsr _C_LABEL(longjmperror) - bsr _C_LABEL(abort) /* NO RETURN */ -#else bsr _C_LABEL(longjmperror)#plt bsr _C_LABEL(abort)#plt /* NO RETURN */ +#else + bsr _C_LABEL(longjmperror) + bsr _C_LABEL(abort) /* NO RETURN */ #endif ld %r1,%r31,0 /* restore r1 from stack */ jmp.n %r1 /* this should not happen but we are prepared */ |