From 54ec52e4a45dd0fedfc6fd0b6ddd233f996e9e37 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Tue, 8 Oct 2002 13:01:02 +0000
Subject: 2002-10-07	Joel Sherrill <joel@OARcorp.com>

	* libc/machine/hppa/DEFS.h, libc/machine/hppa/pcc_prefix.s,
	libc/machine/hppa/setjmp.S, libc/machine/hppa/DEFS.h: Make this
	compile with current GNU tools.
---
 newlib/ChangeLog                      |  6 +++++
 newlib/libc/machine/hppa/DEFS.h       | 42 +++++++++++++++++++++++++----------
 newlib/libc/machine/hppa/pcc_prefix.s |  4 ++++
 newlib/libc/machine/hppa/setjmp.S     |  7 ++++--
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f8a307d7e..d82ca5d59 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-07	Joel Sherrill <joel@OARcorp.com>
+
+	* libc/machine/hppa/DEFS.h, libc/machine/hppa/pcc_prefix.s,
+	libc/machine/hppa/setjmp.S, libc/machine/hppa/DEFS.h: Make this
+	compile with current GNU tools.
+
 2002-10-07  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* Makefile.am: Add EXTRA_DIRS to allow future dependencies on
diff --git a/newlib/libc/machine/hppa/DEFS.h b/newlib/libc/machine/hppa/DEFS.h
index 9c0aa1e06..a8b19b5b4 100644
--- a/newlib/libc/machine/hppa/DEFS.h
+++ b/newlib/libc/machine/hppa/DEFS.h
@@ -24,6 +24,29 @@
 #define	EXIT(Name)	BLANK	M_EXIT	(Name,PROF_/**/Name)
 #define	EXITC(Name)	BLANK	M_EXITC	(Name,PROF_/**/Name)
 
+#if 0
+#define TEXT_SEGMENT \
+        .SPACE  $TEXT$          !\
+        .SUBSPA $CODE$
+#define RO_SEGMENT \
+        .SPACE  $TEXT$          !\
+        .SUBSPA $lit$
+#define DATA_SEGMENT \
+        .SPACE  $PRIVATE$          !\
+        .SUBSPA $data$
+#define BSS_SEGMENT \
+        .SPACE  $PRIVATE$          !\
+        .SUBSPA $bss$
+#else
+#define TEXT_SEGMENT .text
+#define RO_SEGMENT .rodata
+#define DATA_SEGMENT .data
+#define BSS_SEGMENT .bss
+#endif
+
+
+
+
 #ifdef PROF
 
 ;
@@ -36,8 +59,7 @@
 ; profile data).
 ;
 #define M_ENTRY(name,prof)	\
-	.SPACE	$TEXT$		!\
-	.SUBSPA	$CODE$		!\
+	TEXT_SEGMENT		!\
         .label name		!\
         .PROC			!\
 	.CALLINFO CALLER,SAVE_RP !\
@@ -63,8 +85,7 @@
 
 
 #define M_ENTRYC(name,prof)	\
-	.SPACE	$TEXT$		!\
-	.SUBSPA	$CODE$		!\
+	TEXT_SEGMENT		!\
         .label name		!\
         .PROC			!\
 	.CALLINFO CALLER,SAVE_RP !\
@@ -97,8 +118,7 @@
 	.EXIT			!\
         .PROCEND		!\
         .EXPORT	name,ENTRY	!\
-	.SPACE	$PRIVATE$	!\
-	.SUBSPA	$DATA$		!\
+	DATA_SEGMENT		!\
 	.label prof		!\
 	.WORD	0		!\
 	.IMPORT	$global$,DATA	!\
@@ -110,8 +130,7 @@
 	.EXIT			!\
         .PROCEND		!\
         .EXPORT	name,ENTRY	!\
-	.SPACE	$PRIVATE$	!\
-	.SUBSPA	$DATA$		!\
+	DATA_SEGMENT		!\
 	.label prof		!\
 	.WORD	0		!\
 	.IMPORT	$global$,DATA	!\
@@ -120,16 +139,14 @@
 #else	/* NOT profiling */
 
 #define M_ENTRY(name,prof)	\
-        .SPACE $TEXT$	!\
-        .SUBSPA $CODE$	!\
+	TEXT_SEGMENT		!\
         .label name	!\
         .PROC		!\
         .CALLINFO	!\
 	.ENTRY
 
 #define M_ENTRYC(name,prof)	\
-        .SPACE	$TEXT$	!\
-        .SUBSPA	$CODE$	!\
+	TEXT_SEGMENT		!\
         .label name	!\
         .PROC		!\
         .CALLINFO CALLER,SAVE_RP	!\
@@ -158,3 +175,4 @@
 
 
 #endif
+
diff --git a/newlib/libc/machine/hppa/pcc_prefix.s b/newlib/libc/machine/hppa/pcc_prefix.s
index 24d5254d9..61bf9c9e3 100644
--- a/newlib/libc/machine/hppa/pcc_prefix.s
+++ b/newlib/libc/machine/hppa/pcc_prefix.s
@@ -334,6 +334,7 @@ sarg: .equ	sr1	; argument
 ; Software Architecture Pseudo Registers
 previous_sp: .equ	64	; old stack pointer (locates previous frame)
 
+#if 0
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ; Standard space and subspace definitions.  version A.08.06
@@ -385,5 +386,8 @@ previous_sp: .equ	64	; old stack pointer (locates previous frame)
 ; message to be brought in from libgloss/hp-milli.s
         .space $PRIVATE$
         .subspa $DATA$
+#else
+	.data
+#endif
         .import ___hp_free_copyright,data
 L$copyright .word ___hp_free_copyright
diff --git a/newlib/libc/machine/hppa/setjmp.S b/newlib/libc/machine/hppa/setjmp.S
index 6f3668e92..ebc5f8117 100644
--- a/newlib/libc/machine/hppa/setjmp.S
+++ b/newlib/libc/machine/hppa/setjmp.S
@@ -18,6 +18,9 @@
    library.  Maybe we'll have to have -msoft-float trigger something
    like -DSOFT_FLOAT if this issue ever arises.  */
 
+#include "DEFS.h"
+
+#if 0
 	.SPACE $PRIVATE$
 	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
 	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
@@ -27,8 +30,8 @@
 	.IMPORT $global$,DATA
 	.IMPORT $$dyncall,MILLICODE
 ; gcc_compiled.:
-	.SPACE $TEXT$
-	.SUBSPA $CODE$
+#endif
+	TEXT_SEGMENT
 
 	.align 4
 	.EXPORT setjmp,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
-- 
cgit v1.2.3