re: [PATCH] include sim/common/sim-fpu.c in PSIM.

matthew green
2001-12-13T06:15:49Z

One concern is with the Makefile.in change. From memory your ment to
use $(srcdir)/../..... and $< isn't a good idea either - check Ben
Harris's recent changes to gdb's Makefile.in.

OK, thanks. here's the Makefile.in patch again. not sure but i think
i copied these from somewhere else originally...

commit OK?

* Makefile.in (LIB_OBJ): Add @sim_fpu@.
(ICACHE_CFLAGS, SEMANTICS_CFLAGS): New variables.
(icache.o, semantics.o): Add new ICACHE_FLAGS & SEMANTICS_FLAGS.
(sim-fpu.o, sim-bits.o, tconfig.h): New targets.

Index: sim/ppc/Makefile.in
===================================================================
RCS file: /cvs/src/src/sim/ppc/Makefile.in,v
retrieving revision 1.2
diff -p -r1.2 Makefile.in
*** Makefile.in 2001/07/16 18:36:37 1.2
--- Makefile.in 2001/12/13 01:15:47
*************** LIB_OBJ = \
*** 306,311 ****
--- 306,312 ----
semantics.o \
idecode.o \
support.o \
+ @sim_fpu@ \
psim.o \
$(PACKAGE_OBJ) \
$(HW_OBJ) \
*************** LIB_OBJ = \
*** 314,319 ****
--- 315,323 ----

GDB_OBJ = sim_calls.o @sim_callback@

+ ICACHE_CFLAGS = @sim_fpu_cflags@
+ SEMANTICS_CFLAGS = @sim_fpu_cflags@
+
HW_SRC = @sim_hw_src@
HW_OBJ = @sim_hw_obj@

*************** device_table.o: device_table.c $(DEVICE_
*** 386,395 ****
cap.o: cap.c cap.h $(BASICS_H)

semantics.o: semantics.c semantics.h $(CPU_H) $(IDECODE_H)
! $(CC) -c $(NOWARN_CFLAGS) $<

icache.o: icache.c icache.h $(IDECODE_H) $(CPU_H)
! $(CC) -c $(NOWARN_CFLAGS) $<

support.o: support.c support.h $(IDECODE_H) $(CPU_H)

--- 390,399 ----
cap.o: cap.c cap.h $(BASICS_H)

semantics.o: semantics.c semantics.h $(CPU_H) $(IDECODE_H)
! $(CC) -c $(SEMANTICS_CFLAGS) $(NOWARN_CFLAGS) $<

icache.o: icache.c icache.h $(IDECODE_H) $(CPU_H)
! $(CC) -c $(ICACHE_CFLAGS) $(NOWARN_CFLAGS) $<

support.o: support.c support.h $(IDECODE_H) $(CPU_H)

*************** callback.o: ../common/callback.c targ-va
*** 421,426 ****
--- 425,440 ----
$(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $<

targ-map.o: targ-map.c targ-vals.h
+
+ sim-fpu.o: $(srcdir)/../common/sim-fpu.c config.h tconfig.h
+ $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/sim-fpu.c
+
+ sim-bits.o: $(srcdir)/../common/sim-bits.c config.h tconfig.h
+ $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/sim-bits.c
+
+ tconfig.h:
+ rm -f tconfig.h
+ echo > tconfig.h

# Rebuild options whenever something changes so the date/time is up to date.
options.o: options.c $(BASICS_H) $(CPU_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) config.status Makefile defines.h