Tidy up formatting.

[deliverable/binutils-gdb.git] / sim / common / Make-common.in

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 71b4f69a612484a14b0caf174e83aadcd3ab03b6..7c25d6c125f0947b81eb5c6091499d59c933cceb 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -94,8 +94,11 @@ SIM_RESERVED_BITS = @sim_reserved_bits@
 SIM_SCACHE = @sim_scache@
 SIM_SMP = @sim_smp@
 SIM_STDCALL = @sim_stdcall@
-SIM_WARNINGS = @build_warnings@
 SIM_XOR_ENDIAN = @sim_xor_endian@
+WARN_CFLAGS = @WARN_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+SIM_WARN_CFLAGS = $(WARN_CFLAGS)
+SIM_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
 HDEFINES = @HDEFINES@
 TDEFINES =
@@ -214,7 +217,8 @@ CONFIG_CFLAGS = \
        $(SIM_SCACHE) \
        $(SIM_SMP) \
        $(SIM_STDCALL) \
-       $(SIM_WARNINGS) \
+       $(SIM_WARN_CFLAGS) \
+       $(SIM_WERROR_CFLAGS) \
        $(SIM_XOR_ENDIAN) \
        $(SIM_HARDWARE) \
        $(SIM_EXTRA_CFLAGS) \
@@ -395,7 +399,6 @@ sim-fpu.o: $(srccom)/sim-fpu.c $(sim-fpu_h) \
          $(SIM_EXTRA_DEPS)
        $(CC) -c $(srccom)/sim-fpu.c $(ALL_CFLAGS)
 
-
 sim-hload.o: $(srccom)/sim-hload.c $(sim-assert_h) \
          $(srcroot)/include/remote-sim.h \
          $(SIM_EXTRA_DEPS)
@@ -556,7 +559,9 @@ CGEN_MAIN_CPU_DEPS = \
        $(SIM_MAIN_DEPS) \
        $(CGEN_INCLUDE_DEPS) \
        $(srccom)/cgen-ops.h \
-       $(srccom)/cgen-mem.h
+       $(srccom)/cgen-mem.h \
+       $(srccom)/cgen-par.h \
+       $(srccom)/cgen-fpu.h
 
 cgen-run.o: $(srccom)/cgen-run.c $(sim_main_headers)
        $(CC) -c $(srccom)/cgen-run.c $(ALL_CFLAGS)
@@ -567,10 +572,20 @@ cgen-scache.o: $(srccom)/cgen-scache.c $(sim_main_headers)
 cgen-trace.o: $(srccom)/cgen-trace.c $(sim_main_headers)
        $(CC) -c $(srccom)/cgen-trace.c $(ALL_CFLAGS)
 
+cgen-fpu.o: $(srccom)/cgen-fpu.c $(sim_main_headers) $(sim-fpu_h)
+       $(CC) -c $(srccom)/cgen-fpu.c $(ALL_CFLAGS)
+
+cgen-accfp.o: $(srccom)/cgen-accfp.c $(sim_main_headers) $(sim-fpu_h)
+       $(CC) -c $(srccom)/cgen-accfp.c $(ALL_CFLAGS)
+
 cgen-utils.o: $(srccom)/cgen-utils.c $(sim_main_headers) \
          $(srccom)/cgen-mem.h $(srccom)/cgen-ops.h $(srccom)/cgen-engine.h
        $(CC) -c $(srccom)/cgen-utils.c $(ALL_CFLAGS)
 
+cgen-par.o: $(srccom)/cgen-par.c $(sim_main_headers) \
+         $(srccom)/cgen-mem.h $(srccom)/cgen-par.h
+       $(CC) -c $(srccom)/cgen-par.c $(ALL_CFLAGS)
+
 # Support targets.
 
 install: install-common $(SIM_EXTRA_INSTALL)