Fixes for treelang, mainly provide fake definition of rtx for parse.y includes.

From-SVN: r56248

diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index ab7d580..91c133a 100644 (file)
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -2,6 +2,13 @@
 
        * treelang.c: Remove cpp_post_options.
 
+2002-08-13  Tim Josling  <tej@melbpc.org.au>
+
+       * parse.y: Provide dummy definition of rtx for use by config.h.
+       * Make-lang.in (treetree.o): Remove dependency on non-existent
+       gt-treelang-treelang.h.
+       (gt-treelang-treelang.h): Remove.
+
 2002-08-08  Nathan Sidwell  <nathan@codesourcery.com>
 
        * treelang/Make-lang.in (treelang.mostlyclean): Remove coverage files.

diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in
index 7c676e0..a133767 100644 (file)
--- a/gcc/treelang/Make-lang.in
+++ b/gcc/treelang/Make-lang.in
@@ -92,7 +92,7 @@ tree1$(exeext): treelang/tree1.o treelang/treetree.o treelang/lex.o treelang/par
 
 treelang/tree1.o: $(srcdir)/treelang/tree1.c $(srcdir)/treelang/treelang.h \
        $(srcdir)/treelang/parse.h $(CONFIG_H) \
-       gt-treelang-tree1.h gt-treelang-treelang.h gtype-treelang.h
+       gt-treelang-tree1.h gtype-treelang.h
        $(CC) -o $@ -c $(ALL_CFLAGS) $(INCLUDES) $< 
 
 treelang/treetree.o: $(srcdir)/treelang/treetree.c $(srcdir)/treelang/treetree.h \
@@ -119,7 +119,7 @@ $(srcdir)/treelang/parse.c $(srcdir)/treelang/parse.h: $(srcdir)/treelang/parse.
        --output=$(srcdir)/treelang/parse.c --defines
 # -v
 
-gt-treelang-tree1.h gt-treelang-treelang.h gtype-treelang.h : s-gtype; @true
+gt-treelang-tree1.h gtype-treelang.h : s-gtype; @true
 
 #\f
 # Build hooks:
@@ -164,6 +164,7 @@ treelang.install.common.done:  installdirs treelang.done
           if [ -f $$name ] ; then \
            name2="`echo \`basename $$name\` | sed -e '$(program_transform_name)' `"; \
            rm -f $(bindir)/$$name2$(exeext); \
+           echo $(INSTALL_PROGRAM) $$name$(exeext) $(bindir)/$$name2$(exeext); \
            $(INSTALL_PROGRAM) $$name$(exeext) $(bindir)/$$name2$(exeext); \
            chmod a+x $(bindir)/$$name2$(exeext); \
          fi ; \

diff --git a/gcc/treelang/parse.y b/gcc/treelang/parse.y
index 0588e21..7d7400f 100644 (file)
--- a/gcc/treelang/parse.y
+++ b/gcc/treelang/parse.y
@@ -42,9 +42,12 @@
 
    */
 
+/* Undefine IN_GCC so malloc etc work. The alternative is to redefine
+   the out of stack routine in bison.  */
 #undef IN_GCC
-
+/* Front ends should not have to see these, but config.h needs everything.  */
 typedef void *tree;
+typedef void *rtx;
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -804,7 +807,7 @@ init_opt:
 }
 |init {
   /* Nothing to do.  */
-}
+};
 
 init:
 ASSIGN init_element {

diff --git a/gcc/treelang/treetree.c b/gcc/treelang/treetree.c
index 573c273..5159d34 100644 (file)
--- a/gcc/treelang/treetree.c
+++ b/gcc/treelang/treetree.c
@@ -259,7 +259,7 @@ tree_code_create_function_prototype (unsigned char* chars,
       type_node = get_type_for_numeric_type (parm->type);
       type_list = tree_cons (NULL_TREE, type_node, type_list);
     }
-  /* Last parm if null indicates fixed length list (as opposed to
+  /* Last parm if void indicates fixed length list (as opposed to
      printf style va_* list).  */
   type_list = tree_cons (NULL_TREE, void_type_node, type_list);
   /* The back end needs them in reverse order.  */
@@ -855,6 +855,11 @@ tree_ggc_storage_always_used (void * m)
 int
 maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
                       tree rhs ATTRIBUTE_UNUSED,
+                      int reflexive ATTRIBUTE_UNUSED);
+
+int
+maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
+                      tree rhs ATTRIBUTE_UNUSED,
                       int reflexive ATTRIBUTE_UNUSED)
 {
   return -1;
@@ -881,11 +886,24 @@ check_function_format (int *status ATTRIBUTE_UNUSED,
 /* Tell the c code we are not objective C.  */
 
 tree
+maybe_building_objc_message_expr (void);
+
+tree
 maybe_building_objc_message_expr ()
 {
   return 0;
 }
 
+/* Tell the c code we are not objective C.  */
+
+int
+objc_comptypes (tree lhs ATTRIBUTE_UNUSED, 
+                tree rhs ATTRIBUTE_UNUSED, 
+                int reflexive ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
 /* Should not be called for treelang.   */
 
 tree
@@ -955,7 +973,7 @@ cpp_create_reader (enum c_lang lang ATTRIBUTE_UNUSED)
 /* Should not be called for treelang.   */
 
 void
-cpp_preprocess_file (cpp_reader *pfile ATTRIBUTE_UNUSED)
+cpp_post_options (cpp_reader *pfile ATTRIBUTE_UNUSED)
 {
   abort ();
 }
@@ -980,8 +998,8 @@ init_pragma ()
 
 /* Should not be called for treelang.   */
 
-void
-cpp_finish (cpp_reader *pfile ATTRIBUTE_UNUSED)
+int
+cpp_finish (cpp_reader *pfile ATTRIBUTE_UNUSED, FILE *f ATTRIBUTE_UNUSED)
 {
   abort ();
 }
@@ -1048,11 +1066,35 @@ set_Wformat (int setting ATTRIBUTE_UNUSED)
 /* Should not be called for treelang.   */
 
 void
+maybe_objc_check_decl (tree decl ATTRIBUTE_UNUSED);
+
+void
 maybe_objc_check_decl (tree decl ATTRIBUTE_UNUSED)
 {
   abort ();
 }
 
+/* Used for objective C.  */
+
+void
+objc_check_decl (tree decl ATTRIBUTE_UNUSED);
+
+void
+objc_check_decl (tree decl ATTRIBUTE_UNUSED)
+{
+}
+
+/* Tell the c code we are not objective C.  */
+
+tree
+objc_message_selector (void);
+
+tree
+objc_message_selector ()
+{
+  return 0;
+}
+
 /* Should not be called for treelang.   */
 
 void