2016-01-22 Christian Bruel <christian.bruel@st.com>

	* config/arm/arm-c.c (arm_pragma_target_parse)
	Remove warn_builtin_macro_redefined overwrite.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b6ce6e..c2845cb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-22  Christian Bruel  <christian.bruel@st.com>
+
+       * config/arm/arm-c.c (arm_pragma_target_parse)
+       Remove warn_builtin_macro_redefined overwrite.
+
 2016-01-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * ipa-inline.c (can_inline_edge_p): Back out overzealous check on

diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index 5810608..df84bef 100644 (file)
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -238,11 +238,8 @@ arm_pragma_target_parse (tree args, tree pop_target)
         compiler predefined macros.  */
       cpp_options *cpp_opts = cpp_get_options (parse_in);
       unsigned char saved_warn_unused_macros = cpp_opts->warn_unused_macros;
-      unsigned char saved_warn_builtin_macro_redefined
-       = cpp_opts->warn_builtin_macro_redefined;
 
       cpp_opts->warn_unused_macros = 0;
-      cpp_opts->warn_builtin_macro_redefined = 0;
 
       /* Update macros.  */
       gcc_assert (cur_opt->x_target_flags == target_flags);
@@ -261,7 +258,6 @@ arm_pragma_target_parse (tree args, tree pop_target)
 
       arm_cpu_builtins (parse_in);
 
-      cpp_opts->warn_builtin_macro_redefined = saved_warn_builtin_macro_redefined;
       cpp_opts->warn_unused_macros = saved_warn_unused_macros;
     }