Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/arm fix armv7 build



details:   https://anonhg.NetBSD.org/src/rev/bb43436bc62a
branches:  trunk
changeset: 1022821:bb43436bc62a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 08 13:43:09 2021 +0000

description:
fix armv7 build

diffstat:

 sys/arch/arm/arm/smccc.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 61ef6f8cd64c -r bb43436bc62a sys/arch/arm/arm/smccc.c
--- a/sys/arch/arm/arm/smccc.c  Sun Aug 08 13:34:57 2021 +0000
+++ b/sys/arch/arm/arm/smccc.c  Sun Aug 08 13:43:09 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smccc.c,v 1.2 2021/08/07 21:21:49 jmcneill Exp $ */
+/* $NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2021 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.2 2021/08/07 21:21:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -35,6 +35,12 @@
 #include <arm/arm/psci.h>
 #include <arm/arm/smccc.h>
 
+#if defined(__arm__)
+#define        SMCCC_ARCH_ATTRIBUTE  __attribute__ ((target("arch=armv7ve")))
+#else
+#define        SMCCC_ARCH_ATTRIBUTE
+#endif
+
 /* Minimum supported PSCI version for SMCCC discovery */
 #define        PSCI_VERSION_1_0        0x10000
 
@@ -89,7 +95,7 @@
  *
  *     Generic call interface for SMC/HVC calls.
  */
-int
+SMCCC_ARCH_ATTRIBUTE int
 smccc_call(uint32_t fid,
     register_t arg1, register_t arg2, register_t arg3, register_t arg4,
     register_t *res0, register_t *res1, register_t *res2, register_t *res3)



Home | Main Index | Thread Index | Old Index