This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: ARM Simulator build broken
- From: Richard Earnshaw <rearnsha at gcc dot gnu dot org>
- To: Hans-Peter Nilsson <hp at axis dot com>
- Cc: gdb-patches at sources dot redhat dot com
- Date: Tue, 16 Nov 2004 15:23:45 +0000
- Subject: Re: ARM Simulator build broken
- Organization: GNU
- References: <1100608818.25423.66.camel@pc960.cambridge.arm.com>
On Tue, 2004-11-16 at 12:40, Richard Earnshaw wrote:
> 2004-11-16 Hans-Peter Nilsson <hp@axis.com>
>
> * sim-config.c (sim_config): Recognize when a bfd has unspecified
> endian information.
>
> * Make-common.in (sim-load.o): Depend on $(sim_main_headers) and
> $(remote_sim_h) too.
> (sim_main_headers): Add sim-utils.h.
>
> This patch breaks the ARM simulator build. The patch introduces a
> dependency of sim-load on sim-main.h which isn't needed, and the ARM
> simulator does not provide such a header (since it doesn't build any of
> the other files in sim/common).
>
> R.
Here's my proposed patch:
<date> Richard Earnshaw <rearnsha@arm.com>
* Make-common.in (sim_basics_headers): New.
(sim_main_headers): Move basics headers and sub-dependencies
to sim_basics_headers). Add the dependencies through that.
(sim-load.c): Depend on sim_basics_headers not
sim_main_headers.
OK?
Index: Make-common.in
===================================================================
RCS file: /cvs/src/src/sim/common/Make-common.in,v
retrieving revision 1.14
diff -p -r1.14 Make-common.in
*** Make-common.in 16 Nov 2004 07:02:26 -0000 1.14
--- Make-common.in 16 Nov 2004 15:20:21 -0000
*************** sim_main_headers = \
*** 300,322 ****
sim-main.h \
$(srccom)/sim-assert.h \
$(srccom)/sim-base.h \
- $(srccom)/sim-basics.h \
- $(srccom)/sim-config.h \
$(srccom)/sim-cpu.h \
$(srccom)/sim-engine.h \
$(srccom)/sim-events.h \
- $(srccom)/sim-inline.h \
$(srccom)/sim-memopt.h \
$(srccom)/sim-model.h \
$(srccom)/sim-module.h \
$(srccom)/sim-profile.h \
- $(srccom)/sim-signal.h \
$(srccom)/sim-trace.h \
- $(srccom)/sim-utils.h \
$(srccom)/sim-watch.h \
! tconfig.h \
$(SIM_EXTRA_DEPS)
# Exported version of sim_main_headers.
SIM_MAIN_DEPS = \
$(sim_main_headers)
--- 300,329 ----
sim-main.h \
$(srccom)/sim-assert.h \
$(srccom)/sim-base.h \
$(srccom)/sim-cpu.h \
$(srccom)/sim-engine.h \
$(srccom)/sim-events.h \
$(srccom)/sim-memopt.h \
$(srccom)/sim-model.h \
$(srccom)/sim-module.h \
$(srccom)/sim-profile.h \
$(srccom)/sim-trace.h \
$(srccom)/sim-watch.h \
! $(sim_basics_headers) \
$(SIM_EXTRA_DEPS)
+ sim_basics_headers = \
+ $(srccom)/sim-basics.h \
+ tconfig.h \
+ $(srccom)/sim-config.h \
+ $(srccom)/sim-inline.h \
+ $(srccom)/sim-types.h \
+ $(srccom)/sim-bits.h \
+ $(srccom)/sim-endian.h \
+ $(srccom)/sim-signal.h \
+ $(srccom)/sim-arange.h \
+ $(srccom)/sim-utils.h
+
# Exported version of sim_main_headers.
SIM_MAIN_DEPS = \
$(sim_main_headers)
*************** sim-utils.o: $(srccom)/sim-utils.c $(sim
*** 473,479 ****
sim-watch.o: $(srccom)/sim-watch.c $(sim_main_headers)
$(CC) -c $(srccom)/sim-watch.c $(ALL_CFLAGS)
! sim-load.o: $(srccom)/sim-load.c $(callback_h) $(sim_main_headers) $(remote_sim_h)
$(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS)
--- 480,486 ----
sim-watch.o: $(srccom)/sim-watch.c $(sim_main_headers)
$(CC) -c $(srccom)/sim-watch.c $(ALL_CFLAGS)
! sim-load.o: $(srccom)/sim-load.c $(callback_h) $(sim_basics_headers) $(remote_sim_h)
$(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS)