From patchwork Mon Mar 23 08:41:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5755 Received: (qmail 91697 invoked by alias); 23 Mar 2015 08:41:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 91616 invoked by uid 89); 23 Mar 2015 08:41:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 23 Mar 2015 08:41:42 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 25FE7340A39 for ; Mon, 23 Mar 2015 08:41:40 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/2] sim: dv-sockser: move build to common dir Date: Mon, 23 Mar 2015 04:41:36 -0400 Message-Id: <1427100096-18856-2-git-send-email-vapier@gentoo.org> In-Reply-To: <1427100096-18856-1-git-send-email-vapier@gentoo.org> References: <1427100096-18856-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes 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. Committed. --- sim/bfin/ChangeLog | 6 ++++++ sim/bfin/Makefile.in | 1 - sim/bfin/configure | 17 ++++++----------- sim/bfin/configure.ac | 3 --- sim/common/ChangeLog | 5 +++++ sim/common/acinclude.m4 | 7 ++++--- sim/cris/ChangeLog | 4 ++++ sim/cris/configure | 12 ++++++------ sim/frv/ChangeLog | 4 ++++ sim/frv/configure | 12 ++++++------ sim/iq2000/ChangeLog | 4 ++++ sim/iq2000/configure | 12 ++++++------ sim/lm32/ChangeLog | 5 +++++ sim/lm32/Makefile.in | 1 - sim/lm32/configure | 12 ++++++------ sim/m32r/ChangeLog | 4 ++++ sim/m32r/configure | 12 ++++++------ sim/m68hc11/ChangeLog | 7 +++++++ sim/m68hc11/Makefile.in | 5 +---- sim/m68hc11/configure | 19 ++++++------------- sim/m68hc11/configure.ac | 6 ------ sim/mips/ChangeLog | 7 +++++++ sim/mips/Makefile.in | 2 -- sim/mips/configure | 15 ++++++--------- sim/mips/configure.ac | 2 -- sim/mn10300/ChangeLog | 4 ++++ sim/mn10300/configure | 19 ++++++++++--------- sim/sh64/ChangeLog | 4 ++++ sim/sh64/configure | 12 ++++++------ 29 files changed, 123 insertions(+), 100 deletions(-) diff --git a/sim/sh64/configure b/sim/sh64/configure index c298280..1099306 100755 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 + * configure: Regenerate. + * configure.ac (BFIN_SIM_EXTRA_OBJS): Delete. + * Makefile.in (SIM_OBJS): Delete @BFIN_SIM_EXTRA_OBJS@. + +2015-03-23 Mike Frysinger + * 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 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, [ 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 + * acinclude.m4 (SIM_AC_OPTION_HARDWARE): Delete SIM_DV_SOCKSER_O. + Add dv-sockser.o to sim_hw_objs. + +2015-03-23 Mike Frysinger + * 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..e4d206f 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 diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index d2f912d..f193ae2 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/cris/configure b/sim/cris/configure index 7c9094e..a36a3eb 100755 diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 5968f7e..6957942 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/frv/configure b/sim/frv/configure index d312971..847c4bb 100755 diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 884c21f..5fdf7d5 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 353ace0..97aeed1 100755 diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index a02609e..3ea4b85 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + * Makefile.in (SIM_OBJS): Delete @SIM_DV_SOCKSER_O@. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in index 61e4137..60420a1 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -12,7 +12,6 @@ SIM_OBJS = \ sim-model.o \ sim-reg.o \ sim-signal.o \ - @SIM_DV_SOCKSER_O@ \ cgen-utils.o cgen-trace.o cgen-scache.o \ cgen-run.o sim-reason.o sim-engine.o sim-stop.o \ sim-if.o arch.o \ diff --git a/sim/lm32/configure b/sim/lm32/configure index 22ed7d5..fd4185f 100755 diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index bc379a0..b2261b2 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + 2015-03-16 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/m32r/configure b/sim/m32r/configure index 0065621..7dbcdf0 100755 diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 712dcf9..35f1e18 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,10 @@ +2015-03-23 Mike Frysinger + + * configure: Regenerate. + * configure.ac (m68hc11_extra_objs): Delete. + * Makefile.in (SIM_OBJS): Delete SIM_EXTRA_OBJS. + (SIM_EXTRA_OBJS): Delete. + 2015-03-16 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index f08aa53..a4a74c2 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -27,8 +27,7 @@ SIM_OBJS = $(M68HC11_OBJS) \ sim-engine.o \ sim-stop.o \ sim-hrw.o \ - sim-reason.o \ - $(SIM_EXTRA_OBJS) + sim-reason.o SIM_PROFILE= -DPROFILE=1 -DWITH_PROFILE=-1 # We must use 32-bit addresses to support memory bank switching. @@ -42,8 +41,6 @@ SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 \ -DWITH_TARGET_WORD_MSB=31 SIM_EXTRA_CLEAN = clean-extra -SIM_EXTRA_OBJS = @m68hc11_extra_objs@ - INCLUDE = $(srcdir)/../../include/gdb/callback.h \ interrupts.h sim-main.h diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 5b85244..7d559e6 100755 diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac index d25a8db..5aefda5 100644 --- a/sim/m68hc11/configure.ac +++ b/sim/m68hc11/configure.ac @@ -21,13 +21,7 @@ case "${target}" in hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram" SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1" ;; - *) - m68hc11_extra_objs="" - ;; esac SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices) -m68hc11_extra_objs="$SIM_DV_SOCKSER_O" -AC_SUBST(m68hc11_extra_objs) - SIM_AC_OUTPUT diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 5c8e6eb..60275b0 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,6 +1,13 @@ 2015-03-23 Mike Frysinger * configure: Regenerate. + * configure.ac (mips_extra_objs): Delete. + * Makefile.in (MIPS_EXTRA_OBJS): Delete. + (SIM_OBJS): Delete MIPS_EXTRA_OBJS. + +2015-03-23 Mike Frysinger + + * configure: Regenerate. * configure.ac: Delete sim_hw checks for dv-sockser. 2015-03-16 Mike Frysinger diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 67bce7f..b9151eb 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -37,13 +37,11 @@ SIM_M16_OBJ = \ SIM_MULTI_OBJ = itable.o @sim_multi_obj@ -MIPS_EXTRA_OBJS = @mips_extra_objs@ MIPS_EXTRA_LIBS = @mips_extra_libs@ SIM_OBJS = \ $(SIM_@sim_gen@_OBJ) \ $(SIM_NEW_COMMON_OBJS) \ - $(MIPS_EXTRA_OBJS) \ cp1.o \ interp.o \ mdmx.o \ diff --git a/sim/mips/configure b/sim/mips/configure index 650b6bb..792d77c 100755 diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index 02deab6..4dee7d4 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -419,8 +419,6 @@ case "${target}" in ;; esac SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices) -mips_extra_objs="$SIM_DV_SOCKSER_O" -AC_SUBST(mips_extra_objs) # Choose simulator engine diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 9a6cc45..44a9f52 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,6 +1,10 @@ 2015-03-23 Mike Frysinger * configure: Regenerate. + +2015-03-23 Mike Frysinger + + * configure: Regenerate. * configure.ac: Delete SIM_DV_SOCKSER_O check. 2015-03-16 Mike Frysinger diff --git a/sim/mn10300/configure b/sim/mn10300/configure index f0a650a..665075f 100755 diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 0cb1075..5ce0cfe 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,5 +1,9 @@ 2015-03-23 Mike Frysinger + * configure: Regenerate. + +2015-03-23 Mike Frysinger + * Makefile.in (CONFIG_DEVICES): Delete. (SIM_OBJS): Delete CONFIG_DEVICES.