Make this code actually compile on hppa64.

ok kettenis@

9 files changed, 79 insertions, 79 deletions

diff --git a/lib/libc/arch/hppa64/sys/Ovfork.S b/lib/libc/arch/hppa64/sys/Ovfork.S
index 13cb503c717..60f7412d798 100644
--- a/lib/libc/arch/hppa64/sys/Ovfork.S
+++ b/lib/libc/arch/hppa64/sys/Ovfork.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: Ovfork.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: Ovfork.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999,2002 Michael Shalayeff
@@ -30,16 +30,16 @@
 
 SYSENTRY(vfork)
 	.import errno, data
-	copy	rp, t4
-	ldil	L%SYSCALLGATE, r1
-	ble	4(sr7, r1)
-	ldi	__CONCAT(SYS_,vfork), t1
+	copy	%rp, arg7
+	ldil	L%SYSCALLGATE, %r1
+	ble	4(%sr7, %r1)
+	ldi	__CONCAT(SYS_,vfork), arg4
 	.import	__cerror, code
-	comb,<>	r0, t1, __cerror
-	copy	t4, rp
-	addi	-1, ret1, ret1
-	bv	r0(rp)
-	and	ret1, ret0, ret0
+	comb,<>	%r0, arg4, __cerror
+	copy	arg7, %rp
+	addi	-1, %ret1, %ret1
+	bv	%r0(%rp)
+	and	%ret1, %ret0, %ret0
 SYSEXIT(vfork)
 
 	.end
diff --git a/lib/libc/arch/hppa64/sys/brk.S b/lib/libc/arch/hppa64/sys/brk.S
index fd7022d8729..cc2bae54616 100644
--- a/lib/libc/arch/hppa64/sys/brk.S
+++ b/lib/libc/arch/hppa64/sys/brk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brk.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: brk.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -38,29 +38,29 @@ minbrk
 
 SYSENTRY(brk)
 #ifdef PIC
-	addil	LT%minbrk, r19
-	ldd	RT%minbrk(r1), t1
-	ldd	0(t1), t2
+	addil	LT%minbrk, %r19
+	ldd	RT%minbrk(%r1), arg4
+	ldd	0(arg4), arg5
 #else
-	ldil	L%minbrk, t1
-	ldd	R%minbrk(t1), t2
+	ldil	L%minbrk, arg4
+	ldd	R%minbrk(arg4), arg5
 #endif
-	sub,<<	t2, arg0, r0
-	copy	t2, arg0
-	std	arg0, HPPA_FRAME_ARG(0)(sp)
+	sub,<<	arg5, %arg0, %r0
+	copy	arg5, %arg0
+	std	%arg0, HPPA_FRAME_ARG(0)(%sp)
 
 	SYSCALL(break)
 
-	ldd	HPPA_FRAME_ARG(0)(sp), arg0
+	ldd	HPPA_FRAME_ARG(0)(%sp), %arg0
 #ifdef PIC
-	addil	LT%__curbrk, r19
-	ldd	RT%__curbrk(r1), t1
-	bv	r0(rp)
-	std     arg0, 0(t1)
+	addil	LT%__curbrk, %r19
+	ldd	RT%__curbrk(%r1), arg4
+	bv	%r0(%rp)
+	std     %arg0, 0(arg4)
 #else
-	ldil	L%__curbrk, t1
-	bv	r0(rp)
-	std	arg0, R%__curbrk(t1)
+	ldil	L%__curbrk, arg4
+	bv	%r0(%rp)
+	std	%arg0, R%__curbrk(arg4)
 #endif
 SYSEXIT(brk)
 
diff --git a/lib/libc/arch/hppa64/sys/cerror.S b/lib/libc/arch/hppa64/sys/cerror.S
index 76c0f47de85..922e89cfee2 100644
--- a/lib/libc/arch/hppa64/sys/cerror.S
+++ b/lib/libc/arch/hppa64/sys/cerror.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cerror.S,v 1.2 2011/04/04 12:42:39 guenther Exp $	*/
+/*	$OpenBSD: cerror.S,v 1.3 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 2004 Michael Shalayeff
@@ -33,16 +33,16 @@ WEAK_ALIAS(__cerror, ___cerror)
 	.import errno, data
 ENTRY(___cerror,0)
 #ifdef PIC
-	addil	LT%errno, r19
-	ldd	RT%errno(r1), r1
-	std	t1, 0(r1)
+	addil	LT%errno, %r19
+	ldd	RT%errno(%r1), %r1
+	std	%arg3, 0(%r1)
 #else
-	ldil	L%errno, r1
-	std	t1, R%errno(r1)
+	ldil	L%errno, %r1
+	std	%arg3, R%errno(%r1)
 #endif
-	ldi	-1, ret0
-	bv	r0(rp)
-	ldi	-1, ret1
+	ldi	-1, %ret0
+	bv	%r0(%rp)
+	ldi	-1, %ret1
 EXIT(___cerror)
 
 	.end
diff --git a/lib/libc/arch/hppa64/sys/fork.S b/lib/libc/arch/hppa64/sys/fork.S
index c18ac975d9c..79a9cffa161 100644
--- a/lib/libc/arch/hppa64/sys/fork.S
+++ b/lib/libc/arch/hppa64/sys/fork.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fork.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: fork.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -30,9 +30,9 @@
 
 SYSENTRY(fork)
 	SYSCALL(fork)
-	addi	-1, ret1, ret1
-	bv	r0(rp)
-	and	ret0, ret1, ret0
+	addi	-1, %ret1, %ret1
+	bv	%r0(%rp)
+	and	%ret0, %ret1, %ret0
 SYSEXIT(fork)
 
 	.end
diff --git a/lib/libc/arch/hppa64/sys/rfork.S b/lib/libc/arch/hppa64/sys/rfork.S
index 0ee732a2cb7..b8ea1b67d7d 100644
--- a/lib/libc/arch/hppa64/sys/rfork.S
+++ b/lib/libc/arch/hppa64/sys/rfork.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfork.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: rfork.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -30,9 +30,9 @@
 
 SYSENTRY(rfork)
 	SYSCALL(rfork)
-	addi	-1, ret1, ret1
-	bv	r0(rp)
-	and	ret0, ret1, ret0
+	addi	-1, %ret1, %ret1
+	bv	%r0(%rp)
+	and	%ret0, %ret1, %ret0
 SYSEXIT(rfork)
 
 	.end
diff --git a/lib/libc/arch/hppa64/sys/sbrk.S b/lib/libc/arch/hppa64/sys/sbrk.S
index bc83767d2b1..b1b81beec66 100644
--- a/lib/libc/arch/hppa64/sys/sbrk.S
+++ b/lib/libc/arch/hppa64/sys/sbrk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbrk.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: sbrk.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -37,29 +37,29 @@ __curbrk
 
 SYSENTRY(sbrk)
 #ifdef PIC
-	addil	LT%__curbrk, r19
-	ldd	RT%__curbrk(r1), t1
-	ldd	0(t1), t2
+	addil	LT%__curbrk, %r19
+	ldd	RT%__curbrk(%r1), %arg3
+	ldd	0(%arg3), %arg2
 #else
-	ldil	L%__curbrk, t1
-	ldd	R%__curbrk(t1), t2
+	ldil	L%__curbrk, %arg3
+	ldd	R%__curbrk(%arg3), %arg2
 #endif
-	add	arg0, t2, arg0
-	std	arg0, HPPA_FRAME_ARG(0)(sp)
+	add	%arg0, %arg2, %arg0
+	std	%arg0, HPPA_FRAME_ARG(0)(%sp)
 
 	SYSCALL(break)
 
 #ifdef PIC
-	addil	LT%__curbrk, r19
-	ldd	RT%__curbrk(r1), t1
+	addil	LT%__curbrk, %r19
+	ldd	RT%__curbrk(%r1), %arg3
 #else
-	ldil	L%__curbrk, t1
-	ldo	R%__curbrk(t1), t1
+	ldil	L%__curbrk, %arg3
+	ldo	R%__curbrk(%arg3), %arg3
 #endif
-	ldd	HPPA_FRAME_ARG(0)(sp), arg0
-	ldd	0(t1), ret0
-	bv	r0(rp)
-	std	arg0, 0(t1)
+	ldd	HPPA_FRAME_ARG(0)(%sp), %arg0
+	ldd	0(%arg3), %ret0
+	bv	%r0(%rp)
+	std	%arg0, 0(%arg3)
 
 SYSEXIT(sbrk)
 
diff --git a/lib/libc/arch/hppa64/sys/sigpending.S b/lib/libc/arch/hppa64/sys/sigpending.S
index 4955ac41ce6..5f1f0c20eb0 100644
--- a/lib/libc/arch/hppa64/sys/sigpending.S
+++ b/lib/libc/arch/hppa64/sys/sigpending.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigpending.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: sigpending.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -30,10 +30,10 @@
 
 SYSENTRY(sigpending)
 	SYSCALL(sigpending)
-	ldd	HPPA_FRAME_ARG(0)(sp), t1
-	std	ret0, 0(t1)
-	bv	r0(rp)
-	copy	r0, ret0
+	ldd	HPPA_FRAME_ARG(0)(%sp), %arg3
+	std	%ret0, 0(%arg3)
+	bv	%r0(%rp)
+	copy	%r0, %ret0
 SYSEXIT(sigpending)
 
 	.end
diff --git a/lib/libc/arch/hppa64/sys/sigprocmask.S b/lib/libc/arch/hppa64/sys/sigprocmask.S
index 468064d435d..7e2e8fc1ed8 100644
--- a/lib/libc/arch/hppa64/sys/sigprocmask.S
+++ b/lib/libc/arch/hppa64/sys/sigprocmask.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigprocmask.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: sigprocmask.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -30,25 +30,25 @@
 
 SYSENTRY(sigprocmask)
 	/* just in case compiler forgot about this */
-	std	arg2, HPPA_FRAME_ARG(2)(sp)
+	std	%arg2, HPPA_FRAME_ARG(2)(%sp)
 
-	comb,<>,n r0, arg1, sigprocmask$nblock
+	comb,<>,n %r0, %arg1, sigprocmask$nblock
 
 	b	sigprocmask$call
-	ldi	1, arg0
+	ldi	1, %arg0
 
 sigprocmask$nblock
-	ldd	0(arg1), arg1
-	std	arg1, HPPA_FRAME_ARG(1)(sp)
+	ldd	0(%arg1), %arg1
+	std	%arg1, HPPA_FRAME_ARG(1)(%sp)
 
 sigprocmask$call
 	SYSCALL(sigprocmask)
 
-	ldd	HPPA_FRAME_ARG(2)(sp), arg2
-	add,=	r0, arg2, r0
-	std	ret0, 0(arg2)
-	bv	r0(rp)
-	copy	r0, ret0
+	ldd	HPPA_FRAME_ARG(2)(%sp), %arg2
+	add,=	%r0, %arg2, %r0
+	std	%ret0, 0(%arg2)
+	bv	%r0(%rp)
+	copy	%r0, %ret0
 SYSEXIT(sigprocmask)
 
 	.end
diff --git a/lib/libc/arch/hppa64/sys/sigsuspend.S b/lib/libc/arch/hppa64/sys/sigsuspend.S
index cf2526a0f1e..5e2e8fec4f8 100644
--- a/lib/libc/arch/hppa64/sys/sigsuspend.S
+++ b/lib/libc/arch/hppa64/sys/sigsuspend.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigsuspend.S,v 1.3 2006/01/05 22:19:49 kettenis Exp $	*/
+/*	$OpenBSD: sigsuspend.S,v 1.4 2011/04/21 14:12:20 jsing Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -29,8 +29,8 @@
 #include "SYS.h"
 
 SYSENTRY(sigsuspend)
-	ldd	0(arg0), arg0
-	std	arg0, HPPA_FRAME_ARG(0)(sp)
+	ldd	0(%arg0), %arg0
+	std	%arg0, HPPA_FRAME_ARG(0)(%sp)
 
 	SYSCALL(sigsuspend)
 SYSEXIT(sigsuspend)