Module Name: src
Committed By: riastradh
Date: Sun Jan 5 14:30:38 UTC 2025
Modified Files:
src/sys/arch/amd64/include: asm.h
src/sys/arch/i386/include: asm.h
Log Message:
x86 machine/asm.h: Avoid juxtaposition for concatenation.
clang asm doesn't seem to like it. Instead of `.asciz "foo" "bar"',
do `.ascii "foo"; .asciz "bar"'.
PR toolchain/58960: Missing support for _NETBSD_REVISIONID on various
ports
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amd64/include/asm.h
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/include/asm.h
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/amd64/include/asm.h
diff -u src/sys/arch/amd64/include/asm.h:1.23 src/sys/arch/amd64/include/asm.h:1.24
--- src/sys/arch/amd64/include/asm.h:1.23 Sun Jun 9 22:35:17 2024
+++ src/sys/arch/amd64/include/asm.h Sun Jan 5 14:30:37 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.23 2024/06/09 22:35:17 riastradh Exp $ */
+/* $NetBSD: asm.h,v 1.24 2025/01/05 14:30:37 riastradh Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -113,14 +113,15 @@
#define ASMSTR .asciz
#define _IDENTSTR(x) .pushsection ".ident","MS",@progbits,1; \
- .asciz x; \
+ x; \
.popsection
#ifdef _NETBSD_REVISIONID
#define RCSID(_s) \
- _IDENTSTR(_s); \
- _IDENTSTR("$" "NetBSD: " __FILE__ " " _NETBSD_REVISIONID " $")
+ _IDENTSTR(.asciz _s); \
+ _IDENTSTR(.ascii "$"; .ascii "NetBSD: "; .ascii __FILE__; .ascii " "; \
+ .ascii _NETBSD_REVISIONID; .asciz " $")
#else
-#define RCSID(_s) _IDENTSTR(_s)
+#define RCSID(_s) _IDENTSTR(.asciz _s)
#endif
#define WEAK_ALIAS(alias,sym) \
Index: src/sys/arch/i386/include/asm.h
diff -u src/sys/arch/i386/include/asm.h:1.45 src/sys/arch/i386/include/asm.h:1.46
--- src/sys/arch/i386/include/asm.h:1.45 Sun Jun 9 22:35:27 2024
+++ src/sys/arch/i386/include/asm.h Sun Jan 5 14:30:38 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.45 2024/06/09 22:35:27 riastradh Exp $ */
+/* $NetBSD: asm.h,v 1.46 2025/01/05 14:30:38 riastradh Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -189,10 +189,11 @@
#endif
#ifdef _NETBSD_REVISIONID
#define RCSID(_s) \
- _IDENTSTR(_s); \
- _IDENTSTR("$" "NetBSD: " __FILE__ " " _NETBSD_REVISIONID " $")
+ _IDENTSTR(.asciz _s); \
+ _IDENTSTR(.ascii "$"; .ascii "NetBSD: "; .ascii __FILE__; .ascii " "; \
+ .ascii _NETBSD_REVISIONID; .asciz " $")
#else
-#define RCSID(_s) _IDENTSTR(_s)
+#define RCSID(_s) _IDENTSTR(.asciz _s)
#endif
#ifdef NO_KERNEL_RCSIDS
