diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-15 02:55:08 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-15 03:05:05 -0400 |
| commit | 8406bb5944940a8830b37b97584dda3208a3d07d (patch) | |
| tree | 9fed3d4c5c3ca932b0fc4955a965bf38ea3dd447 /sim/cris | |
| parent | b19839da382a4755e91d0a943b6d89d13fd74972 (diff) | |
| download | fsf-binutils-gdb-8406bb5944940a8830b37b97584dda3208a3d07d.zip fsf-binutils-gdb-8406bb5944940a8830b37b97584dda3208a3d07d.tar.gz fsf-binutils-gdb-8406bb5944940a8830b37b97584dda3208a3d07d.tar.bz2 | |
sim: dv-sockser: push module init prototype down
Pull out the duplicated dv_sockser_install prototype from the tconfig.in
files and put it in the one place it gets used -- sim-module.c. This is
still arguably incorrect, but it's better than the status quo where the
tconfig.in has to include header files and duplicate the dv-sockser func.
The tconfig header is meant to be simple and contain a target defines.
Diffstat (limited to 'sim/cris')
| -rw-r--r-- | sim/cris/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/cris/tconfig.in | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index e1f3f9e..9432e32 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2015-03-15 Mike Frysinger <vapier@gentoo.org> + + * tconfig.in: Delete most includes. + [HAVE_DV_SOCKSER]: Delete. + 2015-03-14 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_RUN_OBJS): Delete. diff --git a/sim/cris/tconfig.in b/sim/cris/tconfig.in index 7749993..8f82ac7 100644 --- a/sim/cris/tconfig.in +++ b/sim/cris/tconfig.in @@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef CRIS_TCONFIG_H #define CRIS_TCONFIG_H -#include "ansidecl.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" -#include "sim-module.h" - /* There's basically a a big ??? FIXME: CHECK THIS on everything in this file. I just copied it from m32r, pruned some stuff and added HAVE_MODEL because it seemed useful. */ @@ -35,15 +30,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* For MSPR support. FIXME: revisit. */ #define WITH_DEVICES 1 +#include "sim-module.h" extern MODULE_INSTALL_FN cris_option_install; - -/* FIXME: Revisit. */ -#ifdef HAVE_DV_SOCKSER -extern MODULE_INSTALL_FN dv_sockser_install; -#define MODULE_LIST dv_sockser_install, cris_option_install, -#else #define MODULE_LIST cris_option_install, -#endif #define SIM_HAVE_MODEL |