summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-03-24 16:24:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-03-24 16:24:39 +0000
commit3ec7bfc7c4ff9e217d2a24635751b74757635dd7 (patch)
tree3cb4539f082a621655fae9e6b999d6ca0c0f8c73 /c/src/lib
parent222788b43ddd805079a45d1eb49be216bd186add (diff)
downloadrtems-3ec7bfc7c4ff9e217d2a24635751b74757635dd7.tar.bz2
Rename hppa1_1 to hppa1.1 and switched to using __XXX__ macros for
the CPU family name constants.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in2
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c4
-rw-r--r--c/src/lib/libbsp/shmdr/shm.h14
-rw-r--r--c/src/lib/libbsp/shmdr/shm_driver.h14
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/clock/clock.c2
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/timer/timer.c2
-rw-r--r--c/src/lib/start/README2
-rw-r--r--c/src/libchip/shmdr/shm_driver.h14
8 files changed, 27 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
index f5b7ef0799..2dc18158d3 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
@@ -14,4 +14,4 @@ include $(RTEMS_ROOT)/make/directory.cfg
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
# NOTE: we pick up HPPA clock and timer from libcpu/hppa
-SUB_DIRS=tools include startup tty shmsupp wrapup
+SUB_DIRS=tools include start startup tty shmsupp wrapup
diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c b/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c
index 2a41b46a33..11e14a3efb 100644
--- a/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c
+++ b/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c
@@ -331,7 +331,7 @@ asm("
_already7:
movew %sp@+,%d0
");
-#if defined (__m68000__) && !defined(__mc68020__)
+#if defined (__mc68000__) && !defined(__mc68020__)
asm("
lea %sp@(4),%sp"); /* pull off 68000 return address */
#endif
@@ -551,7 +551,7 @@ void _returnFromException(Frame *frame)
frame->fsaveHeader = -1; /* restore regs, but we dont have fsave info*/
}
-#if defined(__m68000__) && !defined(__mc68020__)
+#if defined(__mc68000__) && !defined(__mc68020__)
/* a 68000 cannot use the internal info pushed onto a bus error
* or address error frame when doing an RTE so don't put this info
* onto the stack or the stack will creep every time this happens.
diff --git a/c/src/lib/libbsp/shmdr/shm.h b/c/src/lib/libbsp/shmdr/shm.h
index 8fc1162617..8875525983 100644
--- a/c/src/lib/libbsp/shmdr/shm.h
+++ b/c/src/lib/libbsp/shmdr/shm.h
@@ -119,27 +119,27 @@ extern "C" {
* view of the VMEbus address space) are not addressed yet.
*/
-#if defined(i960)
+#if defined(__i960__)
#define SHM_LOCK_VALUE 0x00000080
#define SHM_UNLOCK_VALUE 0
-#elif defined(m68k)
+#elif defined(__mc68000__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(i386)
+#elif defined(__i386__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(mips64orion)
+#elif defined(__mips__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(hppa1_1)
+#elif defined(__hppa__)
#define SHM_LOCK_VALUE 0
#define SHM_UNLOCK_VALUE 1
-#elif defined(ppc)
+#elif defined(__PPC__)
#define SHM_LOCK_VALUE 1
#define SHM_UNLOCK_VALUE 0
-#elif defined(unix)
+#elif defined(__unix__)
#define SHM_LOCK_VALUE 0
#define SHM_UNLOCK_VALUE 1
#elif defined(no_cpu) /* for this values are irrelevant */
diff --git a/c/src/lib/libbsp/shmdr/shm_driver.h b/c/src/lib/libbsp/shmdr/shm_driver.h
index 8fc1162617..8875525983 100644
--- a/c/src/lib/libbsp/shmdr/shm_driver.h
+++ b/c/src/lib/libbsp/shmdr/shm_driver.h
@@ -119,27 +119,27 @@ extern "C" {
* view of the VMEbus address space) are not addressed yet.
*/
-#if defined(i960)
+#if defined(__i960__)
#define SHM_LOCK_VALUE 0x00000080
#define SHM_UNLOCK_VALUE 0
-#elif defined(m68k)
+#elif defined(__mc68000__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(i386)
+#elif defined(__i386__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(mips64orion)
+#elif defined(__mips__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(hppa1_1)
+#elif defined(__hppa__)
#define SHM_LOCK_VALUE 0
#define SHM_UNLOCK_VALUE 1
-#elif defined(ppc)
+#elif defined(__PPC__)
#define SHM_LOCK_VALUE 1
#define SHM_UNLOCK_VALUE 0
-#elif defined(unix)
+#elif defined(__unix__)
#define SHM_LOCK_VALUE 0
#define SHM_UNLOCK_VALUE 1
#elif defined(no_cpu) /* for this values are irrelevant */
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
index dad00372ad..4a8f66d643 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
@@ -18,7 +18,7 @@
* i-cubed limited makes no representations about the suitability
* of this software for any purpose.
*
- * Derived from c/src/lib/libcpu/hppa1_1/clock/clock.c:
+ * Derived from c/src/lib/libcpu/hppa1.1/clock/clock.c:
*
* COPYRIGHT (c) 1989-1998.
* On-Line Applications Research Corporation (OAR).
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
index cd6fc82519..0881eef128 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
@@ -21,7 +21,7 @@
* i-cubed limited makes no representations about the suitability
* of this software for any purpose.
*
- * Derived from c/src/lib/libcpu/hppa1_1/timer/timer.c:
+ * Derived from c/src/lib/libcpu/hppa1.1/timer/timer.c:
*
* COPYRIGHT (c) 1989-1998.
* On-Line Applications Research Corporation (OAR).
diff --git a/c/src/lib/start/README b/c/src/lib/start/README
index bec0349374..52556d4bb1 100644
--- a/c/src/lib/start/README
+++ b/c/src/lib/start/README
@@ -6,5 +6,5 @@ entry code transfers control to target board specific
code).
For some processors this code exists in some external (to RTEMS)
-library such as libgloss or the host system (for example the hppa1_1
+library such as libgloss or the host system (for example the hppa1.1
and UNIX cpu's)
diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h
index 8fc1162617..8875525983 100644
--- a/c/src/libchip/shmdr/shm_driver.h
+++ b/c/src/libchip/shmdr/shm_driver.h
@@ -119,27 +119,27 @@ extern "C" {
* view of the VMEbus address space) are not addressed yet.
*/
-#if defined(i960)
+#if defined(__i960__)
#define SHM_LOCK_VALUE 0x00000080
#define SHM_UNLOCK_VALUE 0
-#elif defined(m68k)
+#elif defined(__mc68000__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(i386)
+#elif defined(__i386__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(mips64orion)
+#elif defined(__mips__)
#define SHM_LOCK_VALUE 0x80000000
#define SHM_UNLOCK_VALUE 0
-#elif defined(hppa1_1)
+#elif defined(__hppa__)
#define SHM_LOCK_VALUE 0
#define SHM_UNLOCK_VALUE 1
-#elif defined(ppc)
+#elif defined(__PPC__)
#define SHM_LOCK_VALUE 1
#define SHM_UNLOCK_VALUE 0
-#elif defined(unix)
+#elif defined(__unix__)
#define SHM_LOCK_VALUE 0
#define SHM_UNLOCK_VALUE 1
#elif defined(no_cpu) /* for this values are irrelevant */