ada/

        * Makefile.in (misc.o): Depend on langhooks.h.
        * misc.c: Include it.
        (LANG_HOOKS_INIT, LANG_HOOKS_INIT_OPTIONS): New.
        (LANG_HOOKS_DECODE_OPTION): New.
        (lang_hooks): Use LANG_HOOKS_INITIALIZER.
f/
        * Make-lang.in (f/com.o): Depend on langhooks.h.
        * com.c: Include it.
        (LANG_HOOKS_INIT, LANG_HOOKS_FINISH): New.
        (LANG_HOOKS_INIT_OPTIONS, LANG_HOOKS_DECODE_OPTION): New.
        (lang_hooks): Use LANG_HOOKS_INITIALIZER.
java/
        * Make-lang.in (java/lang.o): Depend on langhooks.h.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46318 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 48 insertions, 13 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1001d667418..035d94c326b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-17  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (misc.o): Depend on langhooks.h.
+	* misc.c: Include it.
+	(LANG_HOOKS_INIT, LANG_HOOKS_INIT_OPTIONS): New.
+	(LANG_HOOKS_DECODE_OPTION): New.
+	(lang_hooks): Use LANG_HOOKS_INITIALIZER.
+
 2001-10-16  Florian Weimer  <fw@deneb.enyo.de>
 
 	* trans.c (tree_transform): Adjust to recent change in
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index df2a68c1d7e..a6521422990 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -2585,8 +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 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)/../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
 
 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 d1982ececc7..df99c0a1b8f 100644
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                           C Implementation File                          *
  *                                                                          *
- *                             $Revision$
+ *                             $Revision: 1.4 $
  *                                                                          *
  *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
  *                                                                          *
@@ -52,6 +52,7 @@
 #include "output.h"
 #include "except.h"
 #include "tm_p.h"
+#include "langhooks.h"
 
 #include "ada.h"
 #include "types.h"
@@ -108,9 +109,15 @@ const char *gnat_tree_code_name[] = {
 #undef DEFTREECODE
 
 /* Structure giving our language-specific hooks.  */
-struct lang_hooks lang_hooks = {gnat_init, 0, gnat_init_options,
-				gnat_decode_option, 0,
-			        {0, 0, 0, 0, 0, 0, 0, 0}};
+
+#undef  LANG_HOOKS_INIT
+#define LANG_HOOKS_INIT			gnat_init
+#undef  LANG_HOOKS_INIT_OPTIONS
+#define LANG_HOOKS_INIT_OPTIONS		gnat_init_options
+#undef  LANG_HOOKS_DECODE_OPTION
+#define LANG_HOOKS_DECODE_OPTION	gnat_decode_option
+
+struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
 
 /* gnat standard argc argv */
 
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 74288f3612d..f1234e3673a 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-17  Richard Henderson  <rth@redhat.com>
+
+	* Make-lang.in (f/com.o): Depend on langhooks.h.
+	* com.c: Include it.
+	(LANG_HOOKS_INIT, LANG_HOOKS_FINISH): New.
+	(LANG_HOOKS_INIT_OPTIONS, LANG_HOOKS_DECODE_OPTION): New.
+	(lang_hooks): Use LANG_HOOKS_INITIALIZER.
+
 Sun Oct  7 12:27:54 2001  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* bad.c (_ffebad_message_, ffebad_messages_): Const-ify.
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index df0a4d13779..194d21f7af9 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -421,7 +421,8 @@ f/com.o: f/com.c f/proj.h $(CONFIG_H) $(SYSTEM_H) flags.h $(RTL_H) $(TREE_H) \
  f/malloc.h f/info.h f/info-b.def f/info-k.def f/info-w.def f/target.h f/bad.h \
  f/bad.def f/where.h glimits.h f/top.h f/lex.h f/type.h f/intrin.h \
  f/intrin.def f/lab.h f/symbol.h f/symbol.def f/equiv.h f/storag.h f/global.h \
- f/name.h f/expr.h f/implic.h f/src.h f/st.h $(GGC_H) toplev.h diagnostic.h
+ f/name.h f/expr.h f/implic.h f/src.h f/st.h $(GGC_H) toplev.h diagnostic.h \
+ langhooks.h
 f/data.o: f/data.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/data.h f/bld.h f/bld-op.def \
  f/bit.h f/malloc.h f/com.h f/com-rt.def $(TREE_H) f/info.h f/info-b.def \
  f/info-k.def f/info-w.def f/target.h f/bad.h f/bad.def f/where.h glimits.h \
diff --git a/gcc/f/com.c b/gcc/f/com.c
index c086c489e1a..16050f69b2c 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -90,6 +90,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "convert.h"
 #include "ggc.h"
 #include "diagnostic.h"
+#include "langhooks.h"
 #endif	/* FFECOM_targetCURRENT == FFECOM_targetGCC */
 
 #define FFECOM_GCC_INCLUDE 1	/* Enable -I. */
@@ -14634,11 +14635,16 @@ static void ffe_init PARAMS ((void));
 static void ffe_finish PARAMS ((void));
 static void ffe_init_options PARAMS ((void));
 
-struct lang_hooks lang_hooks = {ffe_init,
-				ffe_finish,
-				ffe_init_options,
-				ffe_decode_option,
-				NULL /* post_options */};
+#undef  LANG_HOOKS_INIT
+#define LANG_HOOKS_INIT			ffe_init
+#undef  LANG_HOOKS_FINISH
+#define LANG_HOOKS_FINISH		ffe_finish
+#undef  LANG_HOOKS_INIT_OPTIONS
+#define LANG_HOOKS_INIT_OPTIONS		ffe_init_options
+#undef  LANG_HOOKS_DECODE_OPTION
+#define LANG_HOOKS_DECODE_OPTION	ffe_decode_option
+
+struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
 
 /* used by print-tree.c */
 
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index dbcccbd11f9..7f8e1e3c472 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-17  Richard Henderson  <rth@redhat.com>
+
+	* Make-lang.in (java/lang.o): Depend on langhooks.h.
+
 2001-10-15  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* lang.c (langhooks.h): Included.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 67ae036b163..233bf6811c3 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -268,7 +268,7 @@ java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
 java/jv-scan.o: java/jv-scan.c $(CONFIG_H) $(SYSTEM_H) version.h
 java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H)
 java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
-  toplev.h $(SYSTEM_H) $(RTL_H) $(EXPR_H) diagnostic.h
+  toplev.h $(SYSTEM_H) $(RTL_H) $(EXPR_H) diagnostic.h langhooks.h
 java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \
   toplev.h $(GGC_H)
 java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \