gdb/

	* config/sparc/embed.mt: New file.
	* configure.tgt (sparc-*-rtems*): Use embed.mt.
sim/
	* configure.ac (sparc-*-rtems*|sparc-*-elf*): Enable erc32 simulator.
	* Makefile.in (FLAGS_TO_PASS): Include libdir.
	* configure: Regenerated.
sim/erc32/
	* Makefile.in (func.o, help.o): Correct dependencies.
	* Makefile.in (install-sis): Honor DESTDIR.

9 files changed, 43 insertions, 3 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 239b96c..80297e0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-08  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* config/sparc/embed.mt: New file.
+	* configure.tgt (sparc-*-rtems*): Use embed.mt.
+
 2006-08-08  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.in (objfiles.o, symfile.o): Update.
diff --git a/gdb/config/sparc/embed.mt b/gdb/config/sparc/embed.mt
new file mode 100644
index 0000000..5d3039c
--- /dev/null
+++ b/gdb/config/sparc/embed.mt
@@ -0,0 +1,5 @@
+# Target: SPARC embedded with simulator
+TDEPFILES= sparc-tdep.o
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/erc32/libsim.a
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index bbf2496..0e1911d 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -204,6 +204,7 @@ sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
 sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
 			gdb_target=sol2-64
 			;;
+sparc-*-rtems*)		gdb_target=embed ;;
 sparc-*-*)		gdb_target=sparc ;;
 sparc64-*-*)		gdb_target=sparc64 ;;
 
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 7975de3..b68d793 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-08  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* configure.ac (sparc-*-rtems*|sparc-*-elf*): Enable erc32 simulator.
+	* Makefile.in (FLAGS_TO_PASS): Include libdir.
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* cris/configure: Regenerated.
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 3960620..28ed0a8 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -84,6 +84,7 @@ FLAGS_TO_PASS = \
 	"exec_prefix=$(exec_prefix)" \
 	"bindir=$(bindir)" \
 	"mandir=$(mandir)" \
+	"libdir=$(libdir)" \
 	"against=$(against)" \
 	"AR=$(AR)" \
 	"AR_FLAGS=$(AR_FLAGS)" \
diff --git a/sim/configure b/sim/configure
index 8346c59..cc9a915 100755
--- a/sim/configure
+++ b/sim/configure
@@ -286,6 +286,7 @@ ac_subdirs_all="$ac_subdirs_all mips"
 ac_subdirs_all="$ac_subdirs_all mn10300"
 ac_subdirs_all="$ac_subdirs_all sh64"
 ac_subdirs_all="$ac_subdirs_all sh"
+ac_subdirs_all="$ac_subdirs_all erc32"
 ac_subdirs_all="$ac_subdirs_all ppc"
 ac_subdirs_all="$ac_subdirs_all v850"
 ac_subdirs_all="$ac_subdirs_all testsuite"
@@ -3525,6 +3526,14 @@ subdirs="$subdirs sh"
 	   testsuite=yes
 	   common=yes
 	   ;;
+       sparc-*-rtems*|sparc-*-elf*)
+
+
+subdirs="$subdirs erc32"
+
+	   testsuite=yes
+	   common=yes
+	   ;;
        powerpc*-*-* )
 
 
diff --git a/sim/configure.ac b/sim/configure.ac
index 205482b..b58206e 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -115,6 +115,11 @@ if test "${enable_sim}" != no; then
 	   testsuite=yes
 	   common=yes
 	   ;;
+       sparc-*-rtems*|sparc-*-elf*)
+	   AC_CONFIG_SUBDIRS(erc32)
+	   testsuite=yes
+	   common=yes
+	   ;;
        powerpc*-*-* )
            AC_CONFIG_SUBDIRS(ppc)
 	   common=yes
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index e885bda..7cb028f 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.in (func.o, help.o): Correct dependencies.
+
+2006-08-08  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.in (install-sis): Honor DESTDIR.
+
 2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
 
 	* configure: Regenerated.
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index 845815a..bb4396b 100644
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -53,7 +53,7 @@ end.h: end
 # Copy the files into directories where they will be run.
 install-sis: installdirs
 	n=`echo sis | sed '$(program_transform_name)'`; \
-	$(INSTALL_PROGRAM) sis$(EXEEXT) $(bindir)/$$n$(EXEEXT)
+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
 
 clean-sis:
 	rm -f sis end end.h
@@ -69,7 +69,7 @@ configure:
 erc32.o: erc32.c sis.h end.h
 exec.o: exec.c sis.h end.h
 float.o: float.c sis.h end.h
-func.o: func.c
-help.o: help.c
+func.o: func.c sis.h end.h
+help.o: help.c sis.h end.h
 interf.o: interf.c sis.h end.h 
 sis.o: sis.c sis.h end.h