diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-09-29 20:36:20 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-09-29 20:36:20 +0000 |
| commit | 7452b8557dd2ae4ce11da3b15a2a8a5eaee71301 (patch) | |
| tree | 9cebb3eed8a02cae00df8de3498ca24f093e982a /c | |
| parent | 2004-09-29 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-7452b8557dd2ae4ce11da3b15a2a8a5eaee71301.tar.bz2 | |
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.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/aclocal/rtems-cpu-subdirs.m4 | 1 | ||||
| -rw-r--r-- | c/src/libchip/shmdr/shm_driver.h | 5 | ||||
| -rw-r--r-- | c/src/libnetworking/pppd/utils.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 8165052a9a..b824bb0965 100644 --- a/c/src/ChangeLog +++ b/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 diff --git a/c/src/aclocal/rtems-cpu-subdirs.m4 b/c/src/aclocal/rtems-cpu-subdirs.m4 index 6c08dd685e..9fb4b2df2b 100644 --- a/c/src/aclocal/rtems-cpu-subdirs.m4 +++ b/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]);; diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h index 822f78d1c6..c8e15dd3a9 100644 --- a/c/src/libchip/shmdr/shm_driver.h +++ b/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 diff --git a/c/src/libnetworking/pppd/utils.c b/c/src/libnetworking/pppd/utils.c index 6a399385e7..fd799e6a35 100644 --- a/c/src/libnetworking/pppd/utils.c +++ b/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 */ |