From d190aa05f79a0992e6459eaae78db4ea347615fa Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Sat, 16 Jan 1999 07:58:33 +0000
Subject: clean up subspaces somewhat

---
 sys/arch/hppa/include/asm.h | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'sys/arch/hppa/include')

diff --git a/sys/arch/hppa/include/asm.h b/sys/arch/hppa/include/asm.h
index 107f2021452..79c31972bdb 100644
--- a/sys/arch/hppa/include/asm.h
+++ b/sys/arch/hppa/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.5 1998/12/23 17:49:55 mickey Exp $	*/
+/*	$OpenBSD: asm.h,v 1.6 1999/01/16 07:58:32 mickey Exp $	*/
 
 /* 
  * Copyright (c) 1990,1991,1994 The University of Utah and
@@ -25,9 +25,6 @@
 #ifndef _MACHINE_ASM_H_
 #define _MACHINE_ASM_H_
 
-/* this is to shutup binutils */
-#define	BFD_SUBSPA_BUG
-
 /*
  *	hppa assembler definitions
  */
@@ -284,30 +281,25 @@ tf4	.reg	%fr8
  * Standard space and subspace definitions.
  */
 	.SPACE	$TEXT$,0
-#ifndef	BFD_SUBSPA_BUG
-	.subspa $FIRST$,	QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=4
+/*	.subspa $FIRST$,	QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=4 */
 	.subspa $MILLICODE$,	QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=8
 	.subspa $LIT$,		QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=16
-	.subspa $CODE$,		QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=24
-	.subspa	$UNWIND$MILLICODE$,QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=64
+	.subspa $CODE$,		QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=24,CODE_ONLY
+/*	.subspa	$UNWIND$MILLICODE$,QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=64
 	.subspa	$UNWIND$,	QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=72
 	.subspa	$RECOVER$,	QUAD=0,ALIGN=4,ACCESS=0x2c,SORT=80
-#endif
+*/
 
 /*
  * additional code subspaces should have ALIGN=8 for an interspace BV
  */
 	.SPACE $PRIVATE$,1
-#ifndef	BFD_SUBSPA_BUG
-	.subspa $GLOBAL$,	QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=8
-	.subspa $SHORTDATA$,	QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=16
+/*	.subspa $GLOBAL$,	QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=8 */
+/*	.subspa $SHORTDATA$,	QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=16 */
 	.subspa $DATA$,		QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=24
-#endif
 	.import $global$
-#ifndef	BFD_SUBSPA_BUG
-	.subspa	$PFA_COUNTER$,	QUAD=1,ALIGN=4,ACCESS=0x1f,SORT=72
+/*	.subspa	$PFA_COUNTER$,	QUAD=1,ALIGN=4,ACCESS=0x1f,SORT=72 */
 	.subspa $BSS$,		QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=80,ZERO
-#endif
 
 
 #ifdef PROF
@@ -327,7 +319,7 @@ tf4	.reg	%fr8
 	.export	x,entry		!\
 	.label	x               !\
 	.proc			!\
-	.callinfo no_calls	!\
+	.callinfo calls		!\
 	.entry			!\
 	_PROF_PROLOGUE
 
-- 
cgit v1.2.3