Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / c-lang.c

diff --git a/gcc/c-lang.c b/gcc/c-lang.c
index 7d256ab..92b9c6e 100644 (file)
--- a/gcc/c-lang.c
+++ b/gcc/c-lang.c
@@ -22,6 +22,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "c-tree.h"
 #include "c-common.h"
@@ -29,21 +31,20 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "langhooks.h"
 #include "langhooks-def.h"
 
-static const char *c_init PARAMS ((const char *));
-static void c_init_options PARAMS ((void));
+static int c_init_options PARAMS ((void));
 
 /* ### When changing hooks, consider if ObjC needs changing too!! ### */
 
 #undef LANG_HOOKS_NAME
 #define LANG_HOOKS_NAME "GNU C"
 #undef LANG_HOOKS_INIT
-#define LANG_HOOKS_INIT c_init
+#define LANG_HOOKS_INIT c_objc_common_init
 #undef LANG_HOOKS_FINISH
 #define LANG_HOOKS_FINISH c_common_finish
 #undef LANG_HOOKS_INIT_OPTIONS
 #define LANG_HOOKS_INIT_OPTIONS c_init_options
-#undef LANG_HOOKS_DECODE_OPTION
-#define LANG_HOOKS_DECODE_OPTION c_common_decode_option
+#undef LANG_HOOKS_HANDLE_OPTION
+#define LANG_HOOKS_HANDLE_OPTION c_common_handle_option
 #undef LANG_HOOKS_POST_OPTIONS
 #define LANG_HOOKS_POST_OPTIONS c_common_post_options
 #undef LANG_HOOKS_GET_ALIAS_SET
@@ -98,6 +99,9 @@ static void c_init_options PARAMS ((void));
 #undef LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN
 #define LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN c_dump_tree
 
+#undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION
+#define LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION c_expand_body
+
 #undef LANG_HOOKS_TYPE_FOR_MODE
 #define LANG_HOOKS_TYPE_FOR_MODE c_common_type_for_mode
 #undef LANG_HOOKS_TYPE_FOR_SIZE
@@ -153,17 +157,10 @@ const char *const tree_code_name[] = {
 };
 #undef DEFTREECODE
 
-static void
+static int
 c_init_options ()
 {
-  c_common_init_options (clk_c);
-}
-
-static const char *
-c_init (filename)
-     const char *filename;
-{
-  return c_objc_common_init (filename);
+  return c_common_init_options (clk_c);
 }
 
 /* Used by c-lex.c, but only for objc.  */
@@ -182,6 +179,13 @@ is_class_name (arg)
   return 0;
 }
 
+tree
+objc_is_id (arg)
+    tree arg ATTRIBUTE_UNUSED;
+{
+  return 0;
+}
+
 void
 objc_check_decl (decl)
      tree decl ATTRIBUTE_UNUSED;
@@ -203,12 +207,6 @@ objc_message_selector ()
   return 0;
 }
 
-int
-recognize_objc_keyword ()
-{
-  return 0;
-}
-
 /* Used by c-typeck.c (build_external_ref), but only for objc.  */
 
 tree