diff options
| author | Per Fogelstrom <pefo@cvs.openbsd.org> | 1999-06-01 17:54:33 +0000 |
|---|---|---|
| committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 1999-06-01 17:54:33 +0000 |
| commit | 4250454a54849b9eebc218dc55bb385295511485 (patch) | |
| tree | a738cd5f99db4f5bf4d1eaa31565a89588a35187 /sys | |
| parent | 4309307225f09098de013c97346c43afcb9edced (diff) | |
Fix some mips -> __mips__ stuff.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mips/include/asm.h | 6 | ||||
| -rw-r--r-- | sys/compat/ultrix/ultrix_misc.c | 6 | ||||
| -rw-r--r-- | sys/kern/exec_elf.c | 6 | ||||
| -rw-r--r-- | sys/net/bpf_filter.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/mips/include/asm.h b/sys/arch/mips/include/asm.h index 9fc9c7821e2..eec81c0d31c 100644 --- a/sys/arch/mips/include/asm.h +++ b/sys/arch/mips/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.2 1998/03/16 09:03:02 pefo Exp $ */ +/* $OpenBSD: asm.h,v 1.3 1999/06/01 17:54:32 pefo Exp $ */ /* * Copyright (c) 1992, 1993 @@ -64,13 +64,13 @@ /* * Define how to access unaligned data word */ -#ifdef MIPSEL +#if defined(MIPSEL) || defined(__MIPSEL__) #define LWLO lwl #define LWHI lwr #define SWLO swl #define SWHI swr #endif -#ifdef MIPSEB +#if defined(MIPSEB) || defined(__MIPSEB__) #define LWLO lwr #define LWHI lwl #define SWLO swr diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c index b616414ab04..b09bfd6cb9c 100644 --- a/sys/compat/ultrix/ultrix_misc.c +++ b/sys/compat/ultrix/ultrix_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_misc.c,v 1.13 1998/01/05 03:15:22 deraadt Exp $ */ +/* $OpenBSD: ultrix_misc.c,v 1.14 1999/06/01 17:54:32 pefo Exp $ */ /* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */ /* @@ -134,9 +134,9 @@ extern char *ultrix_syscallnames[]; /* * Select the appropriate setregs callback for the target architecture. */ -#ifdef mips +#ifdef __mips__ #define ULTRIX_EXEC_SETREGS cpu_exec_ecoff_setregs -#endif /* mips */ +#endif /* __mips__ */ #ifdef vax #define ULTRIX_EXEC_SETREGS setregs diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c index 9045261c8e5..37b683b6bb0 100644 --- a/sys/kern/exec_elf.c +++ b/sys/kern/exec_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.c,v 1.24 1999/02/10 08:07:20 deraadt Exp $ */ +/* $OpenBSD: exec_elf.c,v 1.25 1999/06/01 17:54:31 pefo Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -402,7 +402,7 @@ elf_load_file(p, path, epp, ap, last) for (i = 0; i < eh.e_phnum; i++) { u_long size = 0; int prot = 0; -#ifdef mips +#if defined(__mips__) if (*last == ELF32_NO_ADDR) addr = ELF32_NO_ADDR; /* GRRRRR!!!!! */ #endif @@ -598,7 +598,7 @@ exec_elf_makecmds(p, epp) } } -#if !defined(mips) +#if !defined(__mips__) /* * If no position to load the interpreter was set by a probe * function, pick the same address that a non-fixed mmap(0, ..) diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index cd685a2deab..71e7348d5df 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf_filter.c,v 1.4 1996/08/22 00:35:50 deraadt Exp $ */ +/* $OpenBSD: bpf_filter.c,v 1.5 1999/06/01 17:54:31 pefo Exp $ */ /* $NetBSD: bpf_filter.c,v 1.12 1996/02/13 22:00:00 christos Exp $ */ /* @@ -51,7 +51,7 @@ #include <netinet/in.h> #endif -#if defined(sparc) || defined(mips) || defined(ibm032) || \ +#if defined(sparc) || defined(__mips__) || defined(ibm032) || \ ((defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(UNALIGNED_ACCESS)) #define BPF_ALIGN #endif |