diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-12-24 17:26:54 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-24 20:11:26 -0500 |
| commit | bd3fb5b8fb33adb751407a128e1f2240dfb215d9 (patch) | |
| tree | d759f0952a9ecdbc4dbd7df8572357e86d87fbee /sim/common | |
| parent | 84e8e361dd3a3dd7314759f7f07927dac401d0e6 (diff) | |
| download | gdb-bd3fb5b8fb33adb751407a128e1f2240dfb215d9.zip gdb-bd3fb5b8fb33adb751407a128e1f2240dfb215d9.tar.gz gdb-bd3fb5b8fb33adb751407a128e1f2240dfb215d9.tar.bz2 | |
sim: h8300: move h8300-specific options out of common code
Register the options in sim_open like other arches to avoid having to hack
up the common modules.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/common/sim-options.c | 29 |
2 files changed, 7 insertions, 29 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index b740a17..cb1a9a6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,12 @@ 2015-12-24 Mike Frysinger <vapier@gentoo.org> + * sim-options.c (OPTION_H8300H, OPTION_H8300S, OPTION_H8300SX): + Move to h8300/compile.c. + [SIM_H8300] (standard_options): Likewise. + (standard_option_handler): Likewise. + +2015-12-24 Mike Frysinger <vapier@gentoo.org> + * sim-module.c [WITH_WATCHPOINTS] (modules): Always call sim_watchpoint_install. diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index 5e04573..69655b0 100644 --- a/sim/common/sim-options.c +++ b/sim/common/sim-options.c @@ -104,11 +104,6 @@ typedef enum { OPTION_DEBUG, OPTION_HELP, OPTION_VERSION, -#ifdef SIM_H8300 /* FIXME: Should be movable to h8300 dir. */ - OPTION_H8300H, - OPTION_H8300S, - OPTION_H8300SX, -#endif OPTION_LOAD_LMA, OPTION_LOAD_VMA, OPTION_SYSROOT @@ -147,18 +142,6 @@ static const OPTION standard_options[] = '\0', "FILE NAME", "Specify debugging output file", standard_option_handler }, -#ifdef SIM_H8300 /* FIXME: Should be movable to h8300 dir. */ - { {"h8300h", no_argument, NULL, OPTION_H8300H}, - 'h', NULL, "Indicate the CPU is H8/300H", - standard_option_handler }, - { {"h8300s", no_argument, NULL, OPTION_H8300S}, - 'S', NULL, "Indicate the CPU is H8S", - standard_option_handler }, - { {"h8300sx", no_argument, NULL, OPTION_H8300SX}, - 'x', NULL, "Indicate the CPU is H8SX", - standard_option_handler }, -#endif - { {"do-command", required_argument, NULL, OPTION_DO_COMMAND}, '\0', "COMMAND", ""/*undocumented*/, standard_option_handler }, @@ -355,18 +338,6 @@ standard_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, } break; -#ifdef SIM_H8300 /* FIXME: Can be moved to h8300 dir. */ - case OPTION_H8300H: - set_h8300h (bfd_mach_h8300h); - break; - case OPTION_H8300S: - set_h8300h (bfd_mach_h8300s); - break; - case OPTION_H8300SX: - set_h8300h (bfd_mach_h8300sx); - break; -#endif - case OPTION_DO_COMMAND: sim_do_command (sd, arg); break; |