From d41909ab9db4ac89767e919038fcde3254c9c435 Mon Sep 17 00:00:00 2001 From: Christian Bruel Date: Fri, 22 Jan 2016 12:20:08 +0100 Subject: [PATCH] 2016-01-22 Christian Bruel * config/arm/arm-c.c (arm_pragma_target_parse) Remove warn_builtin_macro_redefined overwrite. From-SVN: r232723 --- gcc/ChangeLog | 5 +++++ gcc/config/arm/arm-c.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b6ce6e646f..c2845cb88fb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-01-22 Christian Bruel + + * config/arm/arm-c.c (arm_pragma_target_parse) + Remove warn_builtin_macro_redefined overwrite. + 2016-01-22 Eric Botcazou * 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 5810608873e..df84bef3ca1 100644 --- 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; }