Module Name: src
Committed By: nakayama
Date: Sat Sep 14 05:38:00 UTC 2013
Modified Files:
src/lib/libc/arch/sparc64/gen: sigsetjmp.S
src/lib/libc/arch/sparc64/sys: cerror.S sbrk.S
Log Message:
Redo previous to fix build break.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sparc64/gen/sigsetjmp.S
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sparc64/sys/cerror.S
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sparc64/sys/sbrk.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/sparc64/gen/sigsetjmp.S
diff -u src/lib/libc/arch/sparc64/gen/sigsetjmp.S:1.11 src/lib/libc/arch/sparc64/gen/sigsetjmp.S:1.12
--- src/lib/libc/arch/sparc64/gen/sigsetjmp.S:1.11 Thu Sep 12 15:36:16 2013
+++ src/lib/libc/arch/sparc64/gen/sigsetjmp.S Sat Sep 14 05:38:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sigsetjmp.S,v 1.11 2013/09/12 15:36:16 joerg Exp $ */
+/* $NetBSD: sigsetjmp.S,v 1.12 2013/09/14 05:38:00 nakayama Exp $ */
/*
* Copyright (c) 1995 Paul Kranenburg
* All rights reserved.
@@ -68,7 +68,7 @@ ENTRY(__siglongjmp14)
nop
unimp 0
-#if __PIC__ - 0 >= 1
+#elif __PIC__ - 0 >= 1
ENTRY(__sigsetjmp14)
PIC_PROLOGUE(%g1,%o2) ! %g1 = _GLOBAL_OFFSET_TABLE
Index: src/lib/libc/arch/sparc64/sys/cerror.S
diff -u src/lib/libc/arch/sparc64/sys/cerror.S:1.7 src/lib/libc/arch/sparc64/sys/cerror.S:1.8
--- src/lib/libc/arch/sparc64/sys/cerror.S:1.7 Thu Sep 12 15:36:16 2013
+++ src/lib/libc/arch/sparc64/sys/cerror.S Sat Sep 14 05:38:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.7 2013/09/12 15:36:16 joerg Exp $ */
+/* $NetBSD: cerror.S,v 1.8 2013/09/14 05:38:00 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
#if 0
.asciz "@(#)cerror.s 8.1 (Berkeley) 6/4/93"
#else
- RCSID("$NetBSD: cerror.S,v 1.7 2013/09/12 15:36:16 joerg Exp $")
+ RCSID("$NetBSD: cerror.S,v 1.8 2013/09/14 05:38:00 nakayama Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,7 +69,7 @@ FUNC(__cerror)
retl
mov -1, %o1
-#if __PIC__ - 0 >= 1
+#elif __PIC__ - 0 >= 1
FUNC(__cerror)
PIC_PROLOGUE(%g1, %o3)
Index: src/lib/libc/arch/sparc64/sys/sbrk.S
diff -u src/lib/libc/arch/sparc64/sys/sbrk.S:1.10 src/lib/libc/arch/sparc64/sys/sbrk.S:1.11
--- src/lib/libc/arch/sparc64/sys/sbrk.S:1.10 Thu Sep 12 15:36:16 2013
+++ src/lib/libc/arch/sparc64/sys/sbrk.S Sat Sep 14 05:38:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.10 2013/09/12 15:36:16 joerg Exp $ */
+/* $NetBSD: sbrk.S,v 1.11 2013/09/14 05:38:00 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
#if 0
.asciz "@(#)sbrk.s 8.1 (Berkeley) 6/4/93"
#else
- RCSID("$NetBSD: sbrk.S,v 1.10 2013/09/12 15:36:16 joerg Exp $")
+ RCSID("$NetBSD: sbrk.S,v 1.11 2013/09/14 05:38:00 nakayama Exp $")
#endif
#endif /* SYSLIBC_SCCS and not lint */
@@ -77,7 +77,7 @@ ENTRY(_sbrk)
retl /* and update curbrk */
stx %o4, [%o2]
-#if __PIC__ - 0 >= 1
+#elif __PIC__ - 0 >= 1
ENTRY(_sbrk)
PIC_PROLOGUE(%o5,%o4)
