* targhooks.c (default_except_unwind_info): Remove

	MUST_USE_SJLJ_EXCEPTIONS case.
	* config/h8300/h8300.h (MUST_USE_SJLJ_EXCEPTIONS): Delete.
	* config/h8300/h8300.c (TARGET_EXCEPT_UNWIND_INFO): Define.
	* doc/tm.texi.in (MUST_USE_SJLJ_EXCEPTIONS): Delete.
	* doc/tm.texi: Regenerate.
	* system.h (MUST_USE_SJLJ_EXCEPTIONS): Poison.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85ff5a9a44c16c5497a3064304419a3c62e46ebc..a637c6c93368409f729f097fdab0838b9a0589b7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-24  Nathan Froyd  <froydnj@codesourcery.com>
+
+       * targhooks.c (default_except_unwind_info): Remove
+       MUST_USE_SJLJ_EXCEPTIONS case.
+       * config/h8300/h8300.h (MUST_USE_SJLJ_EXCEPTIONS): Delete.
+       * config/h8300/h8300.c (TARGET_EXCEPT_UNWIND_INFO): Define.
+       * doc/tm.texi.in (MUST_USE_SJLJ_EXCEPTIONS): Delete.
+       * doc/tm.texi: Regenerate.
+       * system.h (MUST_USE_SJLJ_EXCEPTIONS): Poison.
+
 2010-11-24  Nathan Froyd  <froydnj@codesourcery.com>
 
        * cppbuiltin.c (define_builtin_macros_for_type_sizes): Define

diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 1c7c27b5f30a718e40dd55b0ec9612948880c5ac..31aa54cca9b1b1b2a4a2834e25736aaa8a0670b3 100644 (file)
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -5975,4 +5975,7 @@ h8300_trampoline_init (rtx m_tramp, tree fndecl, rtx cxt)
 #undef TARGET_OPTION_OPTIMIZATION_TABLE
 #define TARGET_OPTION_OPTIMIZATION_TABLE h8300_option_optimization_table
 
+#undef TARGET_EXCEPT_UNWIND_INFO
+#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info
+
 struct gcc_target targetm = TARGET_INITIALIZER;

diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index 35094de7651af7667c6652218eee16ccae010a94..589b70f89a7392dc036c8b83008b93284dd2af96 100644 (file)
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -125,10 +125,8 @@ extern const char * const *h8_reg_names;
 #define TARGET_DEFAULT (MASK_QUICKCALL)
 #endif
 
-/* We want dwarf2 info available to gdb...  */
+/* We want dwarf2 info available to gdb.  */
 #define DWARF2_DEBUGGING_INFO        1
-/* ... but we don't actually support full dwarf2 EH.  */
-#define MUST_USE_SJLJ_EXCEPTIONS 1
 
 /* The return address is pushed on the stack.  */
 #define INCOMING_RETURN_ADDR_RTX   gen_rtx_MEM (Pmode, gen_rtx_REG (Pmode, STACK_POINTER_REGNUM))

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index b58ee7b3117b67eba4ceeb10bbbebc81fbc97b4e..6cb25072c13640ec43881f2fc57417cc5a61f60d 100644 (file)
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -8888,13 +8888,6 @@ This variable should be set to @code{true} if the target ABI requires unwinding
 tables even when exceptions are not used.
 @end deftypevr
 
-@defmac MUST_USE_SJLJ_EXCEPTIONS
-This macro need only be defined if @code{DWARF2_UNWIND_INFO} is
-runtime-variable.  In that case, @file{except.h} cannot correctly
-determine the corresponding definition of @code{MUST_USE_SJLJ_EXCEPTIONS},
-so the target must provide it directly.
-@end defmac
-
 @defmac DONT_USE_BUILTIN_SETJMP
 Define this macro to 1 if the @code{setjmp}/@code{longjmp}-based scheme
 should use the @code{setjmp}/@code{longjmp} functions from the C library

diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index f230307cdaddf52051c85db1aafbd60762c46307..1e4432bce59386b1a5e9c87e104aa1f85cadcba0 100644 (file)
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -8858,13 +8858,6 @@ This variable should be set to @code{true} if the target ABI requires unwinding
 tables even when exceptions are not used.
 @end deftypevr
 
-@defmac MUST_USE_SJLJ_EXCEPTIONS
-This macro need only be defined if @code{DWARF2_UNWIND_INFO} is
-runtime-variable.  In that case, @file{except.h} cannot correctly
-determine the corresponding definition of @code{MUST_USE_SJLJ_EXCEPTIONS},
-so the target must provide it directly.
-@end defmac
-
 @defmac DONT_USE_BUILTIN_SETJMP
 Define this macro to 1 if the @code{setjmp}/@code{longjmp}-based scheme
 should use the @code{setjmp}/@code{longjmp} functions from the C library

diff --git a/gcc/system.h b/gcc/system.h
index fbeab0fd7a6d814aaee065f423daac302e8ff7ff..41e865744e9dc9539c568b68d0151e92d007bf00 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -786,7 +786,7 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
        SWITCH_CURTAILS_COMPILATION SWITCH_TAKES_ARG WORD_SWITCH_TAKES_ARG \
        TARGET_OPTION_TRANSLATE_TABLE HANDLE_PRAGMA_PACK_PUSH_POP          \
        HANDLE_SYSV_PRAGMA HANDLE_PRAGMA_WEAK CONDITIONAL_REGISTER_USAGE   \
-       FUNCTION_ARG_BOUNDARY
+       FUNCTION_ARG_BOUNDARY MUST_USE_SJLJ_EXCEPTIONS
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE  \

diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 35cd5927b750ebb91fc309cfd1d71316df2c6c8b..f55fa8519d8a82d746362de000690f2b1707d5f2 100644 (file)
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1311,12 +1311,6 @@ default_debug_unwind_info (void)
 enum unwind_info_type
 default_except_unwind_info (void)
 {
-  /* ??? Change the one user to the hook, then poison this.  */
-#ifdef MUST_USE_SJLJ_EXCEPTIONS
-  if (MUST_USE_SJLJ_EXCEPTIONS)
-    return UI_SJLJ;
-#endif
-
   /* Obey the configure switch to turn on sjlj exceptions.  */
 #ifdef CONFIG_SJLJ_EXCEPTIONS
   if (CONFIG_SJLJ_EXCEPTIONS)