Module Name: src Committed By: matt Date: Thu Aug 1 05:54:24 UTC 2013
Modified Files: src/lib/libc/arch/arm/sys: __clone.S __vfork14.S brk.S cerror.S getcontext.S pipe.S ptrace.S src/lib/libc/compat/arch/arm/sys: compat_Ovfork.S compat_sigpending.S compat_sigprocmask.S compat_sigsuspend.S Log Message: CERROR is now hidden so no need to call it via the PLT To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/arm/sys/__clone.S \ src/lib/libc/arch/arm/sys/pipe.S cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/arm/sys/__vfork14.S cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/arm/sys/brk.S cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/arm/sys/cerror.S \ src/lib/libc/arch/arm/sys/getcontext.S src/lib/libc/arch/arm/sys/ptrace.S cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S \ src/lib/libc/compat/arch/arm/sys/compat_sigpending.S \ src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S \ src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.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/arch/arm/sys/__clone.S diff -u src/lib/libc/arch/arm/sys/__clone.S:1.6 src/lib/libc/arch/arm/sys/__clone.S:1.7 --- src/lib/libc/arch/arm/sys/__clone.S:1.6 Mon Apr 24 19:00:30 2006 +++ src/lib/libc/arch/arm/sys/__clone.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: __clone.S,v 1.6 2006/04/24 19:00:30 snj Exp $ */ +/* $NetBSD: __clone.S,v 1.7 2013/08/01 05:54:24 matt Exp $ */ /* * Copyright (c) 2001 Christopher Gilbert @@ -51,7 +51,7 @@ ENTRY(__clone) mov r0, r2 SYSTRAP(__clone) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR /* * r1 and r0 are the same as from fork: @@ -90,4 +90,4 @@ ENTRY(__clone) /* error handler if func or stack is NULL */ .Leinval: mov R0, #EINVAL - b PIC_SYM(CERROR, PLT) + b CERROR Index: src/lib/libc/arch/arm/sys/pipe.S diff -u src/lib/libc/arch/arm/sys/pipe.S:1.6 src/lib/libc/arch/arm/sys/pipe.S:1.7 --- src/lib/libc/arch/arm/sys/pipe.S:1.6 Sat Aug 21 11:30:17 2004 +++ src/lib/libc/arch/arm/sys/pipe.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pipe.S,v 1.6 2004/08/21 11:30:17 rearnsha Exp $ */ +/* $NetBSD: pipe.S,v 1.7 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -40,7 +40,7 @@ WEAK_ALIAS(pipe, _pipe) ENTRY(_pipe) mov r2, r0 SYSTRAP(pipe) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR str r0, [r2, #0x0000] str r1, [r2, #0x0004] mov r0, #0x00000000 Index: src/lib/libc/arch/arm/sys/__vfork14.S diff -u src/lib/libc/arch/arm/sys/__vfork14.S:1.7 src/lib/libc/arch/arm/sys/__vfork14.S:1.8 --- src/lib/libc/arch/arm/sys/__vfork14.S:1.7 Sat Aug 21 11:30:17 2004 +++ src/lib/libc/arch/arm/sys/__vfork14.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: __vfork14.S,v 1.7 2004/08/21 11:30:17 rearnsha Exp $ */ +/* $NetBSD: __vfork14.S,v 1.8 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -46,7 +46,7 @@ ENTRY(__vfork14) mov r2, r14 SYSTRAP(__vfork14) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR mov r14, r2 sub r1, r1, #1 /* r1 == 0xffffffff if parent, 0 if child */ and r0, r0, r1 /* r0 == 0 if child, else unchanged */ Index: src/lib/libc/arch/arm/sys/brk.S diff -u src/lib/libc/arch/arm/sys/brk.S:1.10 src/lib/libc/arch/arm/sys/brk.S:1.11 --- src/lib/libc/arch/arm/sys/brk.S:1.10 Thu Aug 1 05:32:33 2013 +++ src/lib/libc/arch/arm/sys/brk.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: brk.S,v 1.10 2013/08/01 05:32:33 matt Exp $ */ +/* $NetBSD: brk.S,v 1.11 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -73,7 +73,7 @@ ENTRY(_brk) movcc r0, r1 mov r2, r0 SYSTRAP(break) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR #ifdef PIC ldr r1, .Lcurbrk Index: src/lib/libc/arch/arm/sys/cerror.S diff -u src/lib/libc/arch/arm/sys/cerror.S:1.8 src/lib/libc/arch/arm/sys/cerror.S:1.9 --- src/lib/libc/arch/arm/sys/cerror.S:1.8 Mon Feb 27 12:26:21 2012 +++ src/lib/libc/arch/arm/sys/cerror.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cerror.S,v 1.8 2012/02/27 12:26:21 joerg Exp $ */ +/* $NetBSD: cerror.S,v 1.9 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -33,10 +33,6 @@ #include "SYS.h" -#ifdef PIC - .protected CERROR -#endif - ASENTRY(CERROR) #ifdef _REENTRANT stmfd sp!, {r4, lr} Index: src/lib/libc/arch/arm/sys/getcontext.S diff -u src/lib/libc/arch/arm/sys/getcontext.S:1.8 src/lib/libc/arch/arm/sys/getcontext.S:1.9 --- src/lib/libc/arch/arm/sys/getcontext.S:1.8 Tue Apr 30 19:42:56 2013 +++ src/lib/libc/arch/arm/sys/getcontext.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: getcontext.S,v 1.8 2013/04/30 19:42:56 skrll Exp $ */ +/* $NetBSD: getcontext.S,v 1.9 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include "assym.h" #if defined(SYSLIBC_SCCS) && !defined(lint) - RCSID("$NetBSD: getcontext.S,v 1.8 2013/04/30 19:42:56 skrll Exp $") + RCSID("$NetBSD: getcontext.S,v 1.9 2013/08/01 05:54:24 matt Exp $") #endif /* SYSLIBC_SCCS && !lint */ #ifdef WEAK_ALIAS @@ -43,7 +43,7 @@ WEAK_ALIAS(getcontext, _getcontext) ENTRY(_getcontext) mov r2, r0 /* Must save argument pointer. */ SYSTRAP (getcontext) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR str lr, [r2, #_UC_REGS_PC] /* Adjust PC. */ #ifdef SOFTFLOAT /* Ahem. */ Index: src/lib/libc/arch/arm/sys/ptrace.S diff -u src/lib/libc/arch/arm/sys/ptrace.S:1.8 src/lib/libc/arch/arm/sys/ptrace.S:1.9 --- src/lib/libc/arch/arm/sys/ptrace.S:1.8 Sat Aug 21 11:30:17 2004 +++ src/lib/libc/arch/arm/sys/ptrace.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.S,v 1.8 2004/08/21 11:30:17 rearnsha Exp $ */ +/* $NetBSD: ptrace.S,v 1.9 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -60,7 +60,7 @@ ENTRY(ptrace) #endif /* _REENTRANT */ SYSTRAP(ptrace) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR RET #ifndef _REENTRANT Index: src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S diff -u src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S:1.1 src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S:1.2 --- src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S:1.1 Sun Oct 16 17:27:50 2005 +++ src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_Ovfork.S,v 1.1 2005/10/16 17:27:50 christos Exp $ */ +/* $NetBSD: compat_Ovfork.S,v 1.2 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -49,7 +49,7 @@ WARN_REFERENCES(vfork, \ ENTRY(vfork) mov r2, r14 SYSTRAP(vfork) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR mov r14, r2 sub r1, r1, #1 /* r1 == 0xffffffff if parent, 0 if child */ and r0, r0, r1 /* r0 == 0 if child, else unchanged */ Index: src/lib/libc/compat/arch/arm/sys/compat_sigpending.S diff -u src/lib/libc/compat/arch/arm/sys/compat_sigpending.S:1.1 src/lib/libc/compat/arch/arm/sys/compat_sigpending.S:1.2 --- src/lib/libc/compat/arch/arm/sys/compat_sigpending.S:1.1 Sun Oct 16 17:27:50 2005 +++ src/lib/libc/compat/arch/arm/sys/compat_sigpending.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigpending.S,v 1.1 2005/10/16 17:27:50 christos Exp $ */ +/* $NetBSD: compat_sigpending.S,v 1.2 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,7 +39,7 @@ WARN_REFERENCES(sigpending, \ ENTRY(sigpending) mov r2, r0 SYSTRAP(compat_13_sigpending13) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR str r0, [r2] mov r0, #0x00000000 RET Index: src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S diff -u src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S:1.1 src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S:1.2 --- src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S:1.1 Sun Oct 16 17:27:50 2005 +++ src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigprocmask.S,v 1.1 2005/10/16 17:27:50 christos Exp $ */ +/* $NetBSD: compat_sigprocmask.S,v 1.2 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -42,7 +42,7 @@ ENTRY(sigprocmask) moveq r1, #0x00000000 ldrne r1, [r1] SYSTRAP(compat_13_sigprocmask13) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR teq r2, #0x00000000 strne r0, [r2] mov r0, #0x00000000 Index: src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S diff -u src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S:1.1 src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S:1.2 --- src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S:1.1 Sun Oct 16 17:27:50 2005 +++ src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S Thu Aug 1 05:54:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sigsuspend.S,v 1.1 2005/10/16 17:27:50 christos Exp $ */ +/* $NetBSD: compat_sigsuspend.S,v 1.2 2013/08/01 05:54:24 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,6 +39,6 @@ WARN_REFERENCES(sigsuspend, \ ENTRY(sigsuspend) ldr r0, [r0] SYSTRAP(compat_13_sigsuspend13) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR mov r0, #0x00000000 RET