This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[wip] ../sim/libsim.a
- From: Andrew Cagney <ac131313 at ges dot redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Wed, 17 Jul 2002 19:59:00 -0400
- Subject: [wip] ../sim/libsim.a
Hello,
The attached is work-in-progress to move libsim.a from
sim/<CPU>/libsim.a to sim/libsim.a.
The change has a number of motivations.
- For a multi-arch GDB to build, it will need to find a way of linking
in multiple simulators. I think the attached is a step in the right
direction - it moves the sim library to a CPU/target independant location.
- It simplifies the configure build stage removing more junk from the
*.mt files (they are getting closer to being redundant).
In terms of details the change does two things:
- changes src/gdb build process to assume that there is always a
simulator (unless --disable-sim is specified) and try to link it in
(looking in ../sim/libsim.a).
- changes src/sim to create sim/libsim.a instead of sim/CPU/libsim.a
Whats missing?
- something in src/sim to create a stub libsim.a when there isn't a
simulator (otherwise GDB won't build)
comments?
Andrew
2002-07-17 Andrew Cagney <cagney@redhat.com>
* Makefile.in (LIB_SIM): Replace SIM, set to @LIB_SIM@.
(CLIBS, CDEPS): Update.
(SIM_OBS): Set to @SIM_OBS@. Delete references to IGNORE_SIM
and IGNORE_SIM_OBS.
* configure.in (IGNORE_SIM, IGNORE_SIM_OBS): Delete definition.
(LIB_SIM, SIM_OBS): Set according to --enable-sim.
* configure: Regenerate.
* config/mips/vr5000.mt (SIM_OBS, SIM): Delete.
* config/mips/vr4xxxel.mt (SIM_OBS, SIM): Delete.
* config/mips/linux.mt (SIM_OBS, SIM): Delete.
* config/mips/vr4300el.mt (SIM_OBS, SIM): Delete.
* config/mips/vr4xxx.mt (SIM_OBS, SIM): Delete.
* config/mips/vr4100.mt (SIM_OBS, SIM): Delete.
* config/mips/tx39.mt (SIM_OBS, SIM): Delete.
* config/mips/embedl64.mt (SIM_OBS, SIM): Delete.
* config/mips/embed64.mt (SIM_OBS, SIM): Delete.
* config/mips/nbsd.mt (SIM_OBS, SIM): Delete.
* config/mips/tx39l.mt (SIM_OBS, SIM): Delete.
* config/mips/embed.mt (SIM_OBS, SIM): Delete.
* config/mips/vr5000el.mt (SIM_OBS, SIM): Delete.
* config/mips/embedl.mt (SIM_OBS, SIM): Delete.
* config/mips/vr4300.mt (SIM_OBS, SIM): Delete.
* config/powerpc/ppcle-sim.mt (SIM_OBS, SIM): Delete.
* config/powerpc/ppc-sim.mt (SIM_OBS, SIM): Delete.
* config/powerpc/nbsd.mt (SIM_OBS, SIM): Delete.
* config/powerpc/linux.mt (SIM_OBS, SIM): Delete.
* config/mn10200/mn10200.mt (SIM_OBS, SIM): Delete.
* config/sparc/sparclite.mt (SIM_OBS, SIM): Delete.
* config/sparc/sp64sim.mt (SIM_OBS, SIM): Delete.
* config/h8300/h8300.mt (SIM_OBS, SIM): Delete.
* config/v850/v850.mt (SIM_OBS, SIM): Delete.
* config/h8500/h8500.mt (SIM_OBS, SIM): Delete.
* config/m68hc11/m68hc11.mt (SIM_OBS, SIM): Delete.
* config/arm/embed.mt (SIM_OBS, SIM): Delete.
* config/m32r/m32r.mt (SIM_OBS, SIM): Delete.
* config/mcore/mcore.mt (SIM_OBS, SIM): Delete.
* config/mn10300/mn10300.mt (SIM_OBS, SIM): Delete.
* config/d10v/d10v.mt (SIM_OBS, SIM): Delete.
* config/sh/nbsd.mt (SIM_OBS, SIM): Delete.
* config/sh/embed.mt (SIM_OBS, SIM): Delete.
* config/sh/linux.mt (SIM_OBS, SIM): Delete.
* config/i960/mon960.mt (SIM_OBS, SIM): Delete.
* config/z8k/z8k.mt (SIM, SIM_OBS): Delete.
* config/avr/avr.mt: Remove comments refering to SIM_OBS and SIM.
* config/xstormy16/xstormy16.mt: Ditto.
Index: sim/common/ChangeLog
2002-07-17 Andrew Cagney <cagney@redhat.com>
* Make-common.in (LIBSIM): Define. Replace libsim.a with
$(LIBSIM).
Index: sim/ppc/ChangeLog
2002-07-17 Andrew Cagney <cagney@redhat.com>
* Makefile.in (TARGETLIB): Put libsim.a in directory above.
Index: gdb/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.220
diff -u -r1.220 Makefile.in
--- gdb/Makefile.in 16 Jul 2002 15:19:18 -0000 1.220
+++ gdb/Makefile.in 17 Jul 2002 23:27:21 -0000
@@ -217,9 +217,9 @@
OP_INCLUDE = $(INCLUDE_DIR)/opcode
OPCODES_CFLAGS = -I$(OP_INCLUDE)
-# The simulator is usually nonexistent; targets that include one
-# should set this to list all the .o or .a files to be linked in.
-SIM =
+# The simulator library. If a simulator is being linked in, this
+# points to its corresponding library.
+LIB_SIM = @LIB_SIM@
WIN32LIBS = @WIN32LIBS@
@@ -359,10 +359,10 @@
INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty \
$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
-lmmalloc -lintl -liberty
-CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(INTL) $(LIBIBERTY) \
+CLIBS = $(LIB_SIM) $(BFD) $(READLINE) $(OPCODES) $(INTL) $(LIBIBERTY) \
$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
$(MMALLOC) $(LIBIBERTY) $(WIN32LIBS)
-CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
+CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(LIB_SIM) $(BFD) $(READLINE) \
$(OPCODES) $(MMALLOC) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS)
ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
@@ -394,7 +394,7 @@
REMOTE_OBS = remote.o dcache.o remote-utils.o tracepoint.o ax-general.o ax-gdb.o
# This is remote-sim.o if a simulator is to be linked in.
-SIM_OBS =
+SIM_OBS = @SIM_OBS@
ANNOTATE_OBS = annotate.o
@@ -402,13 +402,6 @@
@host_makefile_frag@
@target_makefile_frag@
# End of host and target-dependent makefile fragments
-
-# Possibly ignore the simulator. If the simulator is being ignored,
-# these expand into SIM= and SIM_OBJ=, overriding the entries from
-# target_makefile_frag
-#
-@IGNORE_SIM@
-@IGNORE_SIM_OBS@
FLAGS_TO_PASS = \
"prefix=$(prefix)" \
Index: gdb/configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.89
diff -u -r1.89 configure.in
--- gdb/configure.in 9 Jul 2002 22:59:36 -0000 1.89
+++ gdb/configure.in 17 Jul 2002 23:27:25 -0000
@@ -1107,13 +1107,11 @@
AC_PATH_X
-# Unlike the sim directory, whether a simulator is linked is controlled by
-# presence of a SIM= and a SIM_OBS= definition in the target '.mt' file.
-# This code just checks for a few cases where we'd like to ignore those
-# definitions, even when they're present in the '.mt' file. These cases
-# are when --disable-sim is specified, or if the simulator directory is
-# not part of the source tree.
-#
+# Unless configured to do otherwise, GDB assumes that there is a
+# simulator (and libsim.a). This code checks --disable-sim and hence
+# the case where the simulator should not be linked in. If there
+# isn't a simulator a dummy libsim.a library is linked in.
+
AC_ARG_ENABLE(sim,
[ --enable-sim Link gdb with simulator],
[echo "enable_sim = $enable_sim";
@@ -1130,15 +1128,15 @@
fi
if test "${ignore_sim}" = "true"; then
- IGNORE_SIM="SIM="
- IGNORE_SIM_OBS="SIM_OBS="
+ LIB_SIM=""
+ SIM_OBS=""
else
- IGNORE_SIM=""
- IGNORE_SIM_OBS=""
+ LIB_SIM=../sim/libsim.a
+ SIM_OBS=remote-sim.o
AC_DEFINE(WITH_SIM)
fi
-AC_SUBST(IGNORE_SIM)
-AC_SUBST(IGNORE_SIM_OBS)
+AC_SUBST(LIB_SIM)
+AC_SUBST(SIM_OBS)
AC_SUBST(ENABLE_CFLAGS)
Index: gdb/config/arm/embed.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/arm/embed.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 embed.mt
--- gdb/config/arm/embed.mt 22 Dec 1999 21:45:12 -0000 1.1.1.1
+++ gdb/config/arm/embed.mt 17 Jul 2002 23:27:25 -0000
@@ -2,6 +2,3 @@
TDEPFILES= arm-tdep.o remote-rdp.o remote-rdi.o
TDEPLIBS= rdi-share/libangsd.a
TM_FILE= tm-embed.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/arm/libsim.a
Index: gdb/config/avr/avr.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/avr/avr.mt,v
retrieving revision 1.1
diff -u -r1.1 avr.mt
--- gdb/config/avr/avr.mt 25 Apr 2002 20:34:56 -0000 1.1
+++ gdb/config/avr/avr.mt 17 Jul 2002 23:27:25 -0000
@@ -1,12 +1,2 @@
# Target: AVR
TDEPFILES= avr-tdep.o
-
-#
-# There is no simulator provided with gdb (yet).
-#
-# See <http://savannah.gnu.org/projects/simulavr/> for the simulator
-# used during development of avr support for gdb.
-#
-# Simulator: AVR
-#SIM_OBS = remote-sim.o
-#SIM = ../sim/avr/libsim.a
Index: gdb/config/d10v/d10v.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/d10v/d10v.mt,v
retrieving revision 1.2
diff -u -r1.2 d10v.mt
--- gdb/config/d10v/d10v.mt 11 Jul 2001 17:58:15 -0000 1.2
+++ gdb/config/d10v/d10v.mt 17 Jul 2002 23:27:25 -0000
@@ -1,4 +1,2 @@
# Target: Mitsubishi D10V processor
TDEPFILES= d10v-tdep.o
-SIM_OBS= remote-sim.o
-SIM= ../sim/d10v/libsim.a
Index: gdb/config/h8300/h8300.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/h8300/h8300.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 h8300.mt
--- gdb/config/h8300/h8300.mt 16 Apr 1999 01:34:16 -0000 1.1.1.1
+++ gdb/config/h8300/h8300.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: H8300 with HMS monitor, E7000 ICE and H8 simulator
TDEPFILES= h8300-tdep.o remote-e7000.o ser-e7kpc.o monitor.o remote-hms.o dsrec.o
TM_FILE= tm-h8300.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/h8300/libsim.a
Index: gdb/config/h8500/h8500.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/h8500/h8500.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 h8500.mt
--- gdb/config/h8500/h8500.mt 16 Apr 1999 01:34:16 -0000 1.1.1.1
+++ gdb/config/h8500/h8500.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: H8500 with HMS monitor and H8 simulator
TDEPFILES= h8500-tdep.o monitor.o remote-hms.o dsrec.o
TM_FILE= tm-h8500.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/h8500/libsim.a
Index: gdb/config/i960/mon960.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/i960/mon960.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mon960.mt
--- gdb/config/i960/mon960.mt 16 Apr 1999 01:34:20 -0000 1.1.1.1
+++ gdb/config/i960/mon960.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,4 @@
# Target: Intel 960 rom monitor
TDEPFILES= i960-tdep.o monitor.o mon960-rom.o ttyflush.o xmodem.o dsrec.o
TM_FILE= tm-mon960.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/i960/libsim.a
Index: gdb/config/m32r/m32r.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/m32r/m32r.mt,v
retrieving revision 1.4
diff -u -r1.4 m32r.mt
--- gdb/config/m32r/m32r.mt 4 May 2002 15:52:39 -0000 1.4
+++ gdb/config/m32r/m32r.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Mitsubishi m32r processor
TDEPFILES= m32r-tdep.o monitor.o m32r-rom.o dsrec.o
TM_FILE= tm-m32r.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/m32r/libsim.a
Index: gdb/config/m68hc11/m68hc11.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/m68hc11/m68hc11.mt,v
retrieving revision 1.1
diff -u -r1.1 m68hc11.mt
--- gdb/config/m68hc11/m68hc11.mt 27 Jul 2000 07:18:32 -0000 1.1
+++ gdb/config/m68hc11/m68hc11.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,4 @@
# Target: Motorola 68HC11 processor
TDEPFILES= m68hc11-tdep.o
TM_FILE= tm-m68hc11.h
-SIM_OBS= remote-sim.o
-SIM= ../sim/m68hc11/libsim.a -lm
Index: gdb/config/mcore/mcore.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mcore/mcore.mt,v
retrieving revision 1.2
diff -u -r1.2 mcore.mt
--- gdb/config/mcore/mcore.mt 5 Jul 2002 15:07:50 -0000 1.2
+++ gdb/config/mcore/mcore.mt 17 Jul 2002 23:27:25 -0000
@@ -1,4 +1,2 @@
# Target: Motorola MCore processor
TDEPFILES= mcore-tdep.o mcore-rom.o monitor.o dsrec.o
-SIM_OBS = remote-sim.o
-SIM = ../sim/mcore/libsim.a
Index: gdb/config/mips/embed.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/embed.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 embed.mt
--- gdb/config/mips/embed.mt 16 Apr 1999 01:34:22 -0000 1.1.1.1
+++ gdb/config/mips/embed.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian mips board, typically an IDT.
TDEPFILES= mips-tdep.o remote-mips.o remote-array.o
TM_FILE= tm-embed.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/embed64.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/embed64.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 embed64.mt
--- gdb/config/mips/embed64.mt 16 Apr 1999 01:34:22 -0000 1.1.1.1
+++ gdb/config/mips/embed64.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian mips board, typically an IDT.
TDEPFILES= mips-tdep.o remote-mips.o remote-array.o
TM_FILE= tm-embed64.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/embedl.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/embedl.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 embedl.mt
--- gdb/config/mips/embedl.mt 16 Apr 1999 01:34:22 -0000 1.1.1.1
+++ gdb/config/mips/embedl.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian mips board, typically an IDT.
TDEPFILES= mips-tdep.o remote-mips.o remote-array.o
TM_FILE= tm-embedl.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/embedl64.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/embedl64.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 embedl64.mt
--- gdb/config/mips/embedl64.mt 16 Apr 1999 01:34:22 -0000 1.1.1.1
+++ gdb/config/mips/embedl64.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian mips board, typically an IDT.
TDEPFILES= mips-tdep.o remote-mips.o remote-array.o
TM_FILE= tm-embedl64.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/linux.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/linux.mt,v
retrieving revision 1.2
diff -u -r1.2 linux.mt
--- gdb/config/mips/linux.mt 14 Feb 2002 05:48:36 -0000 1.2
+++ gdb/config/mips/linux.mt 17 Jul 2002 23:27:25 -0000
@@ -4,6 +4,3 @@
TM_FILE= tm-linux.h
GDBSERVER_DEPFILES = linux-low.o linux-mips-low.o reg-mips.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/nbsd.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/nbsd.mt,v
retrieving revision 1.1
diff -u -r1.1 nbsd.mt
--- gdb/config/mips/nbsd.mt 21 May 2002 15:58:41 -0000 1.1
+++ gdb/config/mips/nbsd.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: MIPS running NetBSD
TDEPFILES= mips-tdep.o mipsnbsd-tdep.o corelow.o solib.o solib-svr4.o
TM_FILE= tm-nbsd.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/tx39.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/tx39.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tx39.mt
--- gdb/config/mips/tx39.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mips/tx39.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian mips board, typically an IDT.
TDEPFILES= mips-tdep.o remote-mips.o dve3900-rom.o monitor.o dsrec.o
TM_FILE= tm-tx39.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/tx39l.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/tx39l.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tx39l.mt
--- gdb/config/mips/tx39l.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mips/tx39l.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian mips board, typically an IDT.
TDEPFILES= mips-tdep.o remote-mips.o dve3900-rom.o monitor.o dsrec.o
TM_FILE= tm-tx39l.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr4100.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr4100.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vr4100.mt
--- gdb/config/mips/vr4100.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mips/vr4100.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr4100.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr4300.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr4300.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vr4300.mt
--- gdb/config/mips/vr4300.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mips/vr4300.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr4300.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr4300el.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr4300el.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vr4300el.mt
--- gdb/config/mips/vr4300el.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mips/vr4300el.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Little-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr4300el.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr4xxx.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr4xxx.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vr4xxx.mt
--- gdb/config/mips/vr4xxx.mt 7 Dec 1999 03:56:11 -0000 1.1.1.1
+++ gdb/config/mips/vr4xxx.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr4xxx.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr4xxxel.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr4xxxel.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vr4xxxel.mt
--- gdb/config/mips/vr4xxxel.mt 7 Dec 1999 03:56:11 -0000 1.1.1.1
+++ gdb/config/mips/vr4xxxel.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr4xxxel.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr5000.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr5000.mt,v
retrieving revision 1.4
diff -u -r1.4 vr5000.mt
--- gdb/config/mips/vr5000.mt 4 May 2002 15:52:40 -0000 1.4
+++ gdb/config/mips/vr5000.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Big-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr5000.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mips/vr5000el.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mips/vr5000el.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vr5000el.mt
--- gdb/config/mips/vr5000el.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mips/vr5000el.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Little-endian SIM monitor board.
TDEPFILES= mips-tdep.o remote-mips.o
TM_FILE= tm-vr5000el.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
Index: gdb/config/mn10200/mn10200.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mn10200/mn10200.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mn10200.mt
--- gdb/config/mn10200/mn10200.mt 16 Apr 1999 01:34:23 -0000 1.1.1.1
+++ gdb/config/mn10200/mn10200.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: Matsushita mn10200
TDEPFILES= mn10200-tdep.o
TM_FILE= tm-mn10200.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/mn10200/libsim.a
Index: gdb/config/mn10300/mn10300.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/mn10300/mn10300.mt,v
retrieving revision 1.2
diff -u -r1.2 mn10300.mt
--- gdb/config/mn10300/mn10300.mt 12 Aug 2001 03:39:11 -0000 1.2
+++ gdb/config/mn10300/mn10300.mt 17 Jul 2002 23:27:25 -0000
@@ -1,4 +1,2 @@
# Target: Matsushita mn10300
TDEPFILES= mn10300-tdep.o
-SIM_OBS = remote-sim.o
-SIM = ../sim/mn10300/libsim.a
Index: gdb/config/powerpc/linux.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/powerpc/linux.mt,v
retrieving revision 1.5
diff -u -r1.5 linux.mt
--- gdb/config/powerpc/linux.mt 30 May 2002 01:21:52 -0000 1.5
+++ gdb/config/powerpc/linux.mt 17 Jul 2002 23:27:25 -0000
@@ -2,6 +2,3 @@
TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o solib.o \
solib-svr4.o solib-legacy.o
TM_FILE= tm-linux.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/ppc/libsim.a
Index: gdb/config/powerpc/nbsd.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/powerpc/nbsd.mt,v
retrieving revision 1.11
diff -u -r1.11 nbsd.mt
--- gdb/config/powerpc/nbsd.mt 30 May 2002 01:21:53 -0000 1.11
+++ gdb/config/powerpc/nbsd.mt 17 Jul 2002 23:27:25 -0000
@@ -2,6 +2,3 @@
TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o nbsd-tdep.o corelow.o \
solib.o solib-svr4.o
TM_FILE= tm-nbsd.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/ppc/libsim.a
Index: gdb/config/powerpc/ppc-sim.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/powerpc/ppc-sim.mt,v
retrieving revision 1.5
diff -u -r1.5 ppc-sim.mt
--- gdb/config/powerpc/ppc-sim.mt 30 May 2002 01:21:53 -0000 1.5
+++ gdb/config/powerpc/ppc-sim.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: PowerPC running eabi and including the simulator
TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib.o solib-svr4.o
TM_FILE= tm-ppc-eabi.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/ppc/libsim.a
Index: gdb/config/powerpc/ppcle-sim.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/powerpc/ppcle-sim.mt,v
retrieving revision 1.5
diff -u -r1.5 ppcle-sim.mt
--- gdb/config/powerpc/ppcle-sim.mt 30 May 2002 01:21:53 -0000 1.5
+++ gdb/config/powerpc/ppcle-sim.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: PowerPC running eabi in little endian mode under the simulator
TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o ppc-bdm.o ocd.o ppc-sysv-tdep.o solib.o solib-svr4.o
TM_FILE= tm-ppcle-eabi.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/ppc/libsim.a
Index: gdb/config/sh/embed.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/sh/embed.mt,v
retrieving revision 1.1
diff -u -r1.1 embed.mt
--- gdb/config/sh/embed.mt 30 Jan 2001 23:37:07 -0000 1.1
+++ gdb/config/sh/embed.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: Embedded Hitachi Super-H with ICE and simulator
TDEPFILES= sh-tdep.o monitor.o sh3-rom.o remote-e7000.o ser-e7kpc.o dsrec.o
TM_FILE= tm-sh.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh/libsim.a
Index: gdb/config/sh/linux.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/sh/linux.mt,v
retrieving revision 1.3
diff -u -r1.3 linux.mt
--- gdb/config/sh/linux.mt 14 Feb 2002 05:48:39 -0000 1.3
+++ gdb/config/sh/linux.mt 17 Jul 2002 23:27:25 -0000
@@ -1,8 +1,4 @@
# Target: Hitachi Super-H running GNU/Linux
TDEPFILES= sh-tdep.o monitor.o sh3-rom.o remote-e7000.o ser-e7kpc.o dsrec.o solib.o solib-svr4.o solib-legacy.o
TM_FILE= tm-linux.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh/libsim.a
-
GDBSERVER_DEPFILES = linux-low.o linux-sh-low.o reg-sh.o
Index: gdb/config/sh/nbsd.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/sh/nbsd.mt,v
retrieving revision 1.3
diff -u -r1.3 nbsd.mt
--- gdb/config/sh/nbsd.mt 11 May 2002 22:14:19 -0000 1.3
+++ gdb/config/sh/nbsd.mt 17 Jul 2002 23:27:25 -0000
@@ -1,6 +1,3 @@
# Target: SuperH running NetBSD
TDEPFILES= sh-tdep.o shnbsd-tdep.o corelow.o nbsd-tdep.o solib.o solib-svr4.o
TM_FILE= tm-nbsd.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh/libsim.a
Index: gdb/config/sparc/sp64sim.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/sparc/sp64sim.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sp64sim.mt
--- gdb/config/sparc/sp64sim.mt 16 Apr 1999 01:34:25 -0000 1.1.1.1
+++ gdb/config/sparc/sp64sim.mt 17 Jul 2002 23:27:25 -0000
@@ -9,5 +9,3 @@
CC = gcc
MH_CFLAGS = -I${srcdir}/../sim/sp64
-SIM_OBS = remote-sim.o
-SIM = ../sim/sp64/libsim.a
Index: gdb/config/sparc/sparclite.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/sparc/sparclite.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sparclite.mt
--- gdb/config/sparc/sparclite.mt 16 Apr 1999 01:34:25 -0000 1.1.1.1
+++ gdb/config/sparc/sparclite.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,3 @@
# Target: Fujitsu SPARClite processor
TDEPFILES= sparc-tdep.o sparcl-tdep.o
TM_FILE= tm-sparclite.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/erc32/libsim.a
Index: gdb/config/v850/v850.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/v850/v850.mt,v
retrieving revision 1.2
diff -u -r1.2 v850.mt
--- gdb/config/v850/v850.mt 16 May 2002 12:11:38 -0000 1.2
+++ gdb/config/v850/v850.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,2 @@
# Target: NEC V850 processor
TDEPFILES= v850-tdep.o
-# TM_FILE= tm-v850.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/v850/libsim.a
Index: gdb/config/xstormy16/xstormy16.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/xstormy16/xstormy16.mt,v
retrieving revision 1.1
diff -u -r1.1 xstormy16.mt
--- gdb/config/xstormy16/xstormy16.mt 13 Dec 2001 13:34:41 -0000 1.1
+++ gdb/config/xstormy16/xstormy16.mt 17 Jul 2002 23:27:25 -0000
@@ -1,5 +1,2 @@
# Target: Sanyo Xstormy16a processor
TDEPFILES = xstormy16-tdep.o
-# No simulator objects or libraries are needed -- target uses SID.
-# SIM_OBS = remote-sim.o
-# SIM = ../sim/xstormy16/libsim.a
Index: gdb/config/z8k/z8k.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/z8k/z8k.mt,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 z8k.mt
--- gdb/config/z8k/z8k.mt 16 Apr 1999 01:34:26 -0000 1.1.1.1
+++ gdb/config/z8k/z8k.mt 17 Jul 2002 23:27:25 -0000
@@ -1,7 +1,3 @@
# Target: Z8000 with simulator
TDEPFILES= z8k-tdep.o
TM_FILE= tm-z8k.h
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/z8k/libsim.a
-
Index: sim/common/Make-common.in
===================================================================
RCS file: /cvs/src/src/sim/common/Make-common.in,v
retrieving revision 1.8
diff -u -r1.8 Make-common.in
--- sim/common/Make-common.in 14 Jul 2002 17:03:39 -0000 1.8
+++ sim/common/Make-common.in 17 Jul 2002 23:27:28 -0000
@@ -251,16 +251,18 @@
callback_h = $(srcroot)/include/gdb/callback.h
remote_sim_h = $(srcroot)/include/gdb/remote-sim.h
-all: $(SIM_EXTRA_ALL) libsim.a run .gdbinit
+LIBSIM = ../libsim.a
-libsim.a: $(LIB_OBJS)
- rm -f libsim.a
- $(AR) $(AR_FLAGS) libsim.a $(LIB_OBJS)
- $(RANLIB) libsim.a
+all: $(SIM_EXTRA_ALL) $(LIBSIM) run .gdbinit
-run: $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
+$(LIBSIM): $(LIB_OBJS)
+ rm -f $(LIBSIM)
+ $(AR) $(AR_FLAGS) $(LIBSIM) $(LIB_OBJS)
+ $(RANLIB) $(LIBSIM)
+
+run: $(SIM_RUN_OBJS) $(LIBSIM) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) -o run$(EXEEXT) \
- $(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS)
+ $(SIM_RUN_OBJS) $(LIBSIM) $(EXTRA_LIBS)
run.o: $(srccom)/run.c config.h tconfig.h $(remote_sim_h) $(callback_h)
$(CC) -c $(srccom)/run.c $(ALL_CFLAGS)
@@ -507,9 +509,9 @@
hw-events.o: $(srccom)/hw-events.c $(hw_main_headers) $(sim_main_headers)
$(CC) -c $(srccom)/hw-events.c $(ALL_CFLAGS)
-test-hw-events: $(srccom)/hw-events.c libsim.a
+test-hw-events: $(srccom)/hw-events.c $(LIBSIM)
$(CC) $(ALL_CFLAGS) -DMAIN -o test-hw-events$(EXEEXT) \
- $(srccom)/hw-events.c libsim.a $(EXTRA_LIBS)
+ $(srccom)/hw-events.c $(LIBSIM) $(EXTRA_LIBS)
hw-instances.o: $(srccom)/hw-instances.c $(hw_main_headers)
$(CC) -c $(srccom)/hw-instances.c $(ALL_CFLAGS)
@@ -587,7 +589,7 @@
n=`echo run | sed '$(program_transform_name)'`; \
$(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT)
n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
- $(INSTALL_DATA) libsim.a $(libdir)/$$n ; \
+ $(INSTALL_DATA) $(LIBSIM) $(libdir)/$$n ; \
( cd $(libdir) ; $(RANLIB) $$n )
installdirs:
@@ -615,7 +617,7 @@
clean: $(SIM_EXTRA_CLEAN)
rm -f *.[oa] *~ core
- rm -f run libsim.a
+ rm -f run $(LIBSIM)
rm -f gentmap targ-map.c targ-vals.h stamp-tvals
if [ ! -f Make-common.in ] ; then \
rm -f $(BUILT_SRC_FROM_COMMON) ; \
Index: sim/ppc/Makefile.in
===================================================================
RCS file: /cvs/src/src/sim/ppc/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- sim/ppc/Makefile.in 22 Jun 2002 19:10:34 -0000 1.6
+++ sim/ppc/Makefile.in 17 Jul 2002 23:27:30 -0000
@@ -159,7 +159,7 @@
INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC)
-TARGETLIB = libsim.a
+TARGETLIB = ../libsim.a
all: run $(TARGETLIB) $(GDB_OBJ)