2004-09-29 Joel Sherrill <joel@OARcorp.com>

* aclocal/rtems-cpu-subdirs.m4, libchip/shmdr/shm_driver.h,
	libnetworking/pppd/utils.c: i960 obsoleted and all references
	removed.

c/src/ChangeLog

@@ -1,3 +1,9 @@
+2004-09-29	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/rtems-cpu-subdirs.m4, libchip/shmdr/shm_driver.h,
+	libnetworking/pppd/utils.c: i960 obsoleted and all references
+	removed.
+
 2004-04-09	Greg Menke <gregory.menke@gsfc.nasa.gov>
 
 	PR 607/networking

c/src/aclocal/rtems-cpu-subdirs.m4

@@ -16,7 +16,6 @@ _RTEMS_CPU_SUBDIR([c4x],[$1]);;
 _RTEMS_CPU_SUBDIR([h8300],[$1]);;
 _RTEMS_CPU_SUBDIR([hppa1.1],[$1]);;
 _RTEMS_CPU_SUBDIR([i386],[$1]);;
-_RTEMS_CPU_SUBDIR([i960],[$1]);;
 _RTEMS_CPU_SUBDIR([m68k],[$1]);;
 _RTEMS_CPU_SUBDIR([mips],[$1]);;
 _RTEMS_CPU_SUBDIR([no_cpu],[$1]);;

c/src/libchip/shmdr/shm_driver.h

@@ -118,10 +118,7 @@ extern "C" {
  *         view of the VMEbus address space) are not addressed yet.
  */
 
-#if defined(__i960__)
-#define SHM_LOCK_VALUE    0x00000080
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__mc68000__)
+#if defined(__mc68000__)
 #define SHM_LOCK_VALUE    0x80000000
 #define SHM_UNLOCK_VALUE  0
 #define SHM_LOCK_VALUE    0x80000000

c/src/libnetworking/pppd/utils.c

@@ -209,7 +209,7 @@ vslprintf(buf, buflen, fmt, args)
 	    break;
 	case 'r':
 	    f = va_arg(args, char *);
-#if !defined(__PPC__) && !defined(__i960__)
+#if !defined(__PPC__)
 	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
 #else
 	    /* HACK: On the powerpc, a va_list is an array of 1 structure */

cpukit/pppd/utils.c

@@ -209,7 +209,7 @@ vslprintf(buf, buflen, fmt, args)
 	    break;
 	case 'r':
 	    f = va_arg(args, char *);
-#if !defined(__PPC__) && !defined(__i960__)
+#if !defined(__PPC__)
 	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
 #else
 	    /* HACK: On the powerpc, a va_list is an array of 1 structure */