From 3ec7bfc7c4ff9e217d2a24635751b74757635dd7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 24 Mar 1998 16:24:39 +0000 Subject: Rename hppa1_1 to hppa1.1 and switched to using __XXX__ macros for the CPU family name constants. --- c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in | 2 +- c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c | 4 ++-- c/src/lib/libbsp/shmdr/shm.h | 14 +++++++------- c/src/lib/libbsp/shmdr/shm_driver.h | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'c/src/lib/libbsp') 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 */ -- cgit v1.2.3