 @@ -1,14 +1,14 @@
-/* $NetBSD: asm.h,v 1.36 2017/01/14 21:58:17 christos Exp $ */
+/* $NetBSD: asm.h,v 1.37 2020/04/17 14:19:43 joerg Exp $ */
 /*
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -633,27 +633,29 @@ label:	ASCIZ msg;						\
 	.ascii msg;							\
 	.popsection
 #else
 #define	WARN_REFERENCES(sym,msg)					\
 	.pushsection .gnu.warning./**/sym;				\
 	.ascii msg;							\
 	.popsection
 #endif /* __STDC__ */
 /*
  * Kernel RCS ID tag and copyright macros
  */
 #define	__SECTIONSTRING(_sec, _str)				\
-	.pushsection _sec ; .asciz _str ; .popsection
+	.pushsection _sec,"MS",@progbits,1;			\
 	.asciz x;						\
 	.popsection
 #ifdef _KERNEL
 #define	__KERNEL_RCSID(_n, _s)		__SECTIONSTRING(.ident, _s)
 #define	__KERNEL_COPYRIGHT(_n, _s)	__SECTIONSTRING(.copyright, _s)
 #ifdef NO_KERNEL_RCSIDS
 #undef __KERNEL_RCSID
 #define	__KERNEL_RCSID(_n, _s)		/* nothing */
 #endif
 #if defined(MULTIPROCESSOR)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.19 2014/05/22 14:59:01 uebayasi Exp $	*/
+/*	$NetBSD: asm.h,v 1.20 2020/04/17 14:19:43 joerg Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -102,27 +102,29 @@
 #else
 # define _PROF_PROLOGUE
 #endif
 #define	ENTRY(y)	_ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
 #define	NENTRY(y)	_ENTRY(_C_LABEL(y))
 #define	ALTENTRY(x)	NENTRY(x)
 #define	ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
 #define	LABEL(y)	_LABEL(_C_LABEL(y))
 #define	END(y)		.size y, . - y
 #define	ASMSTR		.asciz
-#define RCSID(x)	.pushsection ".ident"; .asciz x; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\
 	alias = sym
 /*
  * STRONG_ALIAS: create a strong alias.
  */
 #define STRONG_ALIAS(alias,sym)						\
 	.globl alias;							\
 	alias = sym
 #ifdef __STDC__

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.31 2020/04/13 05:40:25 maxv Exp $	*/
+/*	$NetBSD: asm.h,v 1.32 2020/04/17 14:19:43 joerg Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -211,27 +211,29 @@
 #endif
 #else
 #define	REL_SYM(a, b)	(a)
 #define	PLT_SYM(x)	x
 #define	GOT_SYM(x)	x
 #define	GOT_GET(x,got,sym)	\
 	ldr	x, sym;
 #define	GOT_INIT(got,gotsym,pclabel)
 #define	GOT_INITSYM(gotsym,pclabel)
 #define	PIC_SYM(x,y)	x
 #endif	/* __PIC__ */
-#define RCSID(x)	.pushsection ".ident"; .asciz x; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\
 	alias = sym
 /*
  * STRONG_ALIAS: create a strong alias.
  */
 #define STRONG_ALIAS(alias,sym)						\
 	.globl alias;							\
 	alias = sym
 #ifdef __STDC__

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.16 2019/04/16 12:25:17 skrll Exp $	*/
+/*	$NetBSD: asm.h,v 1.17 2020/04/17 14:19:43 joerg Exp $	*/
 /*	$OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $	*/
 /*
  * Copyright (c) 1990,1991,1994 The University of Utah and
  * the Computer Systems Laboratory (CSL).  All rights reserved.
+ *
  * Permission to use, copy, modify and distribute this software is hereby
  * granted provided that (1) source code retains these copyright, permission,
  * and disclaimer notices, and (2) redistributions including binaries
  * reproduce the notices in supporting documentation, and (3) all advertising
  * materials mentioning features or use of this software display the following
  * acknowledgement: ``This product includes software developed by the
 @@ -89,28 +89,28 @@
 #define LEAF_ENTRY(x) 				!\
 	LEAF_ENTRY_NOPROFILE(x)
 #endif /* GPROF */
 #define ENTRY(x,n) 				!\
 	ENTRY_NOPROFILE(x,n)			!\
 	_PROF_PROLOGUE
 #define ALTENTRY(x) ! .export x, entry ! .label x
 #define EXIT(x) ! .exit ! .procend ! .size x, .-x
-#define RCSID(x)	.pushsection ".ident"		!\
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
-			.asciz x			!\
+			.asciz x;					\
 			.popsection
 #define WEAK_ALIAS(alias,sym)				\
 	.weak alias !					\
 	alias = sym
 /*
  * STRONG_ALIAS: create a strong alias.
  */
 #define STRONG_ALIAS(alias,sym)				\
 	.globl alias !					\
 	alias = sym

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.42 2016/05/15 15:26:04 chs Exp $	*/
+/*	$NetBSD: asm.h,v 1.43 2020/04/17 14:19:43 joerg Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -171,27 +171,29 @@
 # define _PROF_PROLOGUE
 #endif
 #define	ENTRY(y)	_ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
 #define	NENTRY(y)	_ENTRY(_C_LABEL(y))
 #define	ALTENTRY(x)	NENTRY(x)
 #define	ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
 #define	LABEL(y)	_LABEL(_C_LABEL(y))
 #define	END(y)		.size y, . - y
 #define	ASMSTR		.asciz
 #ifdef __ELF__
-#define RCSID(x)	.pushsection ".ident"; .asciz x; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #else
 #define RCSID(x)	.text; .asciz x
 #endif
 #ifdef NO_KERNEL_RCSIDS
 #define	__KERNEL_RCSID(_n, _s)	/* nothing */
 #else
 #define	__KERNEL_RCSID(_n, _s)	RCSID(_s)
 #endif
 #ifdef __ELF__
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.7 2014/03/14 17:36:03 cherry Exp $	*/
+/*	$NetBSD: asm.h,v 1.8 2020/04/17 14:19:43 joerg Exp $	*/
 /* -
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -193,27 +193,29 @@ label:	ASCIZ msg;				\
 #define	WARN_REFERENCES(sym,msg)					\
 	.pushsection .gnu.warning. ## sym;				\
 	.ascii msg;							\
 	.popsection
 #else
 #define	WARN_REFERENCES(sym,msg)					\
 	.pushsection .gnu.warning./**/sym;				\
 	.ascii msg;							\
 	.popsection
 #endif /* __STDC__ */
 #ifdef __ELF__
-#define RCSID(name)		.pushsection ".ident"; .asciz name; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #else
 #define RCSID(name)		.asciz name
 #endif
 /*
  * Kernel RCS ID tag and copyright macros
  */
 #ifdef _KERNEL
 #define	__KERNEL_SECTIONSTRING(_sec, _str)				\
 	.pushsection _sec ; .asciz _str ; .popsection

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.33 2013/09/12 15:36:17 joerg Exp $	*/
+/*	$NetBSD: asm.h,v 1.34 2020/04/17 14:19:43 joerg Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -129,28 +129,28 @@
+ *
  * The m68k behavior is similar to the ENTRY2 macro found in
  * solaris' asm_linkage.h.
+ *
  * Providing ENTRY2 and changing all the code that uses ALTENTRY
  * to use it would be a desirable change.
  */
 #ifdef PROF
 #define ALTENTRY(name, rname)	ENTRY(name); jra rname+12
 #else
 #define ALTENTRY(name, rname)	_ENTRY(_C_LABEL(name))
 #endif
-#define RCSID(x)	.pushsection ".ident"	;	\
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
-			.asciz x		;	\
+			.asciz x;					\
 			.popsection
 /*
  * Global variables of whatever sort.
  */
 #define	GLOBAL(x)					\
 		.globl	_C_LABEL(x)		;	\
 	_C_LABEL(x):
 #define	ASGLOBAL(x)					\
 		.globl	_ASM_LABEL(x)		;	\
 	_ASM_LABEL(x):

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.55 2018/09/04 00:01:41 mrg Exp $	*/
+/*	$NetBSD: asm.h,v 1.56 2020/04/17 14:19:43 joerg Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -257,27 +257,29 @@ _C_LABEL(x):
 	jal	_C_LABEL(printf);	\
 	nop;				\
 	MSG(msg)
 #define	MSG(msg)			\
 	.rdata;				\
 :	.asciz	msg;			\
 	.text
 #define	ASMSTR(str)			\
 	.asciz str;			\
 	.align	3
-#define	RCSID(name)	.pushsection ".ident"; .asciz name; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 /*
  * XXX retain dialects XXX
  */
 #define	ALEAF(x)			XLEAF(x)
 #define	NLEAF(x)			LEAF_NOPROFILE(x)
 #define	NON_LEAF(x, fsize, retpc)	NESTED(x, fsize, retpc)
 #define	NNON_LEAF(x, fsize, retpc)	NESTED_NOPROFILE(x, fsize, retpc)
 #if defined(__mips_o32)
 #define	SZREG	4
 #else
 #define	SZREG	8

 @@ -1,14 +1,14 @@
-/* $NetBSD: asm.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: asm.h,v 1.2 2020/04/17 14:19:44 joerg Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -73,27 +73,29 @@
 #ifdef __PIC__
 #define	PLT(x)			plt(x)
 #define	PIC_GOTSETUP(r)					\
         l.jal	999f					;\
 	l.nop						;\
 :	l.movhi	r,gotpchi(_GLOBAL_OFFSET_TABLE_+0)	;\
 	l.ori	r,r,gotpclo(_GLOBAL_OFFSET_TABLE_+4)	;\
 	l.add	r,r,r9
 #else
 #define	PLT(x)			x
 #endif
-#define __RCSID(x)	.pushsection ".ident"; .asciz x; .popsection
+#define __RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #define RCSID(x)	__RCSID(x)
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\
 	alias = sym
 /*
  * STRONG_ALIAS: create a strong alias.
  */
 #define STRONG_ALIAS(alias,sym)						\
 	.globl alias;							\
 	alias = sym

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.49 2020/03/01 23:23:36 rin Exp $	*/
+/*	$NetBSD: asm.h,v 1.50 2020/04/17 14:19:44 joerg Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -146,27 +146,29 @@ y:	.quad	.##y,.TOC.@tocbase,0;	\
 # define CALL(y)			\
 	bl	y
 # define ENTRY_NOPROFILE(y) _ENTRY(_C_LABEL(y))
 # define ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
 #endif /* __LP64__ */
 #define	GLOBAL(y)	_GLOBAL(_C_LABEL(y))
 #define	ASMSTR		.asciz
 #undef __RCSID
 #define RCSID(x)	__RCSID(x)
-#define	__RCSID(x)	.pushsection .ident; .asciz x; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #ifdef __ELF__
 # define WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\
 	alias = sym
 #endif /* __ELF__ */
 /*
  * STRONG_ALIAS: create a strong alias.
  */
 #define STRONG_ALIAS(alias,sym)						\
 	.globl alias;							\
 	alias = sym

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.4 2020/03/14 16:12:16 skrll Exp $	*/
+/*	$NetBSD: asm.h,v 1.5 2020/04/17 14:19:44 joerg Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -105,27 +105,29 @@
 	la	a0, 9f;			\
 	call	_C_LABEL(printf);	\
 	MSG(msg)
 #define	MSG(msg)			\
         .pushsection .rodata.str1.8,"aMS",@progbits,1; \
 :	.asciiz	msg;			\
 	.popsection
 #define	ASMSTR(str)			\
 	.asciiz str;			\
 	.align	3
-#define	__RCSID(name)	.pushsection ".ident"; .asciz name; .popsection
+#define __RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #define RCSID(name)	__RCSID(name)
 #if defined(_LP64)
 #define	SZREG	8
 #else
 #define	SZREG	4
 #endif
 #define	ALSK	15		/* stack alignment */
 #define	ALMASK	-15		/* stack alignment */
 #define	SZFPREG	8
 #define	FP_L	fld
 #define	FP_S	fsd

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.28 2013/09/12 15:36:17 joerg Exp $	*/
+/*	$NetBSD: asm.h,v 1.29 2020/04/17 14:19:44 joerg Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -193,27 +193,29 @@
 #define CALL_DATUM(function, lpcs) \
 		.long	function
 #define CALL_DATUM_LOCAL(function, lpcs) \
 		.long	function
 #endif /* !__PIC__ */
 #define	ASMSTR		.asciz
 #ifdef __ELF__
-#define RCSID(x)	.pushsection ".ident"; .asciz x; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #else
 #define	RCSID(x)	.text; .asciz x
 #endif
 #ifdef NO_KERNEL_RCSIDS
 #define	__KERNEL_RCSID(_n, _s)	/* nothing */
 #else
 #define	__KERNEL_RCSID(_n, _s)	RCSID(_s)
 #endif
 #ifdef __ELF__
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak _C_LABEL(alias);						\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.22 2015/08/23 11:01:24 joerg Exp $ */
+/*	$NetBSD: asm.h,v 1.23 2020/04/17 14:19:44 joerg Exp $ */
 /*
  * Copyright (c) 1994 Allen Briggs
  * All rights reserved.
+ *
  * Gleaned from locore.s and sun3 asm.h which had the following copyrights:
  * locore.s:
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * sun3/include/asm.h:
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1990 The Regents of the University of California.
+ *
 @@ -147,27 +147,29 @@
 #endif
 #define ENTRY(name)		_ENTRY(_C_LABEL(name)); _PROF_PROLOGUE
 #define ENTRY_NOPROFILE(name)	_ENTRY(_C_LABEL(name))
 #define	ASENTRY(name)		_ENTRY(_ASM_LABEL(name)); _PROF_PROLOGUE
 #define	FUNC(name)		ASENTRY(name)
 #define RODATA(name)		.align 4; .text; .globl _C_LABEL(name); \
 				OTYPE(_C_LABEL(name)); _C_LABEL(name):
 #define	END(y)		.size y, . - y
 #define ASMSTR			.asciz
 #ifdef __ELF__
-#define RCSID(name)		.pushsection ".ident"; .asciz name; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #else
 #define RCSID(name)		.asciz name
 #endif
 #ifdef NO_KERNEL_RCSIDS
 #define	__KERNEL_RCSID(_n, _s)	/* nothing */
 #else
 #define	__KERNEL_RCSID(_n, _s)	RCSID(_s)
 #endif
 #ifdef __ELF__
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: asm.h,v 1.27 2018/04/25 09:23:00 ragge Exp $ */
+/*	$NetBSD: asm.h,v 1.28 2020/04/17 14:19:44 joerg Exp $ */
 /*
  * Copyright (c) 1982, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
 @@ -69,27 +69,29 @@
 #ifdef GPROF
 # define _PROF_PROLOGUE	\
 	.data; 1:; .long 0; .text; moval 1b,%r0; jsb _ASM_LABEL(__mcount)
 #else
 # define _PROF_PROLOGUE
 #endif
 #define ENTRY(x, regs)		_ENTRY(_C_LABEL(x), regs); _PROF_PROLOGUE
 #define NENTRY(x, regs)		_ENTRY(_C_LABEL(x), regs)
 #define ASENTRY(x, regs)	_ENTRY(_ASM_LABEL(x), regs); _PROF_PROLOGUE
 #define END(x)			.size _C_LABEL(x),.-_C_LABEL(x)
 #define ALTENTRY(x)		.globl _C_LABEL(x); _C_LABEL(x):
-#define RCSID(name)		.pushsection ".ident"; .asciz name; .popsection
+#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
 			.asciz x;					\
 			.popsection
 #ifdef NO_KERNEL_RCSIDS
 #define __KERNEL_RCSID(_n, _s)  /* nothing */
 #else
 #define __KERNEL_RCSID(_n, _s)  RCSID(_s)
 #endif
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\
 	alias = sym
 /*
  * STRONG_ALIAS: create a strong alias.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cdefs_elf.h,v 1.55 2020/03/22 00:25:01 kamil Exp $	*/
+/*	$NetBSD: cdefs_elf.h,v 1.56 2020/04/17 14:19:44 joerg Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -126,32 +126,32 @@
 #define __ifunc(name, resolver) \
 	__asm(".globl	" _C_LABEL_STRING(#name) "\n" \
 	      ".type	" _C_LABEL_STRING(#name) ", @gnu_indirect_function\n" \
 	      _C_LABEL_STRING(#name) " = " _C_LABEL_STRING(#resolver))
 #define __hidden_ifunc(name, resolver) \
 	__asm(".globl	" _C_LABEL_STRING(#name) "\n" \
 	      ".hidden	" _C_LABEL_STRING(#name) "\n" \
 	      ".type	" _C_LABEL_STRING(#name) ", @gnu_indirect_function\n" \
 	      _C_LABEL_STRING(#name) " = " _C_LABEL_STRING(#resolver))
 #endif
 #if __STDC__
 #define	__SECTIONSTRING(_sec, _str)					\
-	__asm(".pushsection " #_sec "\n"				\
+	__asm(".pushsection " #_sec ",\"MS\",@progbits,1\n"		\
 	      ".asciz \"" _str "\"\n"					\
 	      ".popsection")
 #else
 #define	__SECTIONSTRING(_sec, _str)					\
-	__asm(".pushsection _sec\n"					\
+	__asm(".pushsection " _sec ",\"MS\",@progbits,1\n"		\
 	      ".asciz \"" _str "\"\n"					\
 	      ".popsection")
 #endif
 #define	__IDSTRING(_n,_s)		__SECTIONSTRING(.ident,_s)
 #define	__RCSID(_s)			__IDSTRING(rcsid,_s)
 #define	__SCCSID(_s)
 #define __SCCSID2(_s)
 #define	__COPYRIGHT(_s)			__SECTIONSTRING(.copyright,_s)
 #define	__KERNEL_RCSID(_n, _s)		__RCSID(_s)
 #define	__KERNEL_SCCSID(_n, _s)