pa-linux.h (DWARF2_UNWIND_INFO): Delete define.

	* pa-linux.h (DWARF2_UNWIND_INFO): Delete define.
	* pa.h (EH_RETURN_DATA_REGNO): Revise TARGET_64BIT and correct
	numbering.

From-SVN: r55563

gcc/ChangeLog

 2002-07-18  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
+	* pa-linux.h (DWARF2_UNWIND_INFO): Delete define.
+	* pa.h (EH_RETURN_DATA_REGNO): Revise TARGET_64BIT and correct
+	numbering.
+
+2002-07-18  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
 	* pa.c (output_deferred_plabels): Remove unused millicode enum mulU.
 
 2002-07-18  Richard Henderson  <rth@redhat.com>

gcc/config/pa/pa-linux.h

@@ -22,7 +22,6 @@ Boston, MA 02111-1307, USA.  */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 #define DWARF2_ASM_LINE_DEBUG_INFO 1
-#define DWARF2_UNWIND_INFO 1
 
 /* A C expression whose value is RTL representing the location of the
    incoming return address at the beginning of any function, before the

gcc/config/pa/pa.h

@@ -515,11 +515,8 @@ extern struct rtx_def *hppa_pic_save_rtx PARAMS ((void));
 #define STRUCT_VALUE_REGNUM 28
 
 /* Describe how we implement __builtin_eh_return.  */
-/* FIXME: What's a good choice for the EH data registers on TARGET_64BIT?  */
 #define EH_RETURN_DATA_REGNO(N)	\
-  (TARGET_64BIT								\
-   ? ((N) < 4 ? (N) + 4 : INVALID_REGNUM)				\
-   : ((N) < 3 ? (N) + 20 : (N) == 4 ? 31 : INVALID_REGNUM))
+  ((N) < 3 ? (N) + 20 : (N) == 3 ? 31 : INVALID_REGNUM)
 #define EH_RETURN_STACKADJ_RTX	gen_rtx_REG (Pmode, 29)
 #define EH_RETURN_HANDLER_RTX \
   gen_rtx_MEM (word_mode,						\