diff options
Diffstat (limited to 'sim/bfin')
| -rw-r--r-- | sim/bfin/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/bfin/Makefile.in | 1 | ||||
| -rwxr-xr-x | sim/bfin/configure | 17 | ||||
| -rw-r--r-- | sim/bfin/configure.ac | 3 |
4 files changed, 12 insertions, 15 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index bd22feb..1619cfc 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,11 @@ 2015-03-23 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. + * configure.ac (BFIN_SIM_EXTRA_OBJS): Delete. + * Makefile.in (SIM_OBJS): Delete @BFIN_SIM_EXTRA_OBJS@. + +2015-03-23 Mike Frysinger <vapier@gentoo.org> + * dv-bfin_uart.c [!HAVE_DV_SOCKSER] (dv_sockser_status, dv_sockser_write, dv_sockser_read): Delete. diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in index 1bf0772..a3dfd9f 100644 --- a/sim/bfin/Makefile.in +++ b/sim/bfin/Makefile.in @@ -36,7 +36,6 @@ SIM_OBJS = \ sim-reg.o \ sim-resume.o \ sim-stop.o \ - @BFIN_SIM_EXTRA_OBJS@ \ $(SIM_EXTRA_OBJS) INCLUDE = bfin-sim.h diff --git a/sim/bfin/configure b/sim/bfin/configure index e77e98a..ecd911a 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -606,8 +606,6 @@ SDL_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG -BFIN_SIM_EXTRA_OBJS -SIM_DV_SOCKSER_O REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION @@ -12396,7 +12394,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12399 "configure" +#line 12397 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12502,7 +12500,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12505 "configure" +#line 12503 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13595,10 +13593,12 @@ 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" cat >>confdefs.h <<_ACEOF #define HAVE_DV_SOCKSER 1 @@ -13606,7 +13606,6 @@ _ACEOF ;; esac - if test x"$silent" != x"yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs" fi @@ -13695,10 +13694,6 @@ fi done -BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} ${SIM_DV_SOCKSER_O}" -BFIN_SIM_EXTRA_OBJS=${BFIN_SIM_EXTRA_OBJS} - - diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index bd7df51..31cd159 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -56,9 +56,6 @@ AC_CHECK_HEADERS([ \ sys/mman.h \ ]) -BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} ${SIM_DV_SOCKSER_O}" -AC_SUBST([BFIN_SIM_EXTRA_OBJS], ${BFIN_SIM_EXTRA_OBJS}) - PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES(SDL, sdl, [ AC_CHECK_LIB(dl, dlopen, [ |