diff --git a/assembly/mips/support.lisp b/assembly/mips/support.lisp
index 6d5884b79238640b87944adb10aa2fec144e8c6a..1d97d1cf7b9aa98b564b16d07526d0365b9ddf9e 100644
--- a/assembly/mips/support.lisp
+++ b/assembly/mips/support.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/support.lisp,v 1.6 1991/07/14 04:12:20 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/support.lisp,v 1.7 1992/05/21 02:30:24 wlott Exp $
 ;;;
 ;;; This file contains the machine specific support routines needed by
 ;;; the file assembler.
@@ -31,12 +31,13 @@
 	    (when cur-nfp
 	      (store-stack-tn ,nfp-save cur-nfp))
 	    (inst compute-lra-from-code ,lra code-tn lra-label ,temp)
+	    (note-this-location ,vop :call-site)
 	    (inst j (make-fixup ',name :assembly-routine))
 	    (inst nop)
 	    (emit-return-pc lra-label)
-	    (note-this-location ,vop :unknown-return)
 	    (move csp-tn ocfp-tn)
 	    (inst nop)
+	    (note-this-location ,vop :single-value-return)
 	    (inst entry-point)
 	    (inst compute-code-from-lra code-tn code-tn
 		  lra-label ,temp)
diff --git a/assembly/sparc/support.lisp b/assembly/sparc/support.lisp
index 162ef42d920d02e0c5ebe6fbfabaac21f3aa1226..24c3f224df2100c2db9ba7a3b2861a22ab05d217 100644
--- a/assembly/sparc/support.lisp
+++ b/assembly/sparc/support.lisp
@@ -1,16 +1,15 @@
 ;;; -*- Package: SPARC -*-
 ;;;
 ;;; **********************************************************************
-;;; This code was written as part of the Spice Lisp project at
-;;; Carnegie-Mellon University, and has been placed in the public domain.
-;;; If you want to use this code or any part of Spice Lisp, please contact
-;;; Scott Fahlman (FAHLMAN@CMUC). 
-;;; **********************************************************************
+;;; This code was written as part of the CMU Common Lisp project at
+;;; Carnegie Mellon University, and has been placed in the public domain.
+;;; If you want to use this code or any part of CMU Common Lisp, please contact
+;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/support.lisp,v 1.3 1992/03/06 11:03:58 wlott Exp $
+(ext:file-comment
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/sparc/support.lisp,v 1.4 1992/05/21 02:31:59 wlott Exp $")
 ;;;
-;;; This file contains the machine specific support routines needed by
-;;; the file assembler.
+;;; **********************************************************************
 ;;;
 (in-package "SPARC")
 
@@ -36,12 +35,13 @@
 	    (when cur-nfp
 	      (store-stack-tn ,nfp-save cur-nfp))
 	    (inst compute-lra-from-code ,lra code-tn lra-label ,temp)
+	    (note-this-location ,vop :call-site)
 	    (inst ji ,temp (make-fixup ',name :assembly-routine))
 	    (inst nop)
 	    (emit-return-pc lra-label)
-	    (note-this-location ,vop :unknown-return)
 	    (move csp-tn ocfp-tn)
 	    (inst nop)
+	    (note-this-location ,vop :single-value-return)
 	    (inst compute-code-from-lra code-tn code-tn
 		  lra-label ,temp)
 	    (when cur-nfp