This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: m32r sim was Re: one week to gdb-7.6 release?

From: Mike Frysinger <vapier at gentoo dot org>
To: Joel Sherrill <joel dot sherrill at oarcorp dot com>
Cc: Ralf Corsepius <ralf dot corsepius at rtems dot org>, Joel Brobecker <brobecker at adacore dot com>, Eli Zaretskii <eliz at gnu dot org>, "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>, "palves at redhat dot com" <palves at redhat dot com>, "jan dot kratochvil at redhat dot com" <jan dot kratochvil at redhat dot com>
Date: Sat, 30 Mar 2013 20:44:39 -0400
Subject: Re: m32r sim was Re: one week to gdb-7.6 release?
References: <20130320160032 dot GC5447 at adacore dot com> <51553AA8 dot 8020705 at rtems dot org> <5155A93E dot 3050509 at oarcorp dot com>

On Friday 29 March 2013 10:46:22 Joel Sherrill wrote:
> On 3/29/2013 1:54 AM, Ralf Corsepius wrote:
> > On 03/29/2013 02:59 AM, Joel Brobecker wrote:
> >> I was wondering if this discussion was stalled, or if it was just
> >> a matter of not finding the time to do the implementation.
> > 
> > Sorry, in my case, it's simply lack of time.
> > 
> >> I could
> >> possibly take care of it tomorrow if you'd like.  There is not real
> >> rush, however, as I will be off next week, and thus unable to create
> >> a release at least until Tue Apr 9th.
> > 
> > I just did a test-rebuild with current gdb-7_6-branch (presuming Joel's
> > new patches are in).
> 
> And Mike's.
> 
> > Using the same set of configuration options, I have been using for
> > gdb-7.5.x, all targets build fine on Linux.
> > 
> > However, there is a new breakdown for the m32r on
> > mingw32-w64-{x86_64,i386}:
> > 
> > ..../configure --build=i386-pc-linux-gnu \
> > --host=x86_64-w64-mingw32 --target=m32r-rtems4.11
> > --enable-sim [...] \
> > ...
> > checking how to recognize dependent libraries... configure: error:
> > Sorry, but hardware support in this simulator unconditionally
> > relies on dv-sockser.o which is unavailable for your host. Please fix
> > this simulator.
> > ...
> > 
> > As gdb-7.5.x built fine with the same configuration, this to me
> > qualifies as a regression - Or is this just a latent, so far silently
> > accepted, but dysfunctional part being revealed by the new configuration
> > magic?
> 
> Looking back at 7.5.91, I see that m32r unconditionally uses
> dv-sockser.o and
> I don't know how it built before.
> 
> The references to dv-sockser.o methods appear to be properly
> conditionalized in the code.  So it is the Makefile.in and our
> interpretation that the simulated
> hardware should be "always on" versus "yes enabled" by default.
> 
> Attached is an untested patch.

i've committed the patch below
-mike

--- sim/frv/ChangeLog	26 Mar 2013 18:00:04 -0000	1.57
+++ sim/frv/ChangeLog	31 Mar 2013 00:35:45 -0000
@@ -1,3 +1,11 @@
+2013-03-30  Joel Sherrill  <joel.sherrill@oarcorp.com>
+	    Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Add frv_extra_objs. Change simulator hardware
+	from always on to defaulting to yes it is enabled.
+	* Makefile.in: Conditionalize reference to dv-sockser.o.
+	* configure: Regenerated.
+
 2013-03-26  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
--- sim/frv/Makefile.in	1 Jan 2013 06:41:35 -0000	1.13
+++ sim/frv/Makefile.in	31 Mar 2013 00:35:45 -0000
@@ -19,9 +19,6 @@
 
 FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o
 
-CONFIG_DEVICES = dv-sockser.o
-CONFIG_DEVICES =
-
 SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
@@ -36,7 +33,7 @@ SIM_OBJS = \
 	traps.o interrupts.o memory.o cache.o pipeline.o \
 	profile.o profile-fr400.o profile-fr450.o profile-fr500.o profile-fr550.o options.o \
 	devices.o reset.o registers.o \
-	$(CONFIG_DEVICES)
+	$(frv_extra_objs)
 
 # Extra headers included by sim-main.h.
 SIM_EXTRA_DEPS = \
--- sim/frv/configure	26 Mar 2013 18:00:04 -0000	1.23
+++ sim/frv/configure	31 Mar 2013 00:35:45 -0000
@@ -601,6 +601,7 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 cgen_breaks
+frv_extra_objs
 SIM_DV_SOCKSER_O
 sim_trapdump
 cgen
@@ -12278,7 +12279,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12281 "configure"
+#line 12282 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12384,7 +12385,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12387 "configure"
+#line 12388 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13428,12 +13429,8 @@ fi
   esac
 fi
 
+frv_extra_objs="$SIM_DV_SOCKSER_O"
 
-if test -z "$SIM_DV_SOCKSER_O"; then
-	as_fn_error "Sorry, but hardware support in this simulator
-unconditionally relies on dv-sockser.o which is unavailable for your host.
-Please fix this simulator." "$LINENO" 5
-fi
 
 
 ac_sources="$sim_link_files"
--- sim/frv/configure.ac	23 Mar 2013 15:05:56 -0000	1.6
+++ sim/frv/configure.ac	31 Mar 2013 00:35:45 -0000
@@ -29,11 +29,7 @@ fi],[sim_trapdump=""])dnl
 AC_SUBST(sim_trapdump)
 
 SIM_AC_OPTION_HARDWARE(always,"","")
-
-if test -z "$SIM_DV_SOCKSER_O"; then
-	AC_MSG_ERROR([Sorry, but hardware support in this simulator
-unconditionally relies on dv-sockser.o which is unavailable for your host.
-Please fix this simulator.])
-fi
+frv_extra_objs="$SIM_DV_SOCKSER_O"
+AC_SUBST(frv_extra_objs)
 
 SIM_AC_OUTPUT
--- sim/m32r/ChangeLog	26 Mar 2013 18:00:04 -0000	1.55
+++ sim/m32r/ChangeLog	31 Mar 2013 00:35:45 -0000
@@ -1,3 +1,12 @@
+2013-03-30  Joel Sherrill  <joel.sherrill@oarcorp.com>
+	    Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Add m32r_extra_objs. Change simulator hardware
+	from always on to defaulting to yes it is enabled.
+	* Makefile.in: Conditionalize reference to dv-sockser.o.
+	* tconfig.in: Delete HAVE_DV_SOCKSER logic that was under "#if 0".
+	* configure: Regenerated.
+
 2013-03-26  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
--- sim/m32r/Makefile.in	1 Jan 2013 06:41:38 -0000	1.22
+++ sim/m32r/Makefile.in	31 Mar 2013 00:35:45 -0000
@@ -24,9 +24,6 @@ M32RX_OBJS = m32rx.o cpux.o decodex.o mo
 M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o
 TRAPS_OBJ = @traps_obj@
 
-CONFIG_DEVICES = dv-sockser.o
-CONFIG_DEVICES =
-
 SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
@@ -42,7 +39,7 @@ SIM_OBJS = \
 	$(M32R2_OBJS) \
 	$(TRAPS_OBJ) \
 	devices.o \
-	$(CONFIG_DEVICES)
+	$(m32r_extra_objs)
 
 # Extra headers included by sim-main.h.
 SIM_EXTRA_DEPS = \
--- sim/m32r/configure	26 Mar 2013 18:00:04 -0000	1.27
+++ sim/m32r/configure	31 Mar 2013 00:35:46 -0000
@@ -601,6 +601,7 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 cgen_breaks
+m32r_extra_objs
 SIM_DV_SOCKSER_O
 sim_extra_cflags
 traps_obj
@@ -12279,7 +12280,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12282 "configure"
+#line 12283 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12385,7 +12386,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12388 "configure"
+#line 12389 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13354,7 +13355,7 @@ fi
 
 
 
-if test x"always" != x"no"; then
+if test x"yes" != x"no"; then
   enable_sim_hardware=yes
 else
   enable_sim_hardware=no
@@ -13385,7 +13386,7 @@ case ${enable_sim_hardware} in
 esac
 
 if test "$sim_hw_p" != yes; then
-  if test "always" = "always"; then
+  if test "yes" = "always"; then
     as_fn_error "Sorry, but this simulator requires that hardware support
 be enabled. Please configure without --disable-hw-support." "$LINENO" 5
   fi
@@ -13468,12 +13469,7 @@ fi
   esac
 fi
 
-
-if test -z "$SIM_DV_SOCKSER_O"; then
-	as_fn_error "Sorry, but hardware support in this simulator unconditionally
-relies on dv-sockser.o which is unavailable for your host. Please fix this
-simulator." "$LINENO" 5
-fi
+m32r_extra_objs="$SIM_DV_SOCKSER_O"
 
 
 
--- sim/m32r/configure.ac	23 Mar 2013 15:07:30 -0000	1.6
+++ sim/m32r/configure.ac	31 Mar 2013 00:35:46 -0000
@@ -27,13 +27,8 @@ SIM_AC_OPTION_CGEN_MAINT
 AC_SUBST(traps_obj)
 AC_SUBST(sim_extra_cflags)
 
-SIM_AC_OPTION_HARDWARE(always,"","")
-
-if test -z "$SIM_DV_SOCKSER_O"; then
-	AC_MSG_ERROR([Sorry, but hardware support in this simulator unconditionally
-relies on dv-sockser.o which is unavailable for your host. Please fix this
-simulator.])
-fi
-
+SIM_AC_OPTION_HARDWARE(yes,"","")
+m32r_extra_objs="$SIM_DV_SOCKSER_O"
+AC_SUBST(m32r_extra_objs)
 
 SIM_AC_OUTPUT
--- sim/m32r/tconfig.in	16 Apr 1999 01:35:06 -0000	1.1.1.1
+++ sim/m32r/tconfig.in	31 Mar 2013 00:35:46 -0000
@@ -35,9 +35,6 @@ MODULE_INSTALL_FN dv_sockser_install;
 #define SIM_BREAKPOINT { 0x10, 0xf1 }
 #define SIM_BREAKPOINT_SIZE 2
 #endif
-#if 0
-#define HAVE_DV_SOCKSER
-#endif
 
 /* This is a global setting.  Different cpu families can't mix-n-match -scache
    and -pbb.  However some cpu families may use -simple while others use

Attachment: signature.asc
Description: This is a digitally signed message part.

References:
- one week to gdb-7.6 release?
  - From: Joel Brobecker
- Re: one week to gdb-7.6 release?
  - From: Ralf Corsepius
- m32r sim was Re: one week to gdb-7.6 release?
  - From: Joel Sherrill

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]