[src/netbsd-7]: src/lib/libc/arch/powerpc64 Fix merge mishap in previous

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

details:   https://anonhg.NetBSD.org/src/rev/813fa2b3d66b
branches:  netbsd-7
changeset: 798956:813fa2b3d66b
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 04 22:42:04 2015 +0000

description:
Fix merge mishap in previous

diffstat:

 lib/libc/arch/powerpc64/gen/__setjmp14.S |   9 +++------
 lib/libc/arch/powerpc64/sys/getcontext.S |  10 +++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diffs (44 lines):

diff -r aeda9c60b30e -r 813fa2b3d66b lib/libc/arch/powerpc64/gen/__setjmp14.S
--- a/lib/libc/arch/powerpc64/gen/__setjmp14.S  Wed Feb 04 22:08:48 2015 +0000
+++ b/lib/libc/arch/powerpc64/gen/__setjmp14.S  Wed Feb 04 22:42:04 2015 +0000
@@ -1,12 +1,9 @@
-/*     $NetBSD: __setjmp14.S,v 1.2.24.1 2015/02/04 22:00:24 martin Exp $       */
+/*     $NetBSD: __setjmp14.S,v 1.2.24.2 2015/02/04 22:42:04 martin Exp $       */
 
-#include <sys/syscall.h>
-
-#include <machine/asm.h>
+#include "SYS.h"
 
 #if defined(LIBC_SCCS)
-       .text
-       .asciz "$NetBSD: __setjmp14.S,v 1.2.24.1 2015/02/04 22:00:24 martin Exp $"
+__RCSID("$NetBSD: __setjmp14.S,v 1.2.24.2 2015/02/04 22:42:04 martin Exp $")
 #endif
 
 /*
diff -r aeda9c60b30e -r 813fa2b3d66b lib/libc/arch/powerpc64/sys/getcontext.S
--- a/lib/libc/arch/powerpc64/sys/getcontext.S  Wed Feb 04 22:08:48 2015 +0000
+++ b/lib/libc/arch/powerpc64/sys/getcontext.S  Wed Feb 04 22:42:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getcontext.S,v 1.4.20.1 2015/02/04 22:00:24 martin Exp $       */
+/*     $NetBSD: getcontext.S,v 1.4.20.2 2015/02/04 22:42:04 martin Exp $       */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
  */
 
 #include "SYS.h"
+#include "assym.h"
 
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-       .text
-       .asciz "$NetBSD: getcontext.S,v 1.4.20.1 2015/02/04 22:00:24 martin Exp $"
-#endif /* SYSLIBC_SCCS && !lint */
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: getcontext.S,v 1.4.20.2 2015/02/04 22:42:04 martin Exp $")
+#endif /* LIBC_SCCS && !lint */
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(getcontext, _getcontext)