diff options
| author |   martynas <martynas@openbsd.org> | 2011-07-26 09:24:52 +0000 |
|---|---|---|
| committer | martynas <martynas@openbsd.org> | 2011-07-26 09:24:52 +0000 |
| commit | 80626675329654e6b943890c769bfd67004f09a9 (patch) | |
| tree | e030d8dea3904b07ff75b552ca10b18432f830bc | |
| parent | Backout previous, naddy@ found the following regression: (diff) | |
| download | wireguard-openbsd-80626675329654e6b943890c769bfd67004f09a9.tar.xz wireguard-openbsd-80626675329654e6b943890c769bfd67004f09a9.zip | |
__arm32__ -> __arm__, since our new compiler isn't defining the
former anymore. OK miod@.
| -rw-r--r-- | lib/libc/gen/ldexp.c | 6 | ||||
| -rw-r--r-- | lib/libm/src/math_private.h | 8 | ||||
| -rw-r--r-- | sys/net/bpf.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c index 83dfa40896f..f03eeaf8d6d 100644 --- a/lib/libc/gen/ldexp.c +++ b/lib/libc/gen/ldexp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldexp.c,v 1.3 2011/07/07 00:25:39 martynas Exp $ */ +/* $OpenBSD: ldexp.c,v 1.4 2011/07/26 09:24:52 martynas Exp $ */ /* @(#)s_scalbn.c 5.1 93/09/24 */ /* @(#)fdlibm.h 5.1 93/09/24 */ /* @@ -22,7 +22,7 @@ /* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */ -#if (BYTE_ORDER == BIG_ENDIAN) || defined(arm32) +#if (BYTE_ORDER == BIG_ENDIAN) || defined(__arm__) typedef union { @@ -36,7 +36,7 @@ typedef union #endif -#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(arm32) +#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(__arm__) typedef union { diff --git a/lib/libm/src/math_private.h b/lib/libm/src/math_private.h index 00c88387874..2abe14a7c62 100644 --- a/lib/libm/src/math_private.h +++ b/lib/libm/src/math_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: math_private.h,v 1.13 2011/07/06 00:02:42 martynas Exp $ */ +/* $OpenBSD: math_private.h,v 1.14 2011/07/26 09:24:52 martynas Exp $ */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -222,11 +222,11 @@ do { \ ints. */ /* - * The arm32 port is little endian except for the FP word order which is + * The arm port is little endian except for the FP word order which is * big endian. */ -#if (BYTE_ORDER == BIG_ENDIAN) || defined(arm32) +#if (BYTE_ORDER == BIG_ENDIAN) || defined(__arm__) typedef union { @@ -240,7 +240,7 @@ typedef union #endif -#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(arm32) +#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(__arm__) typedef union { diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 8d2d14ed939..0028d6be70e 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.h,v 1.41 2010/10/29 03:43:35 canacar Exp $ */ +/* $OpenBSD: bpf.h,v 1.42 2011/07/26 09:24:52 martynas Exp $ */ /* $NetBSD: bpf.h,v 1.15 1996/12/13 07:57:33 mikel Exp $ */ /* @@ -150,7 +150,7 @@ struct bpf_hdr { * XXX fail-safe: on new machines, we just use the 'safe' sizeof. */ #ifdef _KERNEL -#if defined(__arm32__) || defined(__i386__) || defined(__m68k__) || \ +#if defined(__arm__) || defined(__i386__) || defined(__m68k__) || \ defined(__mips__) || defined(__ns32k__) || defined(__sparc__) || \ defined(__sparc64__) || defined(__vax__) #define SIZEOF_BPF_HDR 18 |