[src/netbsd-1-4]: src/lib/libc/arch/i386/sys Pull up revision 1.13 (requested...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8d43a4cebb4
branches:  netbsd-1-4
changeset: 470553:d8d43a4cebb4
user:      he <he%NetBSD.org@localhost>
date:      Fri May 05 13:15:59 2000 +0000

description:
Pull up revision 1.13 (requested by assar):
  Repair syscall stubs which were not adapted when the cerror
  interface was changed.

diffstat:

 lib/libc/arch/i386/sys/brk.S    |  10 +++++-----
 lib/libc/arch/i386/sys/ptrace.S |  24 ++++--------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diffs (84 lines):

diff -r 7957f156604a -r d8d43a4cebb4 lib/libc/arch/i386/sys/brk.S
--- a/lib/libc/arch/i386/sys/brk.S      Fri May 05 13:10:56 2000 +0000
+++ b/lib/libc/arch/i386/sys/brk.S      Fri May 05 13:15:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brk.S,v 1.12 1999/02/08 18:56:48 christos Exp $        */
+/*     $NetBSD: brk.S,v 1.12.2.1 2000/05/05 13:15:59 he Exp $  */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: brk.S,v 1.12 1999/02/08 18:56:48 christos Exp $")
+       RCSID("$NetBSD: brk.S,v 1.12.2.1 2000/05/05 13:15:59 he Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -76,10 +76,10 @@
        ret
 err:
        PIC_PROLOGUE
-       jmp     PIC_PLT(CERROR)
-
+       mov     PIC_GOT(CERROR), %ecx
+       PIC_EPILOGUE
+       jmp     %ecx
 #else
-
        movl    4(%esp),%ecx
        cmpl    %ecx,_C_LABEL(__minbrk)
        jl      1f
diff -r 7957f156604a -r d8d43a4cebb4 lib/libc/arch/i386/sys/ptrace.S
--- a/lib/libc/arch/i386/sys/ptrace.S   Fri May 05 13:10:56 2000 +0000
+++ b/lib/libc/arch/i386/sys/ptrace.S   Fri May 05 13:15:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ptrace.S,v 1.11 1999/02/08 18:56:48 christos Exp $     */
+/*     $NetBSD: ptrace.S,v 1.11.2.1 2000/05/05 13:15:59 he Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,19 +40,14 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-       RCSID("$NetBSD: ptrace.S,v 1.11 1999/02/08 18:56:48 christos Exp $")
+       RCSID("$NetBSD: ptrace.S,v 1.11.2.1 2000/05/05 13:15:59 he Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
 
-#ifdef _REENTRANT
        .globl  _C_LABEL(__errno)
-#else
-       .globl  _C_LABEL(errno)
-#endif
 
 ENTRY(ptrace)
-#ifdef _REENTRANT
 #ifdef PIC
        PIC_PROLOGUE
        call    PIC_PLT(_C_LABEL(__errno))
@@ -60,19 +55,8 @@
 #else
        call    _C_LABEL(__errno)
 #endif /* PIC */
-       xorl    %ecx,%ecx
-       movl    %ecx,(%eax)
-#else
-#ifdef PIC
-       xorl    %eax,%eax
-       PIC_PROLOGUE
-       movl    PIC_GOT(_C_LABEL(errno)),%edx
-       PIC_EPILOGUE
-       movl    %eax,(%edx)
-#else
-       movl    $0,_C_LABEL(errno)
-#endif /* PIC */
-#endif /* _REENTRANT */
+       xorl    %edx,%edx
+       movl    %edx,(%eax)
        movl    $(SYS_ptrace),%eax
        int     $0x80
        jc      err