diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2011-03-22 22:40:52 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2011-03-22 22:40:52 +0000 |
| commit | 24e6e6b1c96253c78a206e57850e0c250772d293 (patch) | |
| tree | d7d35a8ca8dcf02d23365b50f463376e9ec84d31 | |
| parent | 8a784afb456e612326d285a9f5bc5d2a1687fa29 (diff) | |
| download | gcc-24e6e6b1c96253c78a206e57850e0c250772d293.zip gcc-24e6e6b1c96253c78a206e57850e0c250772d293.tar.gz gcc-24e6e6b1c96253c78a206e57850e0c250772d293.tar.bz2 | |
microblaze.c: Don't include opts.h.
* config/microblaze/microblaze.c: Don't include opts.h.
(microblaze_handle_option, TARGET_HANDLE_OPTION): Remove.
* config/microblaze/microblaze.opt (mxl-stack-check): Use Warn.
(mno-clearbss): Use Var and Warn.
From-SVN: r171322
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/microblaze/microblaze.c | 28 | ||||
| -rw-r--r-- | gcc/config/microblaze/microblaze.opt | 4 |
3 files changed, 9 insertions, 30 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f4cbb2..21dee10 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2011-03-22 Joseph Myers <joseph@codesourcery.com> + * config/microblaze/microblaze.c: Don't include opts.h. + (microblaze_handle_option, TARGET_HANDLE_OPTION): Remove. + * config/microblaze/microblaze.opt (mxl-stack-check): Use Warn. + (mno-clearbss): Use Var and Warn. + +2011-03-22 Joseph Myers <joseph@codesourcery.com> + * config/m32r/m32r-opts.h: New. * config/m32r/m32r.c (m32r_model, m32r_sdata): Remove. (m32r_handle_option): Don't assert that global structures are in diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c index 85295ef..468cfd3 100644 --- a/gcc/config/microblaze/microblaze.c +++ b/gcc/config/microblaze/microblaze.c @@ -48,7 +48,6 @@ #include "df.h" #include "optabs.h" #include "diagnostic-core.h" -#include "opts.h" #define MICROBLAZE_VERSION_COMPARE(VA,VB) strcasecmp (VA, VB) @@ -1276,30 +1275,6 @@ microblaze_version_to_int (const char *version) return iver; } -static bool -microblaze_handle_option (struct gcc_options *opts, - struct gcc_options *opts_set, - const struct cl_decoded_option *decoded, - location_t loc ATTRIBUTE_UNUSED) -{ - size_t code = decoded->opt_index; - - gcc_assert (opts == &global_options); - gcc_assert (opts_set == &global_options_set); - - switch (code) - { - case OPT_mno_clearbss: - flag_zero_initialized_in_bss = 0; - warning (0, "-mno-clearbss is deprecated; use -fno-zero-initialized-in-bss"); - break; - case OPT_mxl_stack_check: - warning (0, "-mxl_stack_check is deprecated; use -fstack-check"); - break; - } - return true; -} - static void microblaze_option_override (void) @@ -3011,9 +2986,6 @@ microblaze_adjust_cost (rtx insn ATTRIBUTE_UNUSED, rtx link, #define TARGET_ASM_FUNCTION_END_PROLOGUE \ microblaze_function_end_prologue -#undef TARGET_HANDLE_OPTION -#define TARGET_HANDLE_OPTION microblaze_handle_option - #undef TARGET_DEFAULT_TARGET_FLAGS #define TARGET_DEFAULT_TARGET_FLAGS TARGET_DEFAULT diff --git a/gcc/config/microblaze/microblaze.opt b/gcc/config/microblaze/microblaze.opt index 97f3161..74199fb 100644 --- a/gcc/config/microblaze/microblaze.opt +++ b/gcc/config/microblaze/microblaze.opt @@ -72,7 +72,7 @@ Target Mask(PATTERN_COMPARE) Use pattern compare instructions mxl-stack-check -Target Mask(STACK_CHECK) +Target Mask(STACK_CHECK) Warn(%qs is deprecated; use -fstack-check) Check for stack overflow at runtime mxl-gp-opt @@ -80,7 +80,7 @@ Target Mask(XLGPOPT) Use GP relative sdata/sbss sections mno-clearbss -Target RejectNegative +Target RejectNegative Var(flag_zero_initialized_in_bss, 0) Warn(%qs is deprecated; use -fno-zero-initialized-in-bss) Clear the BSS to zero and place zero initialized in BSS mxl-multiply-high |