diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-22 22:36:12 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-23 04:40:07 -0400 |
| commit | 49cd1634b2a59879329c5a285192ac581e64904c (patch) | |
| tree | 4921bf4264168301549340c6cf966cfa5301a99a /sim/common | |
| parent | 3649cb065699316bc8cd64b06f273c72f1806323 (diff) | |
| download | fsf-binutils-gdb-49cd1634b2a59879329c5a285192ac581e64904c.zip fsf-binutils-gdb-49cd1634b2a59879329c5a285192ac581e64904c.tar.gz fsf-binutils-gdb-49cd1634b2a59879329c5a285192ac581e64904c.tar.bz2 | |
sim: dv-sockser: move build to common dir
If dv-sockser is available, lets add it to the common SIM_HW_OBJS
variable so it is always included automatically. Now ports do not
have to shoe horn it in directly themselves. It does mean it will
be compiled for targets that don't explicitly use it, but that's
really what we want anyways.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/acinclude.m4 | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index c82f105..1cfb4d3 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,10 @@ 2015-03-23 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (SIM_AC_OPTION_HARDWARE): Delete SIM_DV_SOCKSER_O. + Add dv-sockser.o to sim_hw_objs. + +2015-03-23 Mike Frysinger <vapier@gentoo.org> + * dv-sockser.c: Include config.h. * dv-sockser.h: Include sim-inline.h. [HAVE_DV_SOCKSER]: Move all prototypes here. diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index 2e1d31f..e4d206fe 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -638,15 +638,16 @@ else esac done # mingw does not support sockser - SIM_DV_SOCKSER_O="" case ${host} in *mingw*) ;; - *) SIM_DV_SOCKSER_O="dv-sockser.o" + *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device + # that you instatiate. Instead, other code will call into it directly. + # At some point, we should convert it over. + sim_hw_objs="$sim_hw_objs dv-sockser.o" AC_DEFINE_UNQUOTED( [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.]) ;; esac - AC_SUBST(SIM_DV_SOCKSER_O) if test x"$silent" != x"yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" fi |