From bbfc9a8c88c1d941cde0fef79ad51cabff9e741d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 22 Mar 2011 22:38:56 +0000 Subject: m32c.c: Don't include opts.h. * config/m32c/m32c.c: Don't include opts.h. (target_memregs, target_memregs_set, TARGET_HANDLE_OPTION, m32c_handle_option): Remove. (m32c_option_override): Check global_options_set.x_target_memregs instead of target_memregs_set. * config/m32c/m32c.h (target_memregs): Remove. * config/m32c/m32c.opt (memregs=): Use UInteger with integer variable. From-SVN: r171320 --- gcc/config/m32c/m32c.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'gcc/config/m32c/m32c.c') diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c index 16f6357..055f34e 100644 --- a/gcc/config/m32c/m32c.c +++ b/gcc/config/m32c/m32c.c @@ -48,7 +48,6 @@ #include "langhooks.h" #include "gimple.h" #include "df.h" -#include "opts.h" /* Prototypes */ @@ -408,31 +407,8 @@ class_can_hold_mode (reg_class_t rclass, enum machine_mode mode) Memregs are provided by m32c-lib1.S. */ -int target_memregs = 16; -static bool target_memregs_set = FALSE; int ok_to_change_target_memregs = TRUE; -#undef TARGET_HANDLE_OPTION -#define TARGET_HANDLE_OPTION m32c_handle_option -static bool -m32c_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; - const char *arg = decoded->arg; - - gcc_assert (opts == &global_options); - gcc_assert (opts_set == &global_options_set); - - if (code == OPT_memregs_) - { - target_memregs_set = TRUE; - target_memregs = atoi (arg); - } - return TRUE; -} - /* Implements TARGET_OPTION_OVERRIDE. */ #undef TARGET_OPTION_OVERRIDE @@ -442,7 +418,7 @@ static void m32c_option_override (void) { /* We limit memregs to 0..16, and provide a default. */ - if (target_memregs_set) + if (global_options_set.x_target_memregs) { if (target_memregs < 0 || target_memregs > 16) error ("invalid target memregs value '%d'", target_memregs); -- cgit v1.1