From b2e608ca7ff1fa5bce267d52e27e96e36bd4e170 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Fri, 18 Jul 2003 05:32:42 +0000 Subject: [PATCH] Makefile.in, [...]: Remove handling of lang-options.h and options_.h. * Makefile.in, configure, configure.in: Remove handling of lang-options.h and options_.h. * toplev.c (struct lang_opt, documented_lang_options): Remove. (display_help): Don't use documented_lang_options. ada: * lang-options.h: Remove. * lang.opt: Add help text. java: * lang-options.h: Remove. * lang.opt: Add help text. From-SVN: r69544 --- gcc/ChangeLog | 7 +++++ gcc/Makefile.in | 13 ++------ gcc/ada/ChangeLog | 5 +++ gcc/ada/lang-options.h | 38 ----------------------- gcc/ada/lang.opt | 6 +++- gcc/configure | 5 --- gcc/configure.in | 5 --- gcc/java/ChangeLog | 5 +++ gcc/java/lang-options.h | 65 --------------------------------------- gcc/java/lang.opt | 22 +++++++++++++ gcc/toplev.c | 68 ----------------------------------------- 11 files changed, 46 insertions(+), 193 deletions(-) delete mode 100644 gcc/ada/lang-options.h delete mode 100644 gcc/java/lang-options.h diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 890dfdaaed5..4f80106551a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2003-07-18 Neil Booth + + * Makefile.in, configure, configure.in: Remove handling of + lang-options.h and options_.h. + * toplev.c (struct lang_opt, documented_lang_options): Remove. + (display_help): Don't use documented_lang_options. + 2003-07-17 Zack Weinberg * c-decl.c (pushdecl_function_level): Make static, return nothing. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 7ba4fa912f4..bbe8561a085 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -356,7 +356,6 @@ xm_file=@xm_file@ xm_defines=@xm_defines@ lang_opt_files=@lang_opt_files@ $(srcdir)/c.opt $(srcdir)/common.opt lang_specs_files=@lang_specs_files@ -lang_options_files=@lang_options_files@ lang_tree_files=@lang_tree_files@ target_cpu_default=@target_cpu_default@ GCC_THREAD_FILE=@thread_file@ @@ -1407,14 +1406,6 @@ s-gencheck : Makefile $(SHELL) $(srcdir)/move-if-change tmp-gencheck.h gencheck.h $(STAMP) s-gencheck -options_.h : s-options ; @true -s-options : Makefile - lof="$(lang_options_files)"; for f in $$lof; do \ - echo "#include \"$$f\""; \ - done | sed 's|$(srcdir)/||' > tmp-options_.h - $(SHELL) $(srcdir)/move-if-change tmp-options_.h options_.h - $(STAMP) s-options - specs.h : s-specs ; @true s-specs : Makefile lsf="$(lang_specs_files)"; for f in $$lsf; do \ @@ -1492,9 +1483,9 @@ toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_ function.h flags.h xcoffout.h input.h $(INSN_ATTR_H) output.h diagnostic.h \ debug.h insn-config.h intl.h $(RECOG_H) Makefile toplev.h \ dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \ - graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) $(lang_options_files) \ + graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) \ ssa.h $(PARAMS_H) $(TM_P_H) reload.h dwarf2asm.h $(TARGET_H) \ - langhooks.h insn-flags.h options_.h cfglayout.h real.h cfgloop.h \ + langhooks.h insn-flags.h cfglayout.h real.h cfgloop.h \ hosthooks.h $(LANGHOOKS_DEF_H) cgraph.h $(COVERAGE_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DTARGET_NAME=\"$(target_alias)\" \ diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cc2d36df7e0..e5764a4b358 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2003-07-18 Neil Booth + + * lang-options.h: Remove. + * lang.opt: Add help text. + 2003-07-07 Nathan Sidwell * trans.c (build_unit_elab, set_lineno): Adjust emit_line_note diff --git a/gcc/ada/lang-options.h b/gcc/ada/lang-options.h deleted file mode 100644 index 99ef12fa1d7..00000000000 --- a/gcc/ada/lang-options.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - * * - * GNAT COMPILER COMPONENTS * - * * - * L A N G - O P T I O N S * - * * - * C Header File * - * * - * * - * Copyright (C) 1992-2001 Free Software Foundation, Inc. * - * * - * GNAT is free software; you can redistribute it and/or modify it under * - * terms of the GNU General Public License as published by the Free Soft- * - * ware Foundation; either version 2, or (at your option) any later ver- * - * sion. GNAT is distributed in the hope that it will be useful, but WITH- * - * OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * - * for more details. You should have received a copy of the GNU General * - * Public License distributed with GNAT; see file COPYING. If not, write * - * to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, * - * MA 02111-1307, USA. * - * * - * GNAT was originally developed by the GNAT team at New York University. * - * Extensive contributions were provided by Ada Core Technologies Inc. * - * * - ****************************************************************************/ - -DEFINE_LANG_NAME ("Ada") - -/* This is the contribution to the `lang_options' array in gcc.c for - GNAT. */ - - {"-gnat", "Specify options to GNAT"}, - {"-gant", ""}, - {"-I", "Name of directory to search for sources"}, - {"-nostdinc", "Don't use system library for sources"}, - - diff --git a/gcc/ada/lang.opt b/gcc/ada/lang.opt index 9d8b7ab221d..393c72d14e7 100644 --- a/gcc/ada/lang.opt +++ b/gcc/ada/lang.opt @@ -27,17 +27,21 @@ Ada I Ada Joined Separate +; Documented for C Wall Ada +; Documented for C fRTS Ada RejectNegative gant -Ada Joined +Ada Joined Undocumented +; Catches typos gnat Ada Joined +-gnat