2004-01-28 RTEMS

	* buildall.in, buildalltar.in, binutils/Makefile.am,
	cpukit/Makefile.am, gcc3newlib/Makefile.am, gccnewlib/Makefile.am,
	gdb/Makefile.am: Attempt to convert all c4x-rtems references to
	tic4x-rtems. Left the rtems documentation alone.

8 files changed, 26 insertions, 29 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 2b1d16a3fe..3a398fada0 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,12 @@
 2004-01-28	RTEMS
 
+	* buildall.in, buildalltar.in, binutils/Makefile.am,
+	cpukit/Makefile.am, gcc3newlib/Makefile.am, gccnewlib/Makefile.am,
+	gdb/Makefile.am: Attempt to convert all c4x-rtems references to
+	tic4x-rtems. Left the rtems documentation alone.
+
+2004-01-28	RTEMS
+
 	* configure.ac: Enable OS versioning by default for 4.7 branch.
 	* setup.def: Update binutils RPM version and build new gcc 3.2.3 RPMs.
 	* autotools/autoconf-rtems.spec.in, autotools/automake-rtems.spec.in:
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index 884e9424a6..5c44f8d1c1 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -22,10 +22,6 @@ arm-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
 RPM_SPECS_DATA += arm-rtems@osversion@-$(BINUTILSVERS).spec
 
-c4x-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems@osversion@ > $@
-RPM_SPECS_DATA += c4x-rtems@osversion@-$(BINUTILSVERS).spec
-
 h8300-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@
 RPM_SPECS_DATA += h8300-rtems@osversion@-$(BINUTILSVERS).spec
diff --git a/scripts/buildall.in b/scripts/buildall.in
index eb9e06ca0b..6b163fac79 100755
--- a/scripts/buildall.in
+++ b/scripts/buildall.in
@@ -69,7 +69,7 @@ fi
 
 # This is the full buildable set.
 if [ "X${TARGETS}" = "X" ] ; then
-  # do not include c4x as primary targets
+  # do not include tic4x as primary targets
   # do not include sh-elf or i960-elf secondary targets
   TARGETS="arm-rtems h8300-rtems i386-rtems i960-rtems m68k-rtems \
     mips-rtems powerpc-rtems sh-rtems sparc-rtems"
diff --git a/scripts/buildalltar.in b/scripts/buildalltar.in
index 342fd8ba65..adb9697b0e 100644
--- a/scripts/buildalltar.in
+++ b/scripts/buildalltar.in
@@ -101,7 +101,7 @@ fi
 
 # This is the full buildable set.
 if [ "X${TARGETS}" = "X" ] ; then
-  # do not include c4x as primary targets
+  # do not include tic4x as primary targets
   # do not include sh-elf or i960-elf secondary targets
   TARGETS="arm-rtems h8300-rtems i386-rtems \
      m68k-rtems mips-rtems powerpc-rtems  \
diff --git a/scripts/cpukit/Makefile.am b/scripts/cpukit/Makefile.am
index 2fd34bb636..e7456ef5b1 100644
--- a/scripts/cpukit/Makefile.am
+++ b/scripts/cpukit/Makefile.am
@@ -18,13 +18,9 @@ rtems-cpukit.spec.in: $(SUBPACKAGES)
 	cat $^ > $@
 CLEANFILES = rtems-cpukit.spec.in
 
-c4x-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . c4x-rtems@osversion@ > $@
-RPM_SPECS_DATA = c4x-rtems@osversion@-cpukit.spec
-
 h8300-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . h8300-rtems@osversion@ > $@
-RPM_SPECS_DATA += h8300-rtems@osversion@-cpukit.spec
+RPM_SPECS_DATA = h8300-rtems@osversion@-cpukit.spec
 
 i386-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems@osversion@ > $@
@@ -58,6 +54,10 @@ sparc-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems@osversion@ > $@
 RPM_SPECS_DATA += sparc-rtems@osversion@-cpukit.spec
 
+tic4x-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . tic4x-rtems@osversion@ > $@
+RPM_SPECS_DATA += tic4x-rtems@osversion@-cpukit.spec
+
 EXTRA_DIST = $(SUBPACKAGES)
 
 CLEANFILES += $(RPM_SPECS_DATA)
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index 43040caaf3..e1742dd344 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -28,14 +28,6 @@ arm-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
 RPM_SPECS_DATA += arm-rtems@osversion@-$(GCC3NEWLIBVERS).spec
 
-c4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems@osversion@ > $@
-RPM_SPECS_DATA += c4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec
-
-tic4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache tic4x-rtems@osversion@ > $@
-RPM_SPECS_DATA += tic4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec
-
 h8300-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@
 RPM_SPECS_DATA += h8300-rtems@osversion@-$(GCC3NEWLIBVERS).spec
@@ -72,6 +64,10 @@ sparc-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems@osversion@ > $@
 RPM_SPECS_DATA += sparc-rtems@osversion@-$(GCC3NEWLIBVERS).spec
 
+tic4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache tic4x-rtems@osversion@ > $@
+RPM_SPECS_DATA += tic4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec
+
 CLEANFILES += $(RPM_SPECS_DATA)
 
 EXTRA_DIST = $(SUBPACKAGES)
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 9fc9378267..9352b75a46 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -34,9 +34,6 @@ MKGCCNEWLIB_C_ONLY_SPEC_DEPS = $(top_builddir)/mkgccnewlibspec \
 arm-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . arm-rtems
 
-c4x-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIB_C_ONLY_SPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache -o . c4x-rtems
-
 h8300-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIB_C_ONLY_SPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache -o . h8300-rtems
 
@@ -64,8 +61,8 @@ sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-RPM_SPECS_DATA = arm-rtems-$(GCCNEWLIBVERS).spec \
-    c4x-rtems-$(GCCNEWLIBVERS).spec h8300-rtems-$(GCCNEWLIBVERS).spec \
+RPM_SPECS_DATA = \
+    arm-rtems-$(GCCNEWLIBVERS).spec h8300-rtems-$(GCCNEWLIBVERS).spec \
     i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \
     m68k-rtems-$(GCCNEWLIBVERS).spec mips-rtems-$(GCCNEWLIBVERS).spec \
     powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index d6d75b7a7a..ce2ea7059e 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -26,11 +26,6 @@ arm-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
 RPM_SPECS_DATA += arm-rtems@osversion@-$(GDBVERS).spec
 
-# does not build with 5.2
-# c4x-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-# 	$(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems@osversion@ > $@
-# RPM_SPECS_DATA += c4x-rtems@osversion@-$(GDBVERS).spec
-
 h8300-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@
 RPM_SPECS_DATA += h8300-rtems@osversion@-$(GDBVERS).spec
@@ -81,6 +76,12 @@ sparc-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems@osversion@ > $@
 RPM_SPECS_DATA += sparc-rtems@osversion@-$(GDBVERS).spec
 
+# does not build with 5.2
+# tic4x-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+# 	$(MKSPEC) -cfg $(top_builddir)/setup.cache tic4x-rtems@osversion@ > $@
+# RPM_SPECS_DATA += tic4x-rtems@osversion@-$(GDBVERS).spec
+
+
 CLEANFILES += $(RPM_SPECS_DATA)
 
 EXTRA_DIST = $(SUBPACKAGES)