Makefile.in (misc.o): Add missing $(srcdir) prefix and add optabs.h dependency.

2001-12-01  Graham Stott  <grahams@redhat.com>

	* Makefile.in (misc.o): Add missing $(srcdir) prefix
	and add optabs.h dependency.

	* misc.c: Include optabs.h
	(gnat_tree_code_type): Make static and const.
	(gnat_tree_code_length): Likewise.
	(gnat_tree_code_name): Likewise.
	(update_setjmp_buf): Obtain operands mode from insn_data.

From-SVN: r47503

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e0bcba8..25f2598 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-01  Graham Stott  <grahams@redhat.com>
+
+       * Makefile.in (misc.o): Add missing $(srcdir) prefix
+       and add optabs.h dependency.
+
+       * misc.c: Include optabs.h
+       (gnat_tree_code_type): Make static and const.
+       (gnat_tree_code_length): Likewise.
+       (gnat_tree_code_name): Likewise.
+       (update_setjmp_buf): Obtain operands mode from insn_data.
+
 2001-11-29  Richard Henderson  <rth@redhat.com>
 
        * init.c: Remove obsolete dwarf2 frame.h section.

diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index d5c3d8e..8a10b22 100644 (file)
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -2585,9 +2585,9 @@ decl.o : decl.c $(CONFIG_H) $(TREE_H) $(srcdir)/../flags.h \
 misc.o : misc.c $(CONFIG_H) $(TREE_H) $(RTL_H) $(srcdir)/../expr.h \
    ../insn-codes.h ../insn-flags.h ../insn-config.h $(srcdir)/../recog.h \
    $(srcdir)/../flags.h $(srcdir)/../diagnostic.h $(srcdir)/../output.h \
-   $(srcdir)/../except.h ../tm_p.h ../langhooks.h ada.h types.h atree.h \
-   nlists.h elists.h sinfo.h einfo.h namet.h stringt.h uintp.h fe.h \
-   $(ADA_TREE_H) gigi.h ../langhooks-def.h
+   $(srcdir)/../except.h ../tm_p.h  $(srcdir)/../langhooks.h ada.h types.h \
+   atree.h nlists.h elists.h sinfo.h einfo.h namet.h stringt.h uintp.h fe.h \
+   $(ADA_TREE_H) gigi.h $(srcdir)/../langhooks-def.h $(srcdir)/../optabs.h
 
 targtyps.o : targtyps.c $(CONFIG_H) ada.h types.h atree.h nlists.h elists.h \
    uintp.h sinfo.h einfo.h namet.h snames.h stringt.h urealp.h fe.h \

diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c
index f3c9cbc..cba0be5 100644 (file)
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                           C Implementation File                          *
  *                                                                          *
- *                             $Revision: 1.13 $
+ *                             $Revision: 1.14 $
  *                                                                          *
  *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
  *                                                                          *
@@ -47,6 +47,7 @@
 #include "flags.h"
 #include "insn-flags.h"
 #include "insn-config.h"
+#include "optabs.h"
 #include "recog.h"
 #include "toplev.h"
 #include "output.h"
@@ -81,7 +82,7 @@ extern char **save_argv;
 
 #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
 
-char gnat_tree_code_type[] = {
+static char const gnat_tree_code_type[] = {
   'x',
 #include "ada-tree.def"
 };
@@ -93,7 +94,7 @@ char gnat_tree_code_type[] = {
 
 #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
 
-int gnat_tree_code_length[] = {
+static int const gnat_tree_code_length[] = {
   0,
 #include "ada-tree.def"
 };
@@ -103,7 +104,7 @@ int gnat_tree_code_length[] = {
    Used for printing out the tree and error messages.  */
 #define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
 
-const char *gnat_tree_code_name[] = {
+static const char *gnat_tree_code_name[] = {
   "@@dummy",
 #include "ada-tree.def"
 };
@@ -743,8 +744,9 @@ update_setjmp_buf (buf)
 
 #ifdef HAVE_save_stack_nonlocal
   if (HAVE_save_stack_nonlocal)
-    sa_mode = insn_operand_mode[(int) CODE_FOR_save_stack_nonlocal][0];
+    sa_mode = insn_data [(int) CODE_FOR_save_stack_nonlocal].operand[0].mode;
 #endif
+
 #ifdef STACK_SAVEAREA_MODE
   sa_mode = STACK_SAVEAREA_MODE (SAVE_NONLOCAL);
 #endif