Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/include Define _ARM_ARCH_8 when __ARM_ARCH_8A (...



details:   https://anonhg.NetBSD.org/src/rev/fd10547c3bdb
branches:  trunk
changeset: 977005:fd10547c3bdb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Oct 11 16:22:02 2020 +0000

description:
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)

diffstat:

 common/lib/libc/arch/arm/features.c |  5 +++--
 sys/arch/arm/include/cdefs.h        |  8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 8b7c0ee16f40 -r fd10547c3bdb common/lib/libc/arch/arm/features.c
--- a/common/lib/libc/arch/arm/features.c       Sun Oct 11 15:33:18 2020 +0000
+++ b/common/lib/libc/arch/arm/features.c       Sun Oct 11 16:22:02 2020 +0000
@@ -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 -r 8b7c0ee16f40 -r fd10547c3bdb sys/arch/arm/include/cdefs.h
--- a/sys/arch/arm/include/cdefs.h      Sun Oct 11 15:33:18 2020 +0000
+++ b/sys/arch/arm/include/cdefs.h      Sun Oct 11 16:22:02 2020 +0000
@@ -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__) || \



Home | Main Index | Thread Index | Old Index