Re: ARM Simulator build broken

[Richard Earnshaw <rearnsha@gcc.gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

On Wed, 2004-11-24 at 18:41, Alexandre Oliva wrote:
> On Nov 17, 2004, Richard Earnshaw <rearnsha@gcc.gnu.org> wrote:
> 
> > ! sim-basics_h = $(srccom)/sim-basics.h \
> > ! 		cconfig_h \
> > ! 		tconfig_h \
> 
> How are the cconfig_h and tconfig_h deps supposed to be resolved?  I
> don't get any other grep matches for these strings within sim, and
> at least the frv sim won't build because sim-core.o needs some
> cconfig_h file that doesn't exist.  What was the idea here?
> $(cconfig_h) and $(tconfig_h), maybe?

Can you test the attached patch?  It fixes the dependency problems I now
see when I correct the sim-load.o dependency.

R.

	* Make-common.in (sim-basics_h): Correct dependencies on
	cconfig.h and tconfig.h
	(sim-load.o): Correct typo in sim-basics_h dependency.



[-- Attachment #2: sim3.patch --]
[-- Type: text/x-patch, Size: 1363 bytes --]

Index: Make-common.in
===================================================================
RCS file: /cvs/src/src/sim/common/Make-common.in,v
retrieving revision 1.15
diff -p -r1.15 Make-common.in
*** Make-common.in	18 Nov 2004 10:21:39 -0000	1.15
--- Make-common.in	25 Nov 2004 10:43:54 -0000
*************** sim-base_h = $(srccom)/sim-base.h \
*** 333,340 ****
  		$(sim-memopt_h) \
  		$(sim-cpu_h)
  sim-basics_h = $(srccom)/sim-basics.h \
! 		cconfig_h \
! 		tconfig_h \
  		$(sim-config_h) \
  		$(sim-inline_h) \
  		$(sim-types_h) \
--- 333,340 ----
  		$(sim-memopt_h) \
  		$(sim-cpu_h)
  sim-basics_h = $(srccom)/sim-basics.h \
! 		../common/cconfig.h \
! 		tconfig.h \
  		$(sim-config_h) \
  		$(sim-inline_h) \
  		$(sim-types_h) \
*************** sim-utils.o: $(srccom)/sim-utils.c $(sim
*** 506,512 ****
  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_h) $(remote_sim_h)
  	$(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS)
  
  
--- 506,512 ----
  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_h) $(remote_sim_h)
  	$(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS)