PR middle-end/51212

        * opts.c (finish_options): Sorry out when using transactional
        memory and non-call exceptions.
        * doc/invoke.texi (C Dialect Options): Document it.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc64456..d01b88d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2012-01-04  Aldy Hernandez  <aldyh@redhat.com>
 
+       PR middle-end/51212
+       * opts.c (finish_options): Sorry out when using transactional
+       memory and non-call exceptions.
+       * doc/invoke.texi (C Dialect Options): Document it.
+
+2012-01-04  Aldy Hernandez  <aldyh@redhat.com>
+
        PR middle-end/51696
        * trans-mem.c (diagnose_tm_1): Display indirect calls with no name
        correctly.

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index bb05d88..1e45b61 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1742,6 +1742,9 @@ For more information on GCC's support for transactional memory,
 @xref{Enabling libitm,,The GNU Transactional Memory Library,libitm,GNU
 Transactional Memory Library}.
 
+Note that the transactional memory feature is not supported with
+non-call exceptions (@option{-fnon-call-exceptions}).
+
 @item -fms-extensions
 @opindex fms-extensions
 Accept some non-standard constructs used in Microsoft header files.

diff --git a/gcc/opts.c b/gcc/opts.c
index 2ed5560..121cf69 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -666,6 +666,9 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
   if (opts->x_flag_tm && opts->x_flag_non_call_exceptions)
     sorry ("transactional memory is not supported with non-call exceptions");
 
+  if (opts->x_flag_tm && opts->x_flag_non_call_exceptions)
+    sorry ("transactional memory is not supported with non-call exceptions");
+
   /* -Wmissing-noreturn is alias for -Wsuggest-attribute=noreturn.  */
   if (opts->x_warn_missing_noreturn)
     opts->x_warn_suggest_attribute_noreturn = true;