Re: Convert f77 to use opts.c.

[Neil Booth <neil at daikokuya dot co dot uk>]

Andreas Jaeger wrote:-

> > What were you linking?  The C front end?  I've just done it from a
> > clean build with no patches.
> 
> ada:

Andreas, can you test this and apply whichever bit you need?
I can't test it as I have to dash out.  I'm really sorry about this.

Neil.

ada:
	* Make-lang.in: Update.
	* misc.c: Include opts.h. Define cl_options_count and cl_options.
f:
	* Make-lang.in: Update.
	* top.c: Include opts.h. Define cl_options_count and cl_options.
java:
	* Make-lang.in: Update.
	* lang.c: Include opts.h. Define cl_options_count and cl_options.

Index: ada/misc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/misc.c,v
retrieving revision 1.49
diff -u -p -b -r1.49 misc.c
--- ada/misc.c	7 Jun 2003 11:10:41 -0000	1.49
+++ ada/misc.c	8 Jun 2003 10:12:03 -0000
@@ -74,10 +74,14 @@
 #include "ada-tree.h"
 #include "gigi.h"
 #include "adadecode.h"
+#include "opts.h"
 
 extern FILE *asm_out_file;
 extern int save_argc;
 extern char **save_argv;
+
+const unsigned int cl_options_count;
+const struct cl_option cl_options[];
 
 static size_t gnat_tree_size		PARAMS ((enum tree_code));
 static bool gnat_init			PARAMS ((void));
Index: ada/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/Make-lang.in,v
retrieving revision 1.31
diff -u -p -b -r1.31 Make-lang.in
--- ada/Make-lang.in	6 Jun 2003 04:50:07 -0000	1.31
+++ ada/Make-lang.in	8 Jun 2003 10:12:04 -0000
@@ -1014,7 +1014,7 @@ ada/misc.o : ada/misc.c $(CONFIG_H) $(SY
    diagnostic.h output.h except.h $(TM_P_H) langhooks.h debug.h $(LANGHOOKS_DEF_H) \
    libfuncs.h $(OPTABS_H) ada/ada.h ada/types.h ada/atree.h ada/nlists.h \
    ada/elists.h ada/sinfo.h ada/einfo.h ada/namet.h ada/stringt.h ada/uintp.h \
-   ada/fe.h $(ADA_TREE_H) ada/gigi.h ada/adadecode.h
+   ada/fe.h $(ADA_TREE_H) ada/gigi.h ada/adadecode.h opts.h
 
 ada/targtyps.o : ada/targtyps.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    ada/ada.h ada/types.h ada/atree.h ada/nlists.h ada/elists.h ada/uintp.h \
Index: java/lang.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/lang.c,v
retrieving revision 1.125
diff -u -p -b -r1.125 lang.c
--- java/lang.c	7 Jun 2003 11:10:46 -0000	1.125
+++ java/lang.c	8 Jun 2003 10:12:04 -0000
@@ -45,6 +45,10 @@ The Free Software Foundation is independ
 #include "tree-inline.h"
 #include "splay-tree.h"
 #include "tree-dump.h"
+#include "opts.h"
+
+const unsigned int cl_options_count;
+const struct cl_option cl_options[];
 
 struct string_option
 {
Index: java/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.109
diff -u -p -b -r1.109 Make-lang.in
--- java/Make-lang.in	5 Jun 2003 16:36:11 -0000	1.109
+++ java/Make-lang.in	8 Jun 2003 10:12:05 -0000
@@ -326,7 +326,7 @@ java/jvgenmain.o: java/jvgenmain.c $(CON
   coretypes.h $(TM_H)
 java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
   toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(EXPR_H) diagnostic.h \
-  langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h
+  langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h
 java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \
   coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-mangle.h
 java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
Index: f/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/Make-lang.in,v
retrieving revision 1.122
diff -u -p -b -r1.122 Make-lang.in
--- f/Make-lang.in	5 Jun 2003 16:36:10 -0000	1.122
+++ f/Make-lang.in	8 Jun 2003 10:12:05 -0000
@@ -542,7 +542,7 @@ f/top.o: f/top.c f/proj.h $(CONFIG_H) $(
  f/info-w.def f/target.h f/lex.h f/type.h f/lab.h f/storag.h \
  f/symbol.h f/symbol.def f/equiv.h f/global.h f/name.h f/intrin.h \
  f/intrin.def f/data.h f/expr.h f/implic.h f/src.h f/st.h flags.h \
- toplev.h coretypes.h $(TM_H)
+ toplev.h coretypes.h $(TM_H) opts.h
 f/type.o: f/type.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/type.h f/malloc.h \
  coretypes.h $(TM_H)
 f/where.o: f/where.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/where.h glimits.h \
Index: f/top.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/top.c,v
retrieving revision 1.29
diff -u -p -b -r1.29 top.c
--- f/top.c	12 Jan 2003 02:32:39 -0000	1.29
+++ f/top.c	8 Jun 2003 10:12:05 -0000
@@ -55,8 +55,12 @@ the Free Software Foundation, 59 Temple 
 #include "where.h"
 #include "flags.h"
 #include "toplev.h"
+#include "opts.h"
 
 /* Externals defined here. */
+
+const unsigned int cl_options_count;
+const struct cl_option cl_options[];
 
 bool ffe_is_do_internal_checks_ = FALSE;
 bool ffe_is_90_ = FFETARGET_defaultIS_90;