diff options
| author | skrll <skrll@NetBSD.org> | 2020-10-11 16:22:02 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2020-10-11 16:22:02 +0000 |
| commit | df4c7e1230ebbcd60f5d320dbf1fa178e04c0c2f (patch) | |
| tree | 6712ec169803c6a538a9785451addfcbf2aeba9a | |
| parent | eb1998d7d48400cca95e50c89b19af722a68f910 (diff) | |
Define _ARM_ARCH_8 when __ARM_ARCH_8A (no trailing double underscore) as
it is defined by gcc.
__ARM_ARCH_8A__ (with trailing double underscore) seems to be a typo (or
maybe historical)
| -rw-r--r-- | common/lib/libc/arch/arm/features.c | 5 | ||||
| -rw-r--r-- | sys/arch/arm/include/cdefs.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/common/lib/libc/arch/arm/features.c b/common/lib/libc/arch/arm/features.c index f7c489be28f..7e6fba235fe 100644 --- a/common/lib/libc/arch/arm/features.c +++ b/common/lib/libc/arch/arm/features.c @@ -1,4 +1,4 @@ -/* $NetBSD: features.c,v 1.2 2019/08/02 12:07:24 joerg Exp $ */ +/* $NetBSD: features.c,v 1.3 2020/10/11 16:22:02 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -38,7 +38,8 @@ * FEAT_THUMB2!=if ${COMPILE.c} -fsyntax-only -DTHUMB2_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi */ -#if defined (__ARM_ARCH_8A__) || defined (__ARM_ARCH_7__) || \ +#if defined(__ARM_ARCH_8A) || defined (__ARM_ARCH_8A__) || \ + defined (__ARM_ARCH_7__) || \ defined (__ARM_ARCH_7A__) || defined (__ARM_ARCH_7R__) || \ defined (__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__) || \ defined (__ARM_ARCH_6T2__) diff --git a/sys/arch/arm/include/cdefs.h b/sys/arch/arm/include/cdefs.h index d36cb2bd572..e83abf05b3f 100644 --- a/sys/arch/arm/include/cdefs.h +++ b/sys/arch/arm/include/cdefs.h @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.16 2019/08/02 12:07:25 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.17 2020/10/11 16:22:02 skrll Exp $ */ #ifndef _ARM_CDEFS_H_ #define _ARM_CDEFS_H_ @@ -9,8 +9,10 @@ #endif #endif -#if defined (__ARM_ARCH_8A__) -#define _ARM_ARCH_8 /* ARMv8 64-bit in AARCH32 */ + +#if defined (__ARM_ARCH_8A__) || defined (__ARM_ARCH_8A) + /* __ARM_ARCH_8A__ is a typo */ +#define _ARM_ARCH_8 #endif #if defined (_ARM_ARCH_8) || defined (__ARM_ARCH_7__) || \ |
