[Midnightbsd-cvs] src [10582] U trunk/lib/libc/i386/gen/sigsetjmp.S: sync with freebsd

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jun 8 08:05:31 EDT 2018


Revision: 10582
          http://svnweb.midnightbsd.org/src/?rev=10582
Author:   laffer1
Date:     2018-06-08 08:05:31 -0400 (Fri, 08 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/lib/libc/i386/gen/Makefile.inc
    trunk/lib/libc/i386/gen/_ctx_start.S
    trunk/lib/libc/i386/gen/_set_tp.c
    trunk/lib/libc/i386/gen/_setjmp.S
    trunk/lib/libc/i386/gen/fabs.S
    trunk/lib/libc/i386/gen/flt_rounds.c
    trunk/lib/libc/i386/gen/getcontextx.c
    trunk/lib/libc/i386/gen/infinity.c
    trunk/lib/libc/i386/gen/makecontext.c
    trunk/lib/libc/i386/gen/modf.S
    trunk/lib/libc/i386/gen/rfork_thread.S
    trunk/lib/libc/i386/gen/setjmp.S
    trunk/lib/libc/i386/gen/signalcontext.c
    trunk/lib/libc/i386/gen/sigsetjmp.S

Property Changed:
----------------
    trunk/lib/libc/i386/gen/Makefile.inc
    trunk/lib/libc/i386/gen/_ctx_start.S
    trunk/lib/libc/i386/gen/_setjmp.S
    trunk/lib/libc/i386/gen/fabs.S
    trunk/lib/libc/i386/gen/modf.S
    trunk/lib/libc/i386/gen/rfork_thread.S
    trunk/lib/libc/i386/gen/setjmp.S
    trunk/lib/libc/i386/gen/sigsetjmp.S

Modified: trunk/lib/libc/i386/gen/Makefile.inc
===================================================================
--- trunk/lib/libc/i386/gen/Makefile.inc	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/Makefile.inc	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,6 +1,7 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: stable/10/lib/libc/i386/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $
+# $MidnightBSD$
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c fabs.S \
-	flt_rounds.c getcontextx.c infinity.c ldexp.c makecontext.c modf.S \
+	flt_rounds.c getcontextx.c infinity.c ldexp.c makecontext.c \
 	rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S


Property changes on: trunk/lib/libc/i386/gen/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/_ctx_start.S
===================================================================
--- trunk/lib/libc/i386/gen/_ctx_start.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/_ctx_start.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2001 Daniel Eischen <deischen at freebsd.org>
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/_ctx_start.S 217106 2011-01-07 16:08:40Z kib $");
 
 /*
  * _ctx_start((void *func)(int arg1, ..., argn),


Property changes on: trunk/lib/libc/i386/gen/_ctx_start.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/_set_tp.c
===================================================================
--- trunk/lib/libc/i386/gen/_set_tp.c	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/_set_tp.c	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004 Doug Rabson
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: stable/10/lib/libc/i386/gen/_set_tp.c 150065 2005-09-12 19:52:42Z stefanf $
  */
 
 #include <string.h>

Modified: trunk/lib/libc/i386/gen/_setjmp.S
===================================================================
--- trunk/lib/libc/i386/gen/_setjmp.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/_setjmp.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,7 +35,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/_setjmp.S 217106 2011-01-07 16:08:40Z kib $");
 
 /*
  * C library -- _setjmp, _longjmp


Property changes on: trunk/lib/libc/i386/gen/_setjmp.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/fabs.S
===================================================================
--- trunk/lib/libc/i386/gen/fabs.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/fabs.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,7 +35,7 @@
 	.asciz "@(#)fabs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/fabs.S 217106 2011-01-07 16:08:40Z kib $");
 
 ENTRY(fabs)
 	fldl	4(%esp)


Property changes on: trunk/lib/libc/i386/gen/fabs.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/flt_rounds.c
===================================================================
--- trunk/lib/libc/i386/gen/flt_rounds.c	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/flt_rounds.c	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -4,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/flt_rounds.c 132383 2004-07-19 08:17:25Z das $");
 
 #include <float.h>
 

Modified: trunk/lib/libc/i386/gen/getcontextx.c
===================================================================
--- trunk/lib/libc/i386/gen/getcontextx.c	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/getcontextx.c	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2011 Konstantin Belousov <kib at FreeBSD.org>
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>

Modified: trunk/lib/libc/i386/gen/infinity.c
===================================================================
--- trunk/lib/libc/i386/gen/infinity.c	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/infinity.c	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,9 +1,10 @@
+/* $MidnightBSD$ */
 /*
  * infinity.c
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/infinity.c 110566 2003-02-08 20:37:55Z mike $");
 
 #include <math.h>
 

Modified: trunk/lib/libc/i386/gen/makecontext.c
===================================================================
--- trunk/lib/libc/i386/gen/makecontext.c	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/makecontext.c	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2001 Daniel M. Eischen <deischen at freebsd.org>
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/makecontext.c 138403 2004-12-05 21:22:08Z deischen $");
 
 #include <sys/param.h>
 #include <sys/signal.h>

Modified: trunk/lib/libc/i386/gen/modf.S
===================================================================
--- trunk/lib/libc/i386/gen/modf.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/modf.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -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/gen/modf.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/rfork_thread.S
===================================================================
--- trunk/lib/libc/i386/gen/rfork_thread.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/rfork_thread.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2000 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/gen/rfork_thread.S 240152 2012-09-05 21:41:05Z jilles $");
 
 /*
  * With thanks to John Dyson for the original version of this.
@@ -113,8 +114,7 @@
 	popl	%esi
 	movl	%ebp, %esp
 	popl	%ebp
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
+	jmp	HIDENAME(cerror)
 END(rfork_thread)
 
 	.section .note.GNU-stack,"",%progbits


Property changes on: trunk/lib/libc/i386/gen/rfork_thread.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/setjmp.S
===================================================================
--- trunk/lib/libc/i386/gen/setjmp.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/setjmp.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,7 +35,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/setjmp.S 287480 2015-09-05 08:55:51Z kib $");
 
 /*
  * C library -- _setjmp, _longjmp
@@ -50,21 +51,12 @@
 
 ENTRY(setjmp)
 	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-#ifdef PIC
-	subl	$12,%esp		/* make the stack 16-byte aligned */
-#endif
 	leal	28(%ecx), %eax
 	pushl	%eax			/* (sigset_t*)oset */
 	pushl	$0			/* (sigset_t*)set  */
 	pushl	$1			/* SIG_BLOCK       */
-	call	PIC_PLT(CNAME(_sigprocmask))
-#ifdef PIC
-	addl	$24,%esp
-#else
+	call	__libc_sigprocmask
 	addl	$12,%esp
-#endif
-	PIC_EPILOGUE
 	movl	4(%esp),%ecx
 	movl	0(%esp),%edx
 	movl	%edx, 0(%ecx)
@@ -82,21 +74,12 @@
 	.set CNAME(longjmp),CNAME(__longjmp)
 ENTRY(__longjmp)
 	movl	4(%esp),%edx
-	PIC_PROLOGUE
-#ifdef PIC
-	subl	$12,%esp		/* make the stack 16-byte aligned */
-#endif
 	pushl	$0			/* (sigset_t*)oset */
 	leal	28(%edx), %eax
 	pushl	%eax			/* (sigset_t*)set  */
 	pushl	$3			/* SIG_SETMASK     */
-	call	PIC_PLT(CNAME(_sigprocmask))
-#ifdef PIC
-	addl	$24,%esp
-#else
+	call	__libc_sigprocmask
 	addl	$12,%esp
-#endif
-	PIC_EPILOGUE
 	movl	4(%esp),%edx
 	movl	8(%esp),%eax
 	movl	0(%edx),%ecx


Property changes on: trunk/lib/libc/i386/gen/setjmp.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libc/i386/gen/signalcontext.c
===================================================================
--- trunk/lib/libc/i386/gen/signalcontext.c	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/signalcontext.c	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002 Jonathan Mini <mini at freebsd.org>
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/signalcontext.c 131501 2004-07-02 23:20:05Z davidxu $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>

Modified: trunk/lib/libc/i386/gen/sigsetjmp.S
===================================================================
--- trunk/lib/libc/i386/gen/sigsetjmp.S	2018-06-08 12:03:06 UTC (rev 10581)
+++ trunk/lib/libc/i386/gen/sigsetjmp.S	2018-06-08 12:05:31 UTC (rev 10582)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,10 +35,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
-	.asciz "$Id: sigsetjmp.S,v 1.3 2012-10-20 16:20:20 laffer1 Exp $"
+	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/i386/gen/sigsetjmp.S 287480 2015-09-05 08:55:51Z kib $");
 
 #include "SYS.h"
 
@@ -59,21 +60,12 @@
 	movl	%eax,44(%ecx)
 	testl	%eax,%eax
 	jz	2f
-	PIC_PROLOGUE
-#ifdef PIC
-	subl	$12,%esp		/* make the stack 16-byte aligned */
-#endif
 	leal	28(%ecx), %eax
 	pushl	%eax			/* (sigset_t*)oset */
 	pushl	$0			/* (sigset_t*)set  */
 	pushl	$1			/* SIG_BLOCK       */
-	call	PIC_PLT(CNAME(_sigprocmask))
-#ifdef PIC
-	addl	$24,%esp
-#else
+	call	__libc_sigprocmask
 	addl	$12,%esp
-#endif
-	PIC_EPILOGUE
 	movl	4(%esp),%ecx
 2:	movl	0(%esp),%edx
 	movl	%edx, 0(%ecx)
@@ -93,21 +85,12 @@
 	movl	4(%esp),%edx
 	cmpl	$0,44(%edx)
 	jz	2f
-	PIC_PROLOGUE
-#ifdef PIC
-	subl	$12,%esp		/* make the stack 16-byte aligned */
-#endif
 	pushl	$0			/* (sigset_t*)oset */
 	leal	28(%edx), %eax
 	pushl	%eax			/* (sigset_t*)set  */
 	pushl	$3			/* SIG_SETMASK     */
-	call	PIC_PLT(CNAME(_sigprocmask))
-#ifdef PIC
-	addl	$24,%esp
-#else
+	call	__libc_sigprocmask
 	addl	$12,%esp
-#endif
-	PIC_EPILOGUE
 	movl	4(%esp),%edx
 2:	movl	8(%esp),%eax
 	movl	0(%edx),%ecx


Property changes on: trunk/lib/libc/i386/gen/sigsetjmp.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list