Module Name: src
Committed By: martin
Date: Wed Feb 4 22:42:04 UTC 2015
Modified Files:
src/lib/libc/arch/powerpc64/gen [netbsd-7]: __setjmp14.S
src/lib/libc/arch/powerpc64/sys [netbsd-7]: getcontext.S
Log Message:
Fix merge mishap in previous
To generate a diff of this commit:
cvs rdiff -u -r1.2.24.1 -r1.2.24.2 \
src/lib/libc/arch/powerpc64/gen/__setjmp14.S
cvs rdiff -u -r1.4.20.1 -r1.4.20.2 \
src/lib/libc/arch/powerpc64/sys/getcontext.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/powerpc64/gen/__setjmp14.S
diff -u src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.2.24.1 src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.2.24.2
--- src/lib/libc/arch/powerpc64/gen/__setjmp14.S:1.2.24.1 Wed Feb 4 22:00:24 2015
+++ src/lib/libc/arch/powerpc64/gen/__setjmp14.S Wed Feb 4 22:42:04 2015
@@ -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
/*
Index: src/lib/libc/arch/powerpc64/sys/getcontext.S
diff -u src/lib/libc/arch/powerpc64/sys/getcontext.S:1.4.20.1 src/lib/libc/arch/powerpc64/sys/getcontext.S:1.4.20.2
--- src/lib/libc/arch/powerpc64/sys/getcontext.S:1.4.20.1 Wed Feb 4 22:00:24 2015
+++ src/lib/libc/arch/powerpc64/sys/getcontext.S Wed Feb 4 22:42:04 2015
@@ -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)
