Module Name: src
Committed By: skrll
Date: Sun Oct 11 16:22:03 UTC 2020
Modified Files:
src/common/lib/libc/arch/arm: features.c
src/sys/arch/arm/include: cdefs.h
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/features.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/features.c
diff -u src/common/lib/libc/arch/arm/features.c:1.2 src/common/lib/libc/arch/arm/features.c:1.3
--- src/common/lib/libc/arch/arm/features.c:1.2 Fri Aug 2 12:07:24 2019
+++ src/common/lib/libc/arch/arm/features.c Sun Oct 11 16:22:02 2020
@@ -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__)
Index: src/sys/arch/arm/include/cdefs.h
diff -u src/sys/arch/arm/include/cdefs.h:1.16 src/sys/arch/arm/include/cdefs.h:1.17
--- src/sys/arch/arm/include/cdefs.h:1.16 Fri Aug 2 12:07:25 2019
+++ src/sys/arch/arm/include/cdefs.h Sun Oct 11 16:22:02 2020
@@ -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__) || \
