CVS commit: [netbsd-10] src/sys/arch/arm

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Dec 14 17:43:11 UTC 2023

Modified Files:
        src/sys/arch/arm/arm [netbsd-10]: smccc.c
        src/sys/arch/arm/arm32 [netbsd-10]: pmap.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #495):

        sys/arch/arm/arm/smccc.c: revision 1.4
        sys/arch/arm/arm32/pmap.c: revision 1.441

smccc: Adjust SMCCC_ARCH_ATTRIBUTE for clang/arm
Conditionally use
(1) __attribute__ ((target("arch=armv7ve")))
(2) __attribute__ ((target("armv7ve")))
for gcc and clang, respectively.

While gcc does not accept (2), clang accepts (1) but silently ignores it :(

arm: pmap: Fix clang build without DIAGNOSTIC


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.6.1 src/sys/arch/arm/arm/smccc.c
cvs rdiff -u -r1.437.4.2 -r1.437.4.3 src/sys/arch/arm/arm32/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/arm/smccc.c
diff -u src/sys/arch/arm/arm/smccc.c:1.3 src/sys/arch/arm/arm/smccc.c:1.3.6.1
--- src/sys/arch/arm/arm/smccc.c:1.3	Sun Aug  8 13:43:09 2021
+++ src/sys/arch/arm/arm/smccc.c	Thu Dec 14 17:43:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $ */
+/* $NetBSD: smccc.c,v 1.3.6.1 2023/12/14 17:43:10 martin Exp $ */
 
 /*-
  * Copyright (c) 2021 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.3.6.1 2023/12/14 17:43:10 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -36,7 +36,11 @@ __KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.
 #include <arm/arm/smccc.h>
 
 #if defined(__arm__)
+#  if defined(__clang__)
+#define	SMCCC_ARCH_ATTRIBUTE  __attribute__ ((target("armv7ve")))
+#  else /* gcc */
 #define	SMCCC_ARCH_ATTRIBUTE  __attribute__ ((target("arch=armv7ve")))
+#  endif
 #else
 #define	SMCCC_ARCH_ATTRIBUTE
 #endif

Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.437.4.2 src/sys/arch/arm/arm32/pmap.c:1.437.4.3
--- src/sys/arch/arm/arm32/pmap.c:1.437.4.2	Sat Oct 14 06:52:17 2023
+++ src/sys/arch/arm/arm32/pmap.c	Thu Dec 14 17:43:10 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.437.4.2 2023/10/14 06:52:17 martin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.437.4.3 2023/12/14 17:43:10 martin Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437.4.2 2023/10/14 06:52:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.437.4.3 2023/12/14 17:43:10 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -547,7 +547,7 @@ pmap_release_page_lock(struct vm_page_md
 	mutex_exit(&pmap_lock);
 }
 
-static inline int
+static inline int __diagused
 pmap_page_locked_p(struct vm_page_md *md)
 {
 	return mutex_owned(&pmap_lock);