17 files changed, 36 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index eaae38382b..99a78a053b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,25 @@
 Fri Apr 14 18:49:03 1995  Brendan Kehoe  (brendan@zen.org)
 
+	* sysdeps/unix/mips/brk.S (__brk, __curbrk): Add .end.
+	* sysdeps/unix/mips/fork.S (fork): Likewise.
+	* sysdeps/unix/mips/pipe.S (fork): Likewise.
+	* sysdeps/unix/mips/sigreturn.S (__sigreturn): Likewise.
+	* sysdeps/unix/mips/sysdep.S (sysdep_error): Likewise.
+	* sysdeps/unix/mips/wait.S (__handler): Likewise.
+	* sysdeps/mips/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/mips/bsd-setjmp.S (setjmp): Likewise.
+	* sysdeps/unix/bsd/ultrix4/getsysinfo.S (getsysinfo): Likewise.
+	* sysdeps/unix/bsd/ultrix4/wait3.S (waitpid): Likewise.
+	* sysdeps/unix/bsd/ultrix4/waitpid.S (waitpid): Likewise.
+	* sysdeps/unix/bsd/ultrix4/mips/__handler.S (__handler): Likewise.
+	* sysdeps/unix/bsd/ultrix4/mips/sigvec.S (__raw_sigvec): Likewise.
+	* sysdeps/unix/bsd/ultrix4/mips/start.S (__start): Likewise.
+	* sysdeps/unix/bsd/ultrix4/mips/vfork.S (vfork): Likewise.
+	* sysdeps/mips/bsd-_setjmp.S (setjmp): Likewise.  Use `$0'
+	instead of `zero' for the li instruction.
+
 	* sysdeps/unix/bsd/osf/alpha/start.S: Change comments to be
 	preprocessor comments, not assembler comments.
-
 	* sysdeps/unix/bsd/osf/alpha/sysdep.h (NO_UNDERSCORES): Define.
 
 Fri Apr 14 15:53:46 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
diff --git a/sysdeps/mips/bsd-_setjmp.S b/sysdeps/mips/bsd-_setjmp.S
index 6e6844cc52..78776cd3e5 100644
--- a/sysdeps/mips/bsd-_setjmp.S
+++ b/sysdeps/mips/bsd-_setjmp.S
@@ -25,4 +25,5 @@ Cambridge, MA 02139, USA.  */
 
 ENTRY (setjmp)
 	j C_SYMBOL_NAME (__sigsetjmp)
-	li a1, zero		/* Pass a second argument of zero.  */
+	li a1, $0		/* Pass a second argument of zero.  */
+	.end setjmp
diff --git a/sysdeps/mips/bsd-setjmp.S b/sysdeps/mips/bsd-setjmp.S
index 5cd090a31c..4742462e88 100644
--- a/sysdeps/mips/bsd-setjmp.S
+++ b/sysdeps/mips/bsd-setjmp.S
@@ -26,3 +26,4 @@ Cambridge, MA 02139, USA.  */
 ENTRY (setjmp)
 	j C_SYMBOL_NAME (__sigsetjmp)
 	li a1, 1		/* Pass a second argument of one.  */
+	.end setjmp
diff --git a/sysdeps/mips/setjmp.S b/sysdeps/mips/setjmp.S
index b3c0247468..0f5dba3a60 100644
--- a/sysdeps/mips/setjmp.S
+++ b/sysdeps/mips/setjmp.S
@@ -29,3 +29,4 @@ ENTRY (__sigsetjmp)
 	move a3, $fp
 #endif
 	j __sigsetjmp_aux
+	.end __sigsetjmp
diff --git a/sysdeps/unix/bsd/ultrix4/getsysinfo.S b/sysdeps/unix/bsd/ultrix4/getsysinfo.S
index 1f5b2cf487..41718ba228 100644
--- a/sysdeps/unix/bsd/ultrix4/getsysinfo.S
+++ b/sysdeps/unix/bsd/ultrix4/getsysinfo.S
@@ -23,3 +23,4 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (getsysinfo, 5)
 	ret
+	.end __getsysinfo
diff --git a/sysdeps/unix/bsd/ultrix4/mips/__handler.S b/sysdeps/unix/bsd/ultrix4/mips/__handler.S
index 3ea697c5a0..ca9c3fe858 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/__handler.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/__handler.S
@@ -111,3 +111,4 @@ ENTRY (__handler)
 	/* Do a sigreturn syscall; this doesn't return.  */
 	la v0, __sigreturn
 	jal ra, v0
+	.end __handler
diff --git a/sysdeps/unix/bsd/ultrix4/mips/sigvec.S b/sysdeps/unix/bsd/ultrix4/mips/sigvec.S
index 20a5dd1c49..4d7aa4409c 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/sigvec.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/sigvec.S
@@ -22,3 +22,4 @@ Cambridge, MA 02139, USA.  */
 
 PSEUDO (__raw_sigvec, sigvec, 3)
 	ret
+	.end __raw_sigvec
diff --git a/sysdeps/unix/bsd/ultrix4/mips/start.S b/sysdeps/unix/bsd/ultrix4/mips/start.S
index eec8ce08be..24bcbb4e00 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/start.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/start.S
@@ -68,3 +68,4 @@ ENTRY(__start)
   /* Make the value returned by main be the argument to exit.  */
   jal exit
   move a0, v0
+  .end __start
diff --git a/sysdeps/unix/bsd/ultrix4/mips/vfork.S b/sysdeps/unix/bsd/ultrix4/mips/vfork.S
index 37f6d8016d..05e4b87f2e 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/vfork.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/vfork.S
@@ -29,5 +29,6 @@ SYSCALL__ (vfork, 0)
 parent:
 	ret
 	nop
+	.end __vfork
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/bsd/ultrix4/wait3.S b/sysdeps/unix/bsd/ultrix4/wait3.S
index 83910a5d7b..930c67e825 100644
--- a/sysdeps/unix/bsd/ultrix4/wait3.S
+++ b/sysdeps/unix/bsd/ultrix4/wait3.S
@@ -20,5 +20,6 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (wait3, 3)
 	ret
+	.end __wait3
 
 weak_alias (__wait3, wait3)
diff --git a/sysdeps/unix/bsd/ultrix4/waitpid.S b/sysdeps/unix/bsd/ultrix4/waitpid.S
index b64e528b69..3470da783e 100644
--- a/sysdeps/unix/bsd/ultrix4/waitpid.S
+++ b/sysdeps/unix/bsd/ultrix4/waitpid.S
@@ -20,5 +20,6 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (waitpid, 3)
 	ret
+	.end __waitpid
 
 weak_alias (__waitpid, waitpid)
diff --git a/sysdeps/unix/mips/brk.S b/sysdeps/unix/mips/brk.S
index 1754c0c4de..9c4ee26edc 100644
--- a/sysdeps/unix/mips/brk.S
+++ b/sysdeps/unix/mips/brk.S
@@ -30,7 +30,7 @@ Cambridge, MA 02139, USA.  */
 .sdata
 ENTRY(__curbrk)
 	.word __end
-
+	.end __curbrk
 .text
 .set noreorder
 .set noat
@@ -63,5 +63,6 @@ error:	j syscall_error
 	nop
 	nop
 	nop
+	.end __brk
 
 weak_alias (__brk, brk)
diff --git a/sysdeps/unix/mips/fork.S b/sysdeps/unix/mips/fork.S
index 2347bf4d50..17efcc92a8 100644
--- a/sysdeps/unix/mips/fork.S
+++ b/sysdeps/unix/mips/fork.S
@@ -25,5 +25,6 @@ SYSCALL__ (fork, 0)
 	move v0, zero
 parent:
 	ret
+	.end __fork
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/mips/pipe.S b/sysdeps/unix/mips/pipe.S
index f8ce56b118..b9f376d365 100644
--- a/sysdeps/unix/mips/pipe.S
+++ b/sysdeps/unix/mips/pipe.S
@@ -27,5 +27,6 @@ SYSCALL__ (pipe, 1)
 	j ra
 	move v0, zero
 	nop
+	.end __pipe
 
 weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/mips/sigreturn.S b/sysdeps/unix/mips/sigreturn.S
index 1e76bf5f99..70ae0c2749 100644
--- a/sysdeps/unix/mips/sigreturn.S
+++ b/sysdeps/unix/mips/sigreturn.S
@@ -25,5 +25,6 @@ Cambridge, MA 02139, USA.  */
 ENTRY(__sigreturn)
 	li v0, SYS_sigreturn
 	syscall
+	.end __sigreturn
 
 weak_alias (__sigreturn, sigreturn)
diff --git a/sysdeps/unix/mips/sysdep.S b/sysdeps/unix/mips/sysdep.S
index 21bdf234f9..f17ba44341 100644
--- a/sysdeps/unix/mips/sysdep.S
+++ b/sysdeps/unix/mips/sysdep.S
@@ -39,3 +39,4 @@ skip:
 	/* And just kick back a -1.  */
 	j ra
 	li v0, -1
+	.end syscall_error
diff --git a/sysdeps/unix/mips/wait.S b/sysdeps/unix/mips/wait.S
index 63bce849d4..f1f4f9b42c 100644
--- a/sysdeps/unix/mips/wait.S
+++ b/sysdeps/unix/mips/wait.S
@@ -40,5 +40,6 @@ noerror:
 	nop
 noarg:
 	ret
+	.end __wait
 
 weak_alias (__wait, wait)