aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMichael Meissner <gnu@the-meissners.org>1996-09-04 19:11:53 +0000
committerMichael Meissner <gnu@the-meissners.org>1996-09-04 19:11:53 +0000
commit9b86c7e2e203f0a739adda41c867594df2b99561 (patch)
tree5c679219e94c5e775112f799162c6b61e48cb3d7 /sim
parent1eaaf3050ed63a769b480ba2e5ef08396567eb71 (diff)
downloadgdb-9b86c7e2e203f0a739adda41c867594df2b99561.zip
gdb-9b86c7e2e203f0a739adda41c867594df2b99561.tar.gz
gdb-9b86c7e2e203f0a739adda41c867594df2b99561.tar.bz2
Second pass at canadian cross
Diffstat (limited to 'sim')
-rw-r--r--sim/d10v/ChangeLog10
-rw-r--r--sim/d10v/Makefile.in29
2 files changed, 29 insertions, 10 deletions
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index aaa1cf4..32381d8 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -42,8 +42,16 @@ Wed Sep 4 11:35:17 1996 Michael Meissner <meissner@tiktok.cygnus.com>
(CC_FOR_BUILD,gencode): Use CC_FOR_BUILD to compile gencode.
(run): By default, the math library is not needed to be linked
in.
- ({BFD,OPCODES,LIBIBERTY}_LIB): Define as variables so they can be
+ ({BFD,LIBIBERTY}_LIB): Define as variables so they can be
overridden.
+ (VPATH): Don't set to anything but @srcdir@ to work with non-GNU
+ makes.
+ ({run,callback}.o): Provide explicit paths to their appropriate
+ source directories.
+ (gencode{,.o},d10v-opc.o): Split compilation into creating object
+ and linking. Instead of linking in libopcodes.a, just compile
+ d10v-opc.o directly to handle canadian cross.
+ (CSEARCH): Add opcodes directory.
* configure.in (--enable-sim-cflags): New switch to allow user to
set the defaults.
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index c56321b..56becf8 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -18,7 +18,7 @@
default: all
-VPATH = @srcdir@:@srcdir@/../common:@srcdir@/../../gdb/
+VPATH = @srcdir@
srcdir = @srcdir@
srcroot = $(srcdir)/../..
@@ -79,24 +79,29 @@ X_LIB=
MATH_LIB=
-INCLUDE = d10v_sim.h
+INCLUDE = d10v_sim.h $(srcdir)/../../gdb/callback.h
INCDIR = $(srcdir)/../../include
CSEARCH = -I. -I$(srcdir) -I../../include \
- -I../../bfd -I$(INCDIR) -I$(srcdir)/../../bfd -I$(srcdir)/../../gdb -I$(srcdir)/../../newlib/libc/sys/d10v
+ -I../../bfd -I$(INCDIR) -I$(srcdir)/../../bfd -I$(srcdir)/../../gdb -I$(srcdir)/../../newlib/libc/sys/d10v \
+ -I$(srcdir)/opcodes
DEP = mkdep
LIBIBERTY_LIB = ../../libiberty/libiberty.a
BFD_LIB = ../../bfd/libbfd.a
-OPCODES_LIB = ../../opcodes/libopcodes.a
all: run libsim.a
run: interp.o $(X) run.o table.o callback.o simops.o
- $(CC) $(CFLAGS) $(CONFIG_CFLAGS) -o run $(X) interp.o table.o callback.o simops.o run.o $(BFD_LIB) $(LIBIBERTY_LIB) $(X_LIB) $(MATH_LIB)
+ $(CC) $(CFLAGS) $(CONFIG_CFLAGS) -o run $(X) interp.o table.o callback.o simops.o run.o \
+ $(BFD_LIB) $(LIBIBERTY_LIB) $(X_LIB) $(MATH_LIB)
interp.o:interp.c table.c $(INCLUDE)
-run.o:run.c $(INCLUDE)
-simops.o:simops.c $(INCLUDE)
+run.o: $(srcdir)/../common/run.c $(INCLUDE)
+ $(CC) -c $(CFLAGS) $(CONFIG_CFLAGS) $<
+
+simops.o: simops.c $(INCLUDE)
+callback.o: $(srcdir)/../../gdb/callback.c $(INCLUDE)
+ $(CC) -c $(CFLAGS) $(CONFIG_CFLAGS) $<
libsim.a:interp.o table.o simops.o
$(AR) $(ARFLAGS) libsim.a interp.o table.o simops.o
@@ -108,8 +113,14 @@ simops.h: gencode
table.c: gencode simops.h
./gencode >$@
-gencode: gencode.c ../../opcodes/libopcodes.a $(INCLUDE)
- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o gencode $(srcdir)/gencode.c $(OPCODES_LIB)
+gencode.o: gencode.c $(INCLUDE)
+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gencode.c
+
+d10v-opc.o: $(srcdir)/../../opcodes/d10v-opc.c
+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c
+
+gencode: gencode.o d10v-opc.o
+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o gencode gencode.o d10v-opc.o $(BUILD_LIB)
.c.o:
$(CC) -c $(CFLAGS) $(CONFIG_CFLAGS) $<