Fix "#pragma GCC pop_options"

gcc/ChangeLog

	* targhooks.c (default_target_option_pragma_parse): Do not warn if
	called on behalf of "#pragma GCC pop_options".

gcc/testsuite/ChangeLog

	* gcc.dg/pragma-pop_options-1.c: New test.

From-SVN: r228794

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9ef5de9..0e9ce3f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-14  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+       * targhooks.c (default_target_option_pragma_parse): Do not warn if
+       called on behalf of "#pragma GCC pop_options".
+
 2015-10-14  Tom de Vries  <tom@codesourcery.com>
 
        * cfganal.c (verify_no_unreachable_blocks): New function.

diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 7238c8f..5077ec9 100644 (file)
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1305,8 +1305,12 @@ bool
 default_target_option_pragma_parse (tree ARG_UNUSED (args),
                                    tree ARG_UNUSED (pop_target))
 {
-  warning (OPT_Wpragmas,
-          "#pragma GCC target is not supported for this machine");
+  /* If args is NULL the caller is handle_pragma_pop_options ().  In that case,
+     emit no warning because "#pragma GCC pop_target" is valid on targets that
+     do not have the "target" pragma.  */
+  if (args)
+    warning (OPT_Wpragmas,
+            "#pragma GCC target is not supported for this machine");
 
   return false;
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c4fd225..da00152 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-14  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+       * gcc.dg/pragma-pop_options-1.c: New test.
+
 2015-10-13  Jakub Jelinek  <jakub@redhat.com>
            Aldy Hernandez  <aldyh@redhat.com>
 

diff --git a/gcc/testsuite/gcc.dg/pragma-pop_options-1.c b/gcc/testsuite/gcc.dg/pragma-pop_options-1.c
new file mode 100644 (file)
index 0000000..4e969de
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pragma-pop_options-1.c
@@ -0,0 +1,7 @@
+/* Check warnings produced by #pragma GCC push/pop/reset_options.  */
+/* { dg-do assemble } */
+
+#pragma push_options
+#pragma pop_options
+
+int foo;