Module Name: src
Committed By: joerg
Date: Sat Nov 30 20:20:42 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: memmove.S
src/lib/libc/arch/arm/gen: _setjmp.S setjmp.S sigsetjmp.S swapcontext.S
src/lib/libc/arch/arm/sys: __clone.S cerror.S ptrace.S
Log Message:
Use PLT_SYM.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/memmove.S
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/arm/gen/_setjmp.S
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/arm/gen/setjmp.S
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/arm/gen/sigsetjmp.S
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/arm/gen/swapcontext.S
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/arm/sys/__clone.S
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/arm/sys/cerror.S
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/arm/sys/ptrace.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/memmove.S
diff -u src/common/lib/libc/arch/arm/string/memmove.S:1.6 src/common/lib/libc/arch/arm/string/memmove.S:1.7
--- src/common/lib/libc/arch/arm/string/memmove.S:1.6 Mon Aug 19 02:37:12 2013
+++ src/common/lib/libc/arch/arm/string/memmove.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: memmove.S,v 1.6 2013/08/19 02:37:12 matt Exp $ */
+/* $NetBSD: memmove.S,v 1.7 2013/11/30 20:20:42 joerg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ ENTRY(bcopy)
subhs r3, r0, r1 /* if (dst > src) r3 = dst - src */
sublo r3, r1, r0 /* if (src > dst) r3 = src - dst */
cmp r3, r2 /* if (r3 >= len) we have an overlap */
- bhs PIC_SYM(_C_LABEL(memcpy), PLT)
+ bhs PLT_SYM(_C_LABEL(memcpy))
/* Determine copy direction */
cmp r1, r0
Index: src/lib/libc/arch/arm/gen/_setjmp.S
diff -u src/lib/libc/arch/arm/gen/_setjmp.S:1.15 src/lib/libc/arch/arm/gen/_setjmp.S:1.16
--- src/lib/libc/arch/arm/gen/_setjmp.S:1.15 Mon Oct 21 08:28:14 2013
+++ src/lib/libc/arch/arm/gen/_setjmp.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.15 2013/10/21 08:28:14 skrll Exp $ */
+/* $NetBSD: _setjmp.S,v 1.16 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -184,8 +184,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))
1: b 1b /* Cannot get here */
.align 0
Index: src/lib/libc/arch/arm/gen/setjmp.S
diff -u src/lib/libc/arch/arm/gen/setjmp.S:1.16 src/lib/libc/arch/arm/gen/setjmp.S:1.17
--- src/lib/libc/arch/arm/gen/setjmp.S:1.16 Thu Sep 12 15:36:15 2013
+++ src/lib/libc/arch/arm/gen/setjmp.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.16 2013/09/12 15:36:15 joerg Exp $ */
+/* $NetBSD: setjmp.S,v 1.17 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -64,7 +64,7 @@ ENTRY(__setjmp14)
#endif
movs r1, #0
movs r0, #0
- bl PIC_SYM(_C_LABEL(__sigprocmask14), PLT)
+ bl PLT_SYM(_C_LABEL(__sigprocmask14))
#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
pop {r0-r2, lr}
#else
@@ -152,7 +152,7 @@ ENTRY(__longjmp14)
adds r1, r1, #(_JB_SIGMASK * 4)
#endif
movs r0, #3 /* SIG_SETMASK */
- bl PIC_SYM(_C_LABEL(__sigprocmask14), PLT)
+ bl PLT_SYM(_C_LABEL(__sigprocmask14))
#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
pop {r0-r2, lr}
#else
@@ -218,8 +218,8 @@ ENTRY(__longjmp14)
/* validation failed, die die die. */
.Lbotch:
- 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))
1: b 1b /* Cannot get here */
.align 0
Index: src/lib/libc/arch/arm/gen/sigsetjmp.S
diff -u src/lib/libc/arch/arm/gen/sigsetjmp.S:1.7 src/lib/libc/arch/arm/gen/sigsetjmp.S:1.8
--- src/lib/libc/arch/arm/gen/sigsetjmp.S:1.7 Tue Sep 3 00:30:19 2013
+++ src/lib/libc/arch/arm/gen/sigsetjmp.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sigsetjmp.S,v 1.7 2013/09/03 00:30:19 matt Exp $ */
+/* $NetBSD: sigsetjmp.S,v 1.8 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -78,14 +78,14 @@ ENTRY(__siglongjmp14)
#ifdef __thumb__
it eq
#endif
- beq PIC_SYM(_C_LABEL(_longjmp), PLT)
- b PIC_SYM(_C_LABEL(__longjmp14), PLT)
+ beq PLT_SYM(_C_LABEL(_longjmp))
+ b PLT_SYM(_C_LABEL(__longjmp14))
#else
push {r3, lr}
beq 11f
- bl PIC_SYM(_C_LABEL(__longjmp14), PLT)
+ bl PLT_SYM(_C_LABEL(__longjmp14))
pop {r3, pc}
-11: bl PIC_SYM(_C_LABEL(_longjmp), PLT)
+11: bl PLT_SYM(_C_LABEL(_longjmp))
pop {r3, pc}
#endif
Index: src/lib/libc/arch/arm/gen/swapcontext.S
diff -u src/lib/libc/arch/arm/gen/swapcontext.S:1.13 src/lib/libc/arch/arm/gen/swapcontext.S:1.14
--- src/lib/libc/arch/arm/gen/swapcontext.S:1.13 Wed Sep 4 23:08:29 2013
+++ src/lib/libc/arch/arm/gen/swapcontext.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.13 2013/09/04 23:08:29 matt Exp $ */
+/* $NetBSD: swapcontext.S,v 1.14 2013/11/30 20:20:42 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "assym.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: swapcontext.S,v 1.13 2013/09/04 23:08:29 matt Exp $")
+ RCSID("$NetBSD: swapcontext.S,v 1.14 2013/11/30 20:20:42 joerg Exp $")
#endif /* LIBC_SCCS && !lint */
ENTRY(swapcontext)
@@ -50,7 +50,7 @@ ENTRY(swapcontext)
.cfi_offset 1, -12
.cfi_offset 0, -16
#endif
- bl PIC_SYM(_C_LABEL(_getcontext), PLT) /* getcontext(oucp) */
+ bl PLT_SYM(_C_LABEL(_getcontext)) /* getcontext(oucp) */
cmp r0, #0
#if !defined(__thumb__)
pop {r0-r2, lr}
@@ -82,10 +82,10 @@ ENTRY(swapcontext)
#endif
mov r0, r1
#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
- b PIC_SYM(_C_LABEL(setcontext), PLT)
+ b PLT_SYM(_C_LABEL(setcontext))
#else
push {lr}
- bl PIC_SYM(_C_LABEL(setcontext), PLT)
+ bl PLT_SYM(_C_LABEL(setcontext))
pop {pc}
#endif
#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
Index: src/lib/libc/arch/arm/sys/__clone.S
diff -u src/lib/libc/arch/arm/sys/__clone.S:1.8 src/lib/libc/arch/arm/sys/__clone.S:1.9
--- src/lib/libc/arch/arm/sys/__clone.S:1.8 Tue Sep 3 00:30:19 2013
+++ src/lib/libc/arch/arm/sys/__clone.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: __clone.S,v 1.8 2013/09/03 00:30:19 matt Exp $ */
+/* $NetBSD: __clone.S,v 1.9 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 2001 Christopher Gilbert
@@ -109,7 +109,7 @@ ENTRY(__clone)
RETr(r1)
#endif
/* call _exit with the returned value */
- bl PIC_SYM(_C_LABEL(_exit), PLT)
+ bl PLT_SYM(_C_LABEL(_exit))
/* NOTREACHED */
Index: src/lib/libc/arch/arm/sys/cerror.S
diff -u src/lib/libc/arch/arm/sys/cerror.S:1.12 src/lib/libc/arch/arm/sys/cerror.S:1.13
--- src/lib/libc/arch/arm/sys/cerror.S:1.12 Thu Sep 12 15:36:15 2013
+++ src/lib/libc/arch/arm/sys/cerror.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.12 2013/09/12 15:36:15 joerg Exp $ */
+/* $NetBSD: cerror.S,v 1.13 2013/11/30 20:20:42 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -47,7 +47,7 @@ ENTRY_NP(CERROR)
.cfi_offset 4, -8
#endif
mov r4, r0
- bl PIC_SYM(_C_LABEL(__errno), PLT)
+ bl PLT_SYM(_C_LABEL(__errno))
str r4, [r0]
#ifdef __thumb__
movs r0, #0
Index: src/lib/libc/arch/arm/sys/ptrace.S
diff -u src/lib/libc/arch/arm/sys/ptrace.S:1.11 src/lib/libc/arch/arm/sys/ptrace.S:1.12
--- src/lib/libc/arch/arm/sys/ptrace.S:1.11 Thu Sep 12 15:36:15 2013
+++ src/lib/libc/arch/arm/sys/ptrace.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.S,v 1.11 2013/09/12 15:36:15 joerg Exp $ */
+/* $NetBSD: ptrace.S,v 1.12 2013/11/30 20:20:42 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -42,7 +42,7 @@ ENTRY(ptrace)
mov r4, lr
#endif
sub sp, sp, #4 /* align stack */
- bl PIC_SYM(_C_LABEL(__errno), PLT)
+ bl PLT_SYM(_C_LABEL(__errno))
add sp, sp, #4 /* unalign stack */
movs r1, #0
str r1, [r0]
