Remove flag_new_exceptions.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 92105e0..15a9dd2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -23,6 +23,11 @@
        * combine.c (distribute_notes) [REG_EH_REGION]: If non-call
        exceptions, put the note on the trapping instruction.
 
+       * flags.h (flag_new_exceptions): Remove.
+       * toplev.c: Don't set it.
+       * final.c: Don't check it.
+       * except.c: Provide stub definition.
+
 2001-03-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * configure.in: Don't check for bcopy.

diff --git a/gcc/except.c b/gcc/except.c
index d914168..04e3af7 100644 (file)
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -409,6 +409,13 @@ Boston, MA 02111-1307, USA.  */
 #include "ggc.h"
 #include "tm_p.h"
 
+/* ??? Temporary hack before this entire file is replaced.  */
+#ifdef IA64_UNWIND_INFO
+#define flag_new_exceptions 0
+#else
+#define flag_new_exceptions 1
+#endif
+
 /* One to enable asynchronous exception support.  */
 
 int flag_non_call_exceptions = 0;

diff --git a/gcc/final.c b/gcc/final.c
index 3277f5e..7b65a02 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -2129,8 +2129,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
          if (! USING_SJLJ_EXCEPTIONS)
            {
              ASM_OUTPUT_INTERNAL_LABEL (file, "LEHB", NOTE_EH_HANDLER (insn));
-             if (! flag_new_exceptions)
-               add_eh_table_entry (NOTE_EH_HANDLER (insn));
 #ifdef ASM_OUTPUT_EH_REGION_BEG
              ASM_OUTPUT_EH_REGION_BEG (file, NOTE_EH_HANDLER (insn));
 #endif
@@ -2141,8 +2139,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
          if (! USING_SJLJ_EXCEPTIONS)
            {
              ASM_OUTPUT_INTERNAL_LABEL (file, "LEHE", NOTE_EH_HANDLER (insn));
-             if (flag_new_exceptions)
-               add_eh_table_entry (NOTE_EH_HANDLER (insn));
+             add_eh_table_entry (NOTE_EH_HANDLER (insn));
 #ifdef ASM_OUTPUT_EH_REGION_END
              ASM_OUTPUT_EH_REGION_END (file, NOTE_EH_HANDLER (insn));
 #endif

diff --git a/gcc/flags.h b/gcc/flags.h
index 8bc2ddd..24254a3 100644 (file)
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -453,11 +453,6 @@ extern int flag_pic;
 
 extern int flag_exceptions;
 
-/* Nonzero means use the new model for exception handling. Replaces 
-   -DNEW_EH_MODEL as a compile option. */
-
-extern int flag_new_exceptions;
-
 /* Nonzero means generate frame unwind info table when supported */
 
 extern int flag_unwind_tables;

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7d985cb..c114c6c 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -3,6 +3,9 @@
        * expr.c, parse.h: Use USING_SJLJ_EXCEPTIONS instead of
        exceptions_via_longjmp.
 
+       * lang.c (flag_new_exceptions): Don't declare it.
+       (java_init_options): Or set it.
+
 2001-03-27  Richard Henderson  <rth@redhat.com>
 
        * decl.c (end_java_method): Rename asynchronous_exceptions to

diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 8f9f5b2..982f451 100644 (file)
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -152,7 +152,6 @@ int flag_force_classes_archive_check;
 
 /* From gcc/flags.h, and indicates if exceptions are turned on or not.  */
 
-extern int flag_new_exceptions;
 extern int flag_exceptions;
 
 /* Table of language-dependent -f options.
@@ -704,7 +703,6 @@ void lang_init_source (level)
 static void
 java_init_options ()
 {
-  flag_new_exceptions = 1;
   flag_bounds_check = 1;
 }
 

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 068d793..573b6b6 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -723,11 +723,6 @@ int flag_pic;
 
 int flag_exceptions;
 
-/* Nonzero means use the new model for exception handling. Replaces
-   -DNEW_EH_MODEL as a compile option.  */
-
-int flag_new_exceptions = 1;
-
 /* Nonzero means generate frame unwind info table when supported.  */
 
 int flag_unwind_tables = 0;
@@ -1077,8 +1072,6 @@ lang_independent_options f_options[] =
   {"PIC", &flag_pic, 2, ""},
   {"exceptions", &flag_exceptions, 1,
    "Enable exception handling" },
-  {"new-exceptions", &flag_new_exceptions, 1,
-   "Use the new model for exception handling" },
   {"unwind-tables", &flag_unwind_tables, 1,
     "Just generate unwind tables for exception handling" },
   {"non-call-exceptions", &flag_non_call_exceptions, 1,
@@ -4875,14 +4868,6 @@ toplev_main (argc, argv)
   OVERRIDE_OPTIONS;
 #endif
 
-  /* Since each function gets its own handler data, we can't support the
-     new model currently, since it depend on a specific rethrow label
-     which is declared at the front of the table, and we can only
-     have one such symbol in a file.  */
-#ifdef IA64_UNWIND_INFO
-  flag_new_exceptions = 0;
-#endif
-
   /* Set up the align_*_log variables, defaulting them to 1 if they
      were still unset.  */
   if (align_loops <= 0) align_loops = 1;