[patch/rfc] Obsolete the i960 target

[patch/rfc] Obsolete the i960 target

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 127 bytes --]

Hello,

The attached patch marks the i960 target as obsolete.

Baring comments, I'll commit it in about a week.

enjoy,
Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 6019 bytes --]

2002-08-15  Andrew Cagney  <cagney@redhat.com>

	* NEWS: Mention that the i960 has been made obsolete.
	* Makefile.in (SFILES): Delete remote-nrom.c, remote-nindy.c and
	i960-tdep.c
	(remote-nrom.o): Obsolete target.
	(remote-nindy.o, i960-tdep.o): Ditto.
	* remote-nrom.c: Make file obsolete.
	* remote-nindy.c, remote-vx960.c: Ditto.
	* config/i960/vxworks960.mt, config/i960/nindy960.mt: Ditto.
	* config/i960/mon960.mt, config/i960/tm-i960.h: Ditto.
	* config/i960/tm-vx960.h, config/i960/tm-nindy960.h: Ditto.
	* config/i960/tm-mon960.h, i960-tdep.c: Ditto.
	* configure.tgt: Make i960-*-bout*, i960-nindy-coff*,
	i960-*-coff*, i960-nindy-elf*, i960-*-elf*, i960-*-nindy* and
	i960-*-vxworks* obsolete.
	* MAINTAINERS: Note that the i960 is obsolete.

Index: MAINTAINERS
===================================================================
RCS file: /cvs/src/src/gdb/MAINTAINERS,v
retrieving revision 1.193
diff -u -r1.193 MAINTAINERS
--- MAINTAINERS	8 Aug 2002 15:37:29 -0000	1.193
+++ MAINTAINERS	15 Aug 2002 22:48:35 -0000
@@ -94,9 +94,7 @@
 	i386		--target=i386-elf,i386-aout ,-Werror
 			Mark Kettenis           kettenis@gnu.org
 
-	i960		--target=i960-coff ,-Werror
-			Maintenance only
-			OBSOLETE candidate, not multi-arch
+	i960		(--target=i960-coff OBSOLETE)
 
 	ia64		--target=ia64-linux ,-Werror
 			Kevin Buettner		kevinb@redhat.com
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.235
diff -u -r1.235 Makefile.in
--- Makefile.in	10 Aug 2002 00:36:46 -0000	1.235
+++ Makefile.in	15 Aug 2002 22:48:36 -0000
@@ -535,7 +535,7 @@
 	memattr.c mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c \
 	p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c \
 	macrotab.c macroexp.c macrocmd.c macroscope.c \
-	printcmd.c remote.c remote-nrom.c scm-exp.c scm-lang.c \
+	printcmd.c remote.c scm-exp.c scm-lang.c \
 	scm-valprint.c source.c stabsread.c stack.c symfile.c \
 	symmisc.c symtab.c linespec.c target.c thread.c top.c tracepoint.c \
 	typeprint.c utils.c valarith.c valops.c valprint.c values.c \
@@ -1225,7 +1225,6 @@
 	i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c \
 	i387-tdep.c \
 	i386-linux-tdep.c i386-nat.c \
-	i960-tdep.c \
 	ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
 	infptrace.c inftarg.c irix4-nat.c irix5-nat.c \
 	lynx-nat.c m3-nat.c \
@@ -1247,7 +1246,7 @@
 	procfs.c \
 	remote-array.c remote-e7000.c \
 	remote-es.c remote-hms.c remote-mips.c \
-	remote-nindy.c remote-rdp.c remote-sim.c \
+	remote-rdp.c remote-sim.c \
 	remote-st.c remote-utils.c dcache.c \
 	remote-vx.c \
 	rs6000-nat.c rs6000-tdep.c \
@@ -1704,8 +1703,8 @@
 i387-tdep.o: i387-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) $(language_h) $(regcache_h) $(doublest_h) i386-tdep.h
 
-i960-tdep.o: i960-tdep.c $(defs_h) $(symtab_h) $(value_h) $(frame_h) \
-	$(floatformat_h) $(target_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
+# OBSOLETE i960-tdep.o: i960-tdep.c $(defs_h) $(symtab_h) $(value_h) $(frame_h) \
+# OBSOLETE 	$(floatformat_h) $(target_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 ia64-linux-nat.o: ia64-linux-nat.c  $(defs_h) $(inferior_h) $(target_h) \
 	$(gdbcore_h) $(regcache_h)
@@ -2035,10 +2034,10 @@
 	$(gdbcore_h) $(inferior_h) $(serial_h) $(symfile_h) $(target_h) \
 	$(regcache_h)
 
-remote-nindy.o: remote-nindy.c $(floatformat_h) $(command_h) \
-	$(defs_h) $(gdbcore_h) $(inferior_h) \
-	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
-	$(symfile_h) $(regcache_h)
+# OBSOLETE remote-nindy.o: remote-nindy.c $(floatformat_h) $(command_h) \
+# OBSOLETE 	$(defs_h) $(gdbcore_h) $(inferior_h) \
+# OBSOLETE 	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
+# OBSOLETE 	$(symfile_h) $(regcache_h)
 
 # OBSOLETE remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) \
 # OBSOLETE 	$(command_h) $(monitor_h) $(remote_utils_h) $(symtab_h) $(symfile_h) \
@@ -2079,8 +2078,8 @@
 	$(gdb_string_h) $(event_loop_h) $(event_top_h) $(remote_h) \
 	$(inf_loop_h) $(value_h)
 
-remote-nrom.o: remote-nrom.c $(bfd_h) $(gdb_wait_h) $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) $(remote_utils_h) $(symfile_h) $(terminal_h)
+# OBSOLETE remote-nrom.o: remote-nrom.c $(bfd_h) $(gdb_wait_h) $(defs_h) $(gdbcmd_h) \
+# OBSOLETE 	$(inferior_h) $(remote_utils_h) $(symfile_h) $(terminal_h)
 
 rom68k-rom.o: rom68k-rom.c $(monitor_h) $(bfd_h) $(gdb_wait_h) $(defs_h) \
 	$(gdbcmd_h) $(inferior_h) $(target_h) $(serial_h) $(terminal_h) \
Index: NEWS
===================================================================
RCS file: /cvs/src/src/gdb/NEWS,v
retrieving revision 1.85
diff -u -r1.85 NEWS
--- NEWS	6 Aug 2002 14:12:46 -0000	1.85
+++ NEWS	15 Aug 2002 22:48:37 -0000
@@ -60,6 +60,7 @@
 Fujitsu FR30					fr30-*-elf*
 Motorola Delta 88000 running Sys V		m88k-motorola-sysv  or  delta88
 Argonaut Risc Chip (ARC)			arc-*-*
+I960 with MON960				i960-*-coff
 
 * OBSOLETE languages
 
Index: configure.tgt
===================================================================
RCS file: /cvs/src/src/gdb/configure.tgt,v
retrieving revision 1.77
diff -u -r1.77 configure.tgt
--- configure.tgt	8 Aug 2002 15:37:29 -0000	1.77
+++ configure.tgt	15 Aug 2002 22:48:37 -0000
@@ -121,13 +121,13 @@
 i[3456]86-*-pe*)	gdb_target=embed  ;;
 i[3456]86-*-vxworks*)	gdb_target=vxworks ;;
 
-i960-*-bout*)		gdb_target=vxworks960 ;;
-i960-nindy-coff*)	gdb_target=nindy960 ;;
-i960-*-coff*)		gdb_target=mon960 ;;
-i960-nindy-elf*)	gdb_target=nindy960 ;;
-i960-*-elf*)		gdb_target=mon960 ;;
-i960-*-nindy*)		gdb_target=nindy960 ;;
-i960-*-vxworks*)	gdb_target=vxworks960 ;;
+# OBSOLETE i960-*-bout*)		gdb_target=vxworks960 ;;
+# OBSOLETE i960-nindy-coff*)	gdb_target=nindy960 ;;
+# OBSOLETE i960-*-coff*)		gdb_target=mon960 ;;
+# OBSOLETE i960-nindy-elf*)	gdb_target=nindy960 ;;
+# OBSOLETE i960-*-elf*)		gdb_target=mon960 ;;
+# OBSOLETE i960-*-nindy*)		gdb_target=nindy960 ;;
+# OBSOLETE i960-*-vxworks*)	gdb_target=vxworks960 ;;
 
 ia64-*-aix*)		gdb_target=aix ;;
 ia64-*-linux*)		gdb_target=linux

Re: [patch/rfc] Obsolete the i960 target

[Mark Kettenis]

Hey Andrew,

I'm a little confused on how one deals with target/host-specific files
when obsoleting a target or host.  Sometimes we prefix all lines of
such a file with // OBSOLETE, sometimes we just leave those files
alone (like this patch for the i960 target does).  I'm tempted to go
with the latter (since it reduces the amount of work to do).  Is that OK?

Mark

Re: [patch/rfc] Obsolete the i960 target

[Andrew Cagney]

> Hey Andrew,
> 
> I'm a little confused on how one deals with target/host-specific files
> when obsoleting a target or host.  Sometimes we prefix all lines of
> such a file with // OBSOLETE, sometimes we just leave those files
> alone (like this patch for the i960 target does).  I'm tempted to go
> with the latter (since it reduces the amount of work to do).  Is that OK?

Ah, I edited ``slightly'' the i960 patch and removed the diffs that just 
add the OBSOLETE prefix to every line of a file.  The actual files will 
be given the OBSOLETE treatment.

Adding the OBSOLETE prefix is very useful (I'd otherwize not be doing it 
:-).  It stops a search for to specific variables, macros or functions 
identifying references in obsolete code.  Something like:

#!/bin/sh
find *  -name 'ChangeLog*' -prune \
         -o -name '*.o' -prune \
         -o -name '*.a' -prune \
         -o -name '*~' -prune \
         -o -name '.#*' -prune \
         -o -name 'CVS' -prune \
         -o -name 'kernel' -prune \
         -o -name 'diff*' -prune \
         -o -name '*.orig' -prune \
         -o -name '*.rej' -prune \
         -o -name 'new-*' -prune \
         -o -name '%redact*' -prune \
         -o -type f \
         -print0 \
     | xargs -0 grep "$@" | grep -v OBSOLETE

works really well.

enjoy,
Andrew

PS: It's quicker if the buffer is put into fundamental-mode

Re: [patch/rfc] Obsolete the i960 target

[Andrew Cagney]

> 2002-08-15  Andrew Cagney  <cagney@redhat.com>
> 
> 	* NEWS: Mention that the i960 has been made obsolete.
> 	* Makefile.in (SFILES): Delete remote-nrom.c, remote-nindy.c and
> 	i960-tdep.c
> 	(remote-nrom.o): Obsolete target.
> 	(remote-nindy.o, i960-tdep.o): Ditto.
> 	* remote-nrom.c: Make file obsolete.
> 	* remote-nindy.c, remote-vx960.c: Ditto.
> 	* config/i960/vxworks960.mt, config/i960/nindy960.mt: Ditto.
> 	* config/i960/mon960.mt, config/i960/tm-i960.h: Ditto.
> 	* config/i960/tm-vx960.h, config/i960/tm-nindy960.h: Ditto.
> 	* config/i960/tm-mon960.h, i960-tdep.c: Ditto.
> 	* configure.tgt: Make i960-*-bout*, i960-nindy-coff*,
> 	i960-*-coff*, i960-nindy-elf*, i960-*-elf*, i960-*-nindy* and
> 	i960-*-vxworks* obsolete.
> 	* MAINTAINERS: Note that the i960 is obsolete.
> 
I've checked this in.

Andrew