From d7b426187568d50a4ed8a14d319970f8d2c34eb2 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 14 Jun 2003 12:26:36 +0000 Subject: Makefile.in: Update to use common.opt and lang_opt_files. * Makefile.in: Update to use common.opt and lang_opt_files. (c-options.c, c-options.h): Remove. (options.c, options.h): Add. * c-opts.c: Include options.h not c-options.h. * common.opt: New file. * configure, configure.in: Add lang_opt_files. * opts.c: Include flags.h and diagnostic.h. (common_handle_option): New. (handle_option): Update to recognize common options and all language-dependent options. * opts.h (CL_F77, CL_JAVA, CL_ADA, CL_COMMON, CL_TREELANG): New. (struct cl_option): Make flags of type int. * opts.h: Flag option with front ends to which it applies. Handle duplicate options. * toplev.c (filename): Remove. (independent_decode_option): Don't handle filenames and -quiet. (process_options, do_compile): Update. ada: * Make-lang.in: Update to use options.c and options.h. * misc.c: Include options.h not aoptions.h. (gnat_handle_option): Abort on unrecognized switch. (gnat_init_options): Request Ada switches. cp: * Make-lang.in: Remove c-options.o. f: * Make-lang.in: Update to use options.c and options.h. * top.c: Include options.h not f-options.h. (gnat_handle_option): Abort on unrecognized switch. (ffe_init_options): From com.c. Request F77 options. (ffe_handle_options): Abort on unrecognized switch. * com.c (ffe_init_options): Move to top.c. * top.h (fee_init_options): New. java: * Make-lang.in: Update to use options.c and options.h. * lang.c: Include options.h not j-options.h. (java_handle_option): Abort on unrecognized option. (java_init_options): Request Java switches. treelang: * Make-lang.in: Update to use options.c and options.h. * tree1.c: Include options.h not t-options.h. (treelang_init_options): New. (treelang_handle_option): Abort on unrecognized switch. * treetree.c (LANG_HOOKS_INIT_OPTIONS): Override. * treetree.h (treelang_init_options): New. From-SVN: r67941 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/Make-lang.in | 11 ++--------- gcc/java/lang.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fcd451d..88bc7fe 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2003-06-14 Neil Booth + + * Make-lang.in: Update to use options.c and options.h. + * lang.c: Include options.h not j-options.h. + (java_handle_option): Abort on unrecognized option. + (java_init_options): Request Java switches. + 2003-06-11 Neil Booth * Make-lang.in: Handle mostlyclean. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 7bac187..ae2a7e7 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -108,7 +108,7 @@ gt-java-builtins.h gtype-java.h gt-java-resource.h : s-gtype ; @true JAVA_OBJS = java/parse.o java/class.o java/decl.o java/expr.o \ java/constants.o java/lang.o java/typeck.o java/except.o java/verify.o \ java/zextract.o java/jcf-io.o java/jcf-parse.o java/mangle.o \ - java/mangle_name.o java/builtins.o java/resource.o java/j-options.o \ + java/mangle_name.o java/builtins.o java/resource.o \ java/jcf-write.o java/buffer.o java/check-init.o java/jcf-depend.o \ java/jcf-path.o java/xref.o java/boehm.o java/java-tree-inline.o mkdeps.o @@ -237,7 +237,6 @@ java.install-info: installdirs java.mostlyclean: -rm -f java/*$(objext) $(DEMANGLER_PROG) -rm -f java/*$(coverageexts) - -rm -f java/j-options.c java/j-options.h -rm -f jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) s-java java.clean: java.distclean: @@ -327,7 +326,7 @@ java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \ 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 opts.h java/j-options.h + langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h options.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) \ @@ -348,12 +347,6 @@ java/xref.o: java/xref.c java/xref.h $(CONFIG_H) $(JAVA_TREE_H) toplev.h \ java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ java/zipfile.h -java/j-options.c: java/lang.opt opts.sh java/j-options.h - -java/j-options.h: java/lang.opt opts.sh - AWK=$(AWK) $(SHELL) $(srcdir)/opts.sh java/j-options.c \ - java/j-options.h $(srcdir)/java/lang.opt - # jcf-io.o needs $(ZLIBINC) added to cflags. java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(JAVA_TREE_H) diff --git a/gcc/java/lang.c b/gcc/java/lang.c index cb907a7..8fd4ba0 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -46,7 +46,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "splay-tree.h" #include "tree-dump.h" #include "opts.h" -#include "j-options.h" +#include "options.h" static bool java_init (void); static void java_finish (void); @@ -290,7 +290,7 @@ java_handle_option (size_t scode, const char *arg, int value) switch (code) { default: - return 0; + abort(); case OPT_I: jcf_path_include_arg (arg); @@ -695,7 +695,7 @@ java_init_options (void) jcf_path_init (); - return 0; + return CL_JAVA; } static bool -- cgit v1.1