[Midnightbsd-cvs] src [10583] U trunk/lib/libc/i386/sys: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 8 08:06:03 EDT 2018
Revision: 10583
http://svnweb.midnightbsd.org/src/?rev=10583
Author: laffer1
Date: 2018-06-08 08:06:02 -0400 (Fri, 08 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/lib/libc/i386/sys/Makefile.inc
trunk/lib/libc/i386/sys/Ovfork.S
trunk/lib/libc/i386/sys/brk.S
trunk/lib/libc/i386/sys/cerror.S
trunk/lib/libc/i386/sys/exect.S
trunk/lib/libc/i386/sys/getcontext.S
trunk/lib/libc/i386/sys/pipe.S
trunk/lib/libc/i386/sys/ptrace.S
trunk/lib/libc/i386/sys/reboot.S
trunk/lib/libc/i386/sys/sbrk.S
trunk/lib/libc/i386/sys/setlogin.S
trunk/lib/libc/i386/sys/syscall.S
Property Changed:
----------------
trunk/lib/libc/i386/sys/Makefile.inc
trunk/lib/libc/i386/sys/Ovfork.S
trunk/lib/libc/i386/sys/brk.S
trunk/lib/libc/i386/sys/cerror.S
trunk/lib/libc/i386/sys/exect.S
trunk/lib/libc/i386/sys/getcontext.S
trunk/lib/libc/i386/sys/pipe.S
trunk/lib/libc/i386/sys/ptrace.S
trunk/lib/libc/i386/sys/reboot.S
trunk/lib/libc/i386/sys/sbrk.S
trunk/lib/libc/i386/sys/setlogin.S
trunk/lib/libc/i386/sys/sigreturn.S
trunk/lib/libc/i386/sys/syscall.S
Modified: trunk/lib/libc/i386/sys/Makefile.inc
===================================================================
--- trunk/lib/libc/i386/sys/Makefile.inc 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/Makefile.inc 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,5 +1,6 @@
# from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD$
+# $FreeBSD: stable/10/lib/libc/i386/sys/Makefile.inc 305341 2016-09-03 11:09:47Z kib $
+# $MidnightBSD$
.if !defined(COMPAT_32BIT)
SRCS+= i386_clr_watch.c i386_set_watch.c i386_vm86.c
@@ -8,8 +9,8 @@
i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \
__vdso_gettc.c
-MDASM= Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \
- reboot.S sbrk.S setlogin.S sigreturn.S syscall.S
+MDASM= Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S \
+ sbrk.S setlogin.S sigreturn.S syscall.S
# Don't generate default code for these syscalls:
NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
Property changes on: trunk/lib/libc/i386/sys/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/Ovfork.S
===================================================================
--- trunk/lib/libc/i386/sys/Ovfork.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/Ovfork.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/Ovfork.S 240152 2012-09-05 21:41:05Z jilles $");
#include "SYS.h"
@@ -50,8 +51,7 @@
jmp *%ecx
1:
pushl %ecx
- PIC_PROLOGUE
- jmp PIC_PLT(HIDENAME(cerror))
+ jmp HIDENAME(cerror)
END(__sys_vfork)
.section .note.GNU-stack,"",%progbits
Property changes on: trunk/lib/libc/i386/sys/Ovfork.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/brk.S
===================================================================
--- trunk/lib/libc/i386/sys/brk.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/brk.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)brk.s 5.2 (Berkeley) 12/17/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/brk.S 240152 2012-09-05 21:41:05Z jilles $");
#include "SYS.h"
@@ -58,14 +59,11 @@
ok:
mov $SYS_break,%eax
KERNCALL
- jb err
+ jb HIDENAME(cerror)
movl 4(%esp),%eax
movl %eax,(%edx)
movl $0,%eax
ret
-err:
- PIC_PROLOGUE
- jmp PIC_PLT(HIDENAME(cerror))
#else
@@ -77,13 +75,11 @@
ok:
mov $SYS_break,%eax
KERNCALL
- jb err
+ jb HIDENAME(cerror)
movl 4(%esp),%eax
movl %eax,HIDENAME(curbrk)
movl $0,%eax
ret
-err:
- jmp HIDENAME(cerror)
#endif
END(brk)
Property changes on: trunk/lib/libc/i386/sys/brk.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/cerror.S
===================================================================
--- trunk/lib/libc/i386/sys/cerror.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/cerror.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/cerror.S 240152 2012-09-05 21:41:05Z jilles $");
#include "SYS.h"
@@ -48,13 +49,14 @@
.globl CNAME(__error)
.type CNAME(__error), at function
HIDENAME(cerror):
+#ifdef PIC
+ PIC_PROLOGUE
pushl %eax
-#ifdef PIC
- /* The caller must execute the PIC prologue before jumping to cerror. */
call PIC_PLT(CNAME(__error))
popl %ecx
PIC_EPILOGUE
#else
+ pushl %eax
call CNAME(__error)
popl %ecx
#endif
Property changes on: trunk/lib/libc/i386/sys/cerror.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/exect.S
===================================================================
--- trunk/lib/libc/i386/sys/exect.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/exect.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)exect.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/exect.S 240152 2012-09-05 21:41:05Z jilles $");
#include "SYS.h"
#include <machine/psl.h>
@@ -47,8 +48,7 @@
pushl %edx
popf
KERNCALL
- PIC_PROLOGUE
- jmp PIC_PLT(HIDENAME(cerror)) /* exect(file, argv, env); */
+ jmp HIDENAME(cerror) /* exect(file, argv, env); */
END(exect)
.section .note.GNU-stack,"",%progbits
Property changes on: trunk/lib/libc/i386/sys/exect.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/getcontext.S
===================================================================
--- trunk/lib/libc/i386/sys/getcontext.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/getcontext.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Peter Wemm <peter at FreeBSD.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/getcontext.S 240152 2012-09-05 21:41:05Z jilles $");
#include <SYS.h>
@@ -42,12 +43,9 @@
movl (%esp),%ecx /* save getcontext return address */
mov $SYS_getcontext,%eax
KERNCALL
- jb 1f
+ jb HIDENAME(cerror)
addl $4,%esp /* remove stale (setcontext) return address */
jmp *%ecx /* restore return address */
-1:
- PIC_PROLOGUE
- jmp PIC_PLT(HIDENAME(cerror))
END(__sys_getcontext)
.section .note.GNU-stack,"",%progbits
Property changes on: trunk/lib/libc/i386/sys/getcontext.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/pipe.S
===================================================================
--- trunk/lib/libc/i386/sys/pipe.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/pipe.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)pipe.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/pipe.S 217106 2011-01-07 16:08:40Z kib $");
#include "SYS.h"
Property changes on: trunk/lib/libc/i386/sys/pipe.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/ptrace.S
===================================================================
--- trunk/lib/libc/i386/sys/ptrace.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/ptrace.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
Property changes on: trunk/lib/libc/i386/sys/ptrace.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/reboot.S
===================================================================
--- trunk/lib/libc/i386/sys/reboot.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/reboot.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
Property changes on: trunk/lib/libc/i386/sys/reboot.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/sbrk.S
===================================================================
--- trunk/lib/libc/i386/sys/sbrk.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/sbrk.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)sbrk.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/sbrk.S 240152 2012-09-05 21:41:05Z jilles $");
#include "SYS.h"
@@ -59,7 +60,7 @@
addl %eax,4(%esp)
mov $SYS_break,%eax
KERNCALL
- jb err
+ jb HIDENAME(cerror)
PIC_PROLOGUE
movl PIC_GOT(HIDENAME(curbrk)),%edx
movl (%edx),%eax
@@ -67,9 +68,6 @@
PIC_EPILOGUE
back:
ret
-err:
- PIC_PROLOGUE
- jmp PIC_PLT(HIDENAME(cerror))
#else /* !PIC */
@@ -80,13 +78,11 @@
addl %eax,4(%esp)
mov $SYS_break,%eax
KERNCALL
- jb err
+ jb HIDENAME(cerror)
movl HIDENAME(curbrk),%eax
addl %ecx,HIDENAME(curbrk)
back:
ret
-err:
- jmp HIDENAME(cerror)
#endif /* PIC */
END(sbrk)
Property changes on: trunk/lib/libc/i386/sys/sbrk.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/setlogin.S
===================================================================
--- trunk/lib/libc/i386/sys/setlogin.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/setlogin.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)setlogin.s 5.2 (Berkeley) 4/12/91"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/setlogin.S 254463 2013-08-17 19:24:58Z jilles $");
#include "SYS.h"
@@ -41,16 +42,9 @@
.globl CNAME(_logname_valid) /* in _getlogin() */
SYSCALL(setlogin)
-#ifdef PIC
PIC_PROLOGUE
- pushl %eax
- movl PIC_GOT(CNAME(_logname_valid)),%eax
- movl $0,(%eax)
- popl %eax
+ movl $0,PIC_GOTOFF(CNAME(_logname_valid))
PIC_EPILOGUE
-#else
- movl $0,CNAME(_logname_valid)
-#endif
ret /* setlogin(name) */
END(__sys_setlogin)
Property changes on: trunk/lib/libc/i386/sys/setlogin.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/lib/libc/i386/sys/sigreturn.S
===================================================================
--- trunk/lib/libc/i386/sys/sigreturn.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/sigreturn.S 2018-06-08 12:06:02 UTC (rev 10583)
Property changes on: trunk/lib/libc/i386/sys/sigreturn.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/sys/syscall.S
===================================================================
--- trunk/lib/libc/i386/sys/syscall.S 2018-06-08 12:05:31 UTC (rev 10582)
+++ trunk/lib/libc/i386/sys/syscall.S 2018-06-08 12:06:02 UTC (rev 10583)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,7 @@
.asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/sys/syscall.S 240152 2012-09-05 21:41:05Z jilles $");
#include "SYS.h"
@@ -45,11 +46,8 @@
KERNCALL
push %ecx /* need to push a word to keep stack frame intact
upon return; the word must be the return address. */
- jb 1f
+ jb HIDENAME(cerror)
ret
-1:
- PIC_PROLOGUE
- jmp PIC_PLT(HIDENAME(cerror))
END(syscall)
.section .note.GNU-stack,"",%progbits
Property changes on: trunk/lib/libc/i386/sys/syscall.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list