From af418b8cb81e526c2a2d5f9195f26af1d6e722a3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 6 Jul 2001 04:31:03 +0000 Subject: [PATCH] lang.c (flag_assume_compiled): Removed. * lang.c (flag_assume_compiled): Removed. * java-tree.h (flag_assume_compiled): Removed. * lang-options.h: Removed -ffile-list-file, -fuse-boehm-gc, -fhash-synchronization, -fuse-divide-subroutine, -fcheck-references, -femit-class-file, -femit-class-files, -fassume-compiled. Updated --encoding information. Changed -foutput-class-dir to `-d'. From-SVN: r43799 --- gcc/java/ChangeLog | 10 ++++++++++ gcc/java/java-tree.h | 5 ----- gcc/java/lang-options.h | 23 +++-------------------- gcc/java/lang.c | 5 ----- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 28888f2f820..0b4d4de2a6a 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,13 @@ +2001-07-05 Tom Tromey + + * lang.c (flag_assume_compiled): Removed. + * java-tree.h (flag_assume_compiled): Removed. + * lang-options.h: Removed -ffile-list-file, -fuse-boehm-gc, + -fhash-synchronization, -fuse-divide-subroutine, + -fcheck-references, -femit-class-file, -femit-class-files, + -fassume-compiled. Updated --encoding information. Changed + -foutput-class-dir to `-d'. + 2001-07-04 Daniel Berlin * jcf-parse.c (parse_class_file): Add lineno parameter to diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index d0c2d34b290..0dc49f0535b 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -135,11 +135,6 @@ extern int compiling_from_source; #define all_class_list \ java_global_trees[JTI_ALL_CLASS_LIST] -/* Nonzero if we should make is_compiled_class always return 1 for - appropriate classes that we're referencing. */ - -extern int flag_assume_compiled; - extern int flag_emit_class_files; extern int flag_filelist_file; diff --git a/gcc/java/lang-options.h b/gcc/java/lang-options.h index c15946e8851..17a16966551 100644 --- a/gcc/java/lang-options.h +++ b/gcc/java/lang-options.h @@ -1,5 +1,5 @@ /* Switch definitions for the GNU compiler for the Java(TM) language. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU CC. @@ -30,18 +30,6 @@ DEFINE_LANG_NAME ("Java") { "-fbounds-check", "" }, { "-fno-bounds-check", N_("Disable automatic array bounds checking") }, - { "-fassume-compiled", - N_("Make is_compiled_class return 1") }, - { "-fno-assume-compiled", "" }, - { "-femit-class-file", "" }, - { "-femit-class-files", - N_("Dump class files to .class") }, - { "-ffilelist-file", - N_("input file is list of file names to compile") }, - { "-fuse-boehm-gc", - N_("Generate code for Boehm GC") }, - { "-fhash-synchronization", - N_("Don't put synchronization structure in each object") }, { "-fjni", N_("Assume native functions are implemented using JNI") }, { "--classpath", @@ -51,16 +39,11 @@ DEFINE_LANG_NAME ("Java") { "--main", N_("Choose class whose main method should be used") }, { "--encoding", - N_("Choose input encoding (default is UTF-8)") }, + N_("Choose input encoding (default comes from locale)") }, { "-I", N_("Add directory to class path") }, - { "-foutput-class-dir", + { "-d", N_("Directory where class files should be written") }, - { "-fuse-divide-subroutine", "" }, - { "-fno-use-divide-subroutine", - N_("Use built-in instructions for division") }, - { "-fcheck-references", - N_("Generate null pointer checks inline") }, { "-Wredundant-modifiers", N_("Warn if modifiers are specified when not necessary") }, { "-Wextraneous-semicolon", diff --git a/gcc/java/lang.c b/gcc/java/lang.c index e3567f50e01..91f89be08e6 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -99,11 +99,6 @@ int compiling_from_source; const char * const language_string = "GNU Java"; -/* Nonzero if we should make is_compiled_class always return 1 for - appropriate classes that we're referencing. */ - -int flag_assume_compiled = 1; - int flag_emit_class_files = 0; /* Nonzero if input file is a file with a list of filenames to compile. */ -- 2.30.2