summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/ChangeLog7
-rw-r--r--scripts/binutils/Makefile.am4
-rwxr-xr-xscripts/buildall.in6
-rw-r--r--scripts/buildalltar.in6
-rw-r--r--scripts/cpukit/Makefile.am4
-rw-r--r--scripts/gcc3newlib/Makefile.am4
-rw-r--r--scripts/gcc3newlib/gccnewlib.add4
-rw-r--r--scripts/gdb/Makefile.am4
-rw-r--r--scripts/rtems/Makefile.am9
-rw-r--r--scripts/rtemsdoc/.cvsignore1
-rw-r--r--scripts/rtemsdoc/Makefile.am4
11 files changed, 17 insertions, 36 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 40f835dcb4..65f9347f46 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-29 Joel Sherrill <joel@OARcorp.com>
+
+ * buildall.in, buildalltar.in, binutils/Makefile.am,
+ cpukit/Makefile.am, gcc3newlib/Makefile.am, gcc3newlib/gccnewlib.add,
+ gdb/Makefile.am, rtems/Makefile.am, rtemsdoc/.cvsignore,
+ rtemsdoc/Makefile.am: i960 obsoleted.
+
2004-09-24 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Require automake > 1.9.
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index d99c314e92..2e7162c675 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -30,10 +30,6 @@ i386-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems@osversion@ > $@
RPM_SPECS_DATA += i386-rtems@osversion@-$(BINUTILSVERS).spec
-i960-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
- $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems@osversion@ > $@
-RPM_SPECS_DATA += i960-rtems@osversion@-$(BINUTILSVERS).spec
-
m68k-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems@osversion@ > $@
RPM_SPECS_DATA += m68k-rtems@osversion@-$(BINUTILSVERS).spec
diff --git a/scripts/buildall.in b/scripts/buildall.in
index 6b163fac79..904cf1c482 100755
--- a/scripts/buildall.in
+++ b/scripts/buildall.in
@@ -63,15 +63,15 @@ fi
# This is the full list .. some may not build at any given time.
-#ALL_TARGETS="i386-rtems i960-rtems m68k-rtems \
+#ALL_TARGETS="i386-rtems m68k-rtems \
# m68k-rtemself mips-rtems \
# powerpc-rtems sh-rtems sh-rtemself sparc-rtems"
# This is the full buildable set.
if [ "X${TARGETS}" = "X" ] ; then
# 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 \
+ # do not include sh-elf or secondary targets
+ TARGETS="arm-rtems h8300-rtems i386-rtems m68k-rtems \
mips-rtems powerpc-rtems sh-rtems sparc-rtems"
fi
diff --git a/scripts/buildalltar.in b/scripts/buildalltar.in
index adb9697b0e..ba78a69d30 100644
--- a/scripts/buildalltar.in
+++ b/scripts/buildalltar.in
@@ -95,14 +95,14 @@ fi
# This is the full list .. some may not build at any given time.
-#ALL_TARGETS="i386-rtems i960-rtems m68k-rtems \
+#ALL_TARGETS="i386-rtems m68k-rtems \
# m68k-rtemself mips-rtems \
# powerpc-rtems sh-rtems sh-rtemself sparc-rtems"
# This is the full buildable set.
if [ "X${TARGETS}" = "X" ] ; then
# do not include tic4x as primary targets
- # do not include sh-elf or i960-elf secondary targets
+ # do not include sh-elf or secondary targets
TARGETS="arm-rtems h8300-rtems i386-rtems \
m68k-rtems mips-rtems powerpc-rtems \
sh-rtems sh-rtemself sparc-rtems"
@@ -295,7 +295,7 @@ do
mkdir b-${target}-gdb
cd b-${target}-gdb
case ${target} in
- arm* | d10v* | d30v* | erc32* | fr30* | h8300* | h8500* | i960* | \
+ arm* | d10v* | d30v* | erc32* | fr30* | h8300* | h8500* | \
m32r* | mcore* | mips* | mn10200* | mn10300* | sh* | sparc*| v850* | \
w65* | z8k*)
extra_configure_arguments="--enable-sim"
diff --git a/scripts/cpukit/Makefile.am b/scripts/cpukit/Makefile.am
index e7456ef5b1..aaedd26bc0 100644
--- a/scripts/cpukit/Makefile.am
+++ b/scripts/cpukit/Makefile.am
@@ -26,10 +26,6 @@ i386-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems@osversion@ > $@
RPM_SPECS_DATA += i386-rtems@osversion@-cpukit.spec
-i960-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
- $(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems@osversion@ > $@
-RPM_SPECS_DATA += i960-rtems@osversion@-cpukit.spec
-
m68k-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems@osversion@ > $@
RPM_SPECS_DATA += m68k-rtems@osversion@-cpukit.spec
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index bd26bd2d3d..41024ccc9d 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -40,10 +40,6 @@ i386-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems@osversion@ > $@
RPM_SPECS_DATA += i386-rtems@osversion@-$(GCC3NEWLIBVERS).spec
-i960-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
- $(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems@osversion@ > $@
-RPM_SPECS_DATA += i960-rtems@osversion@-$(GCC3NEWLIBVERS).spec
-
m68k-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems@osversion@ > $@
RPM_SPECS_DATA += m68k-rtems@osversion@-$(GCC3NEWLIBVERS).spec
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index db43f4264f..ebaa6349d8 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -92,10 +92,6 @@ NoSource: 1
%define build_gcj %_gcj
%endif
-%if "%{gcc_target}" == "i960-rtems@osversion@"
-%define build_cxx 0
-%endif
-
%if "%{gcc_target}" == "m68k-rtems@osversion@"
%define build_gcj %_gcj
%endif
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index 84cfa83f8e..8ace9ffce0 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -39,10 +39,6 @@ i386-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
# $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-RTEMS > $@
# RPM_SPECS_DATA += i386-RTEMS-$(GDBVERS).spec
-i960-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
- $(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems@osversion@ > $@
-RPM_SPECS_DATA += i960-rtems@osversion@-$(GDBVERS).spec
-
m68k-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems@osversion@ > $@
RPM_SPECS_DATA += m68k-rtems@osversion@-$(GDBVERS).spec
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index ad37b96cfa..6ac7784b4d 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -12,9 +12,6 @@ MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in \
i386-rtems-pc386-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems pc386
-i960-rtems-cvme961-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
- $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems cvme961
-
m68k-rtems-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems gen68360
@@ -33,9 +30,9 @@ sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
TEMPLATES = rtems.spec.in
RPM_SPECS_DATA = i386-rtems-pc386-$(BSPVERS).spec \
- i960-rtems-cvme961-$(BSPVERS).spec m68k-rtems-gen68360-$(BSPVERS).spec \
- powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \
- sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec
+ m68k-rtems-gen68360-$(BSPVERS).spec powerpc-rtems-mcp750-$(BSPVERS).spec \
+ sh-rtems-gensh1-$(BSPVERS).spec sh-rtemself-gensh1-$(BSPVERS).spec \
+ sparc-rtems-erc32-$(BSPVERS).spec
noinst_DATA = $(TEMPLATES)
diff --git a/scripts/rtemsdoc/.cvsignore b/scripts/rtemsdoc/.cvsignore
index 52a5b09dfc..86d75f7d30 100644
--- a/scripts/rtemsdoc/.cvsignore
+++ b/scripts/rtemsdoc/.cvsignore
@@ -7,7 +7,6 @@ develenv-docs.add
FAQ-docs.add
filesystem-docs.add
i386-supplement.add
-i960-supplement.add
itron-docs.add
m68k-supplement.add
Makefile
diff --git a/scripts/rtemsdoc/Makefile.am b/scripts/rtemsdoc/Makefile.am
index 488b93de54..05ad9d0986 100644
--- a/scripts/rtemsdoc/Makefile.am
+++ b/scripts/rtemsdoc/Makefile.am
@@ -1,12 +1,10 @@
##
-## $Id$
-##
include ${top_srcdir}/common/common.am
CLEANFILES =
-SUPPLEMENTS = arm c4x i386 i960 m68k mips powerpc sh sparc
+SUPPLEMENTS = arm c4x i386 m68k mips powerpc sh sparc
DOCS = ada_user posix1003_1 bsp_howto
DOCS += c_user posix_users