PR 2591: patch

[Alexandre Oliva <aoliva at redhat dot com>]

Some of the IA 64 EH changes installed in the 3.0 branch depended on a
patch that had been installed on a patch you had installed on
2001-03-18, copied below.  Because the patch is missing in the branch,
it won't build for --target=sh-elf.  An alternative to installing your
patch is installing the smaller patch posted below it.  Which one
should I install in the branch?

Index: gcc/ChangeLog
from  Richard Henderson  <rth@redhat.com>

	* defaults.h (ACCUMULATE_OUTGOING_ARGS, PUSH_ARGS): Move from ...
	* calls.c: ... here.
	* combine.c, expr.c, final.c, function.c toplev.c: Don't provide
	defaults for them here.

Index: gcc/calls.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/calls.c,v
retrieving revision 1.175.4.6
diff -u -p -r1.175.4.6 calls.c
--- gcc/calls.c 2001/05/13 07:09:52 1.175.4.6
+++ gcc/calls.c 2001/06/08 09:24:52
@@ -33,19 +33,6 @@ Boston, MA 02111-1307, USA.  */
 #include "timevar.h"
 #include "sbitmap.h"
 
-#ifndef ACCUMULATE_OUTGOING_ARGS
-#define ACCUMULATE_OUTGOING_ARGS 0
-#endif
-
-/* Supply a default definition for PUSH_ARGS.  */
-#ifndef PUSH_ARGS
-#ifdef PUSH_ROUNDING
-#define PUSH_ARGS	!ACCUMULATE_OUTGOING_ARGS
-#else
-#define PUSH_ARGS	0
-#endif
-#endif
-
 #if !defined FUNCTION_OK_FOR_SIBCALL
 #define FUNCTION_OK_FOR_SIBCALL(DECL) 1
 #endif
Index: gcc/combine.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/combine.c,v
retrieving revision 1.183.2.5
diff -u -p -r1.183.2.5 combine.c
--- gcc/combine.c 2001/05/27 10:31:42 1.183.2.5
+++ gcc/combine.c 2001/06/08 09:24:52
@@ -91,19 +91,6 @@ Boston, MA 02111-1307, USA.  */
 #include "real.h"
 #include "toplev.h"
 
-#ifndef ACCUMULATE_OUTGOING_ARGS
-#define ACCUMULATE_OUTGOING_ARGS 0
-#endif
-
-/* Supply a default definition for PUSH_ARGS.  */
-#ifndef PUSH_ARGS
-#ifdef PUSH_ROUNDING
-#define PUSH_ARGS	!ACCUMULATE_OUTGOING_ARGS
-#else
-#define PUSH_ARGS	0
-#endif
-#endif
-
 /* It is not safe to use ordinary gen_lowpart in combine.
    Use gen_lowpart_for_combine instead.  See comments there.  */
 #define gen_lowpart dont_use_gen_lowpart_you_dummy
Index: gcc/defaults.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/defaults.h,v
retrieving revision 1.31.2.5
diff -u -p -r1.31.2.5 defaults.h
--- gcc/defaults.h 2001/05/19 17:55:47 1.31.2.5
+++ gcc/defaults.h 2001/06/08 09:24:53
@@ -326,5 +326,18 @@ do {								\
 #define TARGET_ALLOWS_PROFILING_WITHOUT_FRAME_POINTER true
 #endif
 
+#ifndef ACCUMULATE_OUTGOING_ARGS
+#define ACCUMULATE_OUTGOING_ARGS 0
+#endif
+
+/* Supply a default definition for PUSH_ARGS.  */
+#ifndef PUSH_ARGS
+#ifdef PUSH_ROUNDING
+#define PUSH_ARGS	!ACCUMULATE_OUTGOING_ARGS
+#else
+#define PUSH_ARGS	0
+#endif
+#endif
+
 #endif  /* GCC_DEFAULTS_H */
 
Index: gcc/expr.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/expr.c,v
retrieving revision 1.295.2.13
diff -u -p -r1.295.2.13 expr.c
--- gcc/expr.c 2001/05/27 10:31:44 1.295.2.13
+++ gcc/expr.c 2001/06/08 09:24:54
@@ -42,19 +42,6 @@ Boston, MA 02111-1307, USA.  */
 #include "intl.h"
 #include "tm_p.h"
 
-#ifndef ACCUMULATE_OUTGOING_ARGS
-#define ACCUMULATE_OUTGOING_ARGS 0
-#endif
-
-/* Supply a default definition for PUSH_ARGS.  */
-#ifndef PUSH_ARGS
-#ifdef PUSH_ROUNDING
-#define PUSH_ARGS	!ACCUMULATE_OUTGOING_ARGS
-#else
-#define PUSH_ARGS	0
-#endif
-#endif
-
 /* Decide whether a function's arguments should be processed
    from first to last or from last to first.
 
Index: gcc/final.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/final.c,v
retrieving revision 1.158.2.5
diff -u -p -r1.158.2.5 final.c
--- gcc/final.c 2001/05/13 07:09:54 1.158.2.5
+++ gcc/final.c 2001/06/08 09:24:54
@@ -77,10 +77,6 @@ Boston, MA 02111-1307, USA.  */
 
 #endif /* DBX_DEBUGGING_INFO || XCOFF_DEBUGGING_INFO */
 
-#ifndef ACCUMULATE_OUTGOING_ARGS
-#define ACCUMULATE_OUTGOING_ARGS 0
-#endif
-
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"
 #endif
Index: gcc/function.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/function.c,v
retrieving revision 1.250.2.11
diff -u -p -r1.250.2.11 function.c
--- gcc/function.c 2001/06/05 06:47:33 1.250.2.11
+++ gcc/function.c 2001/06/08 09:24:55
@@ -58,10 +58,6 @@ Boston, MA 02111-1307, USA.  */
 #include "ggc.h"
 #include "tm_p.h"
 
-#ifndef ACCUMULATE_OUTGOING_ARGS
-#define ACCUMULATE_OUTGOING_ARGS 0
-#endif
-
 #ifndef TRAMPOLINE_ALIGNMENT
 #define TRAMPOLINE_ALIGNMENT FUNCTION_BOUNDARY
 #endif
Index: gcc/toplev.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/toplev.c,v
retrieving revision 1.420.2.25
diff -u -p -r1.420.2.25 toplev.c
--- gcc/toplev.c 2001/06/05 20:39:11 1.420.2.25
+++ gcc/toplev.c 2001/06/08 09:24:55
@@ -65,10 +65,6 @@ Boston, MA 02111-1307, USA.  */
 #include "params.h"
 #include "dwarf2asm.h"
 
-#ifndef ACCUMULATE_OUTGOING_ARGS
-#define ACCUMULATE_OUTGOING_ARGS 0
-#endif
-
 #ifdef DWARF_DEBUGGING_INFO
 #include "dwarfout.h"
 #endif
Index: gcc/dwarf2out.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/dwarf2out.c,v
retrieving revision 1.242.2.20
diff -u -p -r1.242.2.20 dwarf2out.c
--- gcc/dwarf2out.c 2001/06/05 21:07:46 1.242.2.20
+++ gcc/dwarf2out.c 2001/06/08 09:23:25
@@ -360,6 +360,10 @@ expand_builtin_dwarf_fp_regnum ()
 #define INCOMING_FRAME_SP_OFFSET 0
 #endif
 
+#ifndef ACCUMULATE_OUTGOING_ARGS
+#define ACCUMULATE_OUTGOING_ARGS 0
+#endif
+
 /* Return a pointer to a copy of the section string name S with all
    attributes stripped off, and an asterisk prepended (for assemble_name).  */
 

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist    *Please* write to mailing lists, not to me