Module Name: src
Committed By: joerg
Date: Sat Nov 30 20:54:14 UTC 2013
Modified Files:
src/lib/libc/compat/arch/arm/gen: compat_setjmp.S compat_sigsetjmp.S
Log Message:
Use PLT_SYM.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.3 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.4
--- src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.3 Mon Aug 19 22:11:50 2013
+++ src/lib/libc/compat/arch/arm/gen/compat_setjmp.S Sat Nov 30 20:54:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.3 2013/08/19 22:11:50 matt Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.4 2013/11/30 20:54:14 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -50,7 +50,7 @@ ENTRY(setjmp)
push {r0, lr}
movs r0, #0x00000000
- bl PIC_SYM(_C_LABEL(sigblock), PLT)
+ bl PLT_SYM(_C_LABEL(sigblock))
mov r1, r0
/* Store signal mask */
@@ -99,7 +99,7 @@ ENTRY(longjmp)
push {r0, r1} /* don't care about lr */
mov r0, r2
- bl PIC_SYM(_C_LABEL(sigsetmask), PLT)
+ bl PLT_SYM(_C_LABEL(sigsetmask))
pop {r0, r1}
@@ -145,8 +145,8 @@ ENTRY(longjmp)
/* validation failed, die die die. */
botch:
- bl PIC_SYM(_C_LABEL(longjmperror), PLT)
- bl PIC_SYM(_C_LABEL(abort), PLT)
+ bl PLT_SYM(_C_LABEL(longjmperror))
+ bl PLT_SYM(_C_LABEL(abort))
2: b 2b /* Cannot get here */
.align 0
Index: src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.2 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.3
--- src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.2 Mon Aug 19 22:11:50 2013
+++ src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S Sat Nov 30 20:54:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsetjmp.S,v 1.2 2013/08/19 22:11:50 matt Exp $ */
+/* $NetBSD: compat_sigsetjmp.S,v 1.3 2013/11/30 20:54:14 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -72,8 +72,8 @@ ENTRY(siglongjmp)
#if defined(__thumb__)
it eq
#endif
- beq PIC_SYM(_C_LABEL(_longjmp), PLT)
- b PIC_SYM(_C_LABEL(longjmp), PLT)
+ beq PLT_SYM(_C_LABEL(_longjmp))
+ b PLT_SYM(_C_LABEL(longjmp))
#else
push {lr}
sub sp, sp, #4
