From da572a137f814cf25ce952d7c5e3eb6d13d5cdd8 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 2 Dec 1998 21:16:46 +0000
Subject: [PATCH] Argh, fix the ANSI CPP version of the a.out
 WARN_REFERENCES().

---
 sys/arch/arm32/include/asm.h   | 11 ++++++-----
 sys/arch/i386/include/asm.h    | 11 ++++++-----
 sys/arch/m68k/include/asm.h    | 11 ++++++-----
 sys/arch/pc532/include/asm.h   | 11 ++++++-----
 sys/arch/sparc/include/asm.h   | 11 ++++++-----
 sys/arch/sparc64/include/asm.h | 11 ++++++-----
 sys/arch/vax/include/asm.h     | 11 ++++++-----
 7 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/sys/arch/arm32/include/asm.h b/sys/arch/arm32/include/asm.h
index 22145dfdfd6d..76b065e4bac1 100644
--- a/sys/arch/arm32/include/asm.h
+++ b/sys/arch/arm32/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.10 1998/12/02 00:58:42 thorpej Exp $	*/
+/*	$NetBSD: asm.h,v 1.11 1998/12/02 21:16:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -85,14 +85,15 @@
 #define RCSID(x)	.text; .asciz x
 
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
 #endif /* !_ARM_ASM_H_ */
diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h
index dce54787ed35..d17afa301162 100644
--- a/sys/arch/i386/include/asm.h
+++ b/sys/arch/i386/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.11 1998/12/02 00:58:43 thorpej Exp $	*/
+/*	$NetBSD: asm.h,v 1.12 1998/12/02 21:16:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -94,14 +94,15 @@
 #define RCSID(x)	.text; .asciz x
 
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
 #endif /* !_I386_ASM_H_ */
diff --git a/sys/arch/m68k/include/asm.h b/sys/arch/m68k/include/asm.h
index 236ac0de5740..68cffe5e8eda 100644
--- a/sys/arch/m68k/include/asm.h
+++ b/sys/arch/m68k/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.16 1998/12/02 00:58:43 thorpej Exp $	*/
+/*	$NetBSD: asm.h,v 1.17 1998/12/02 21:16:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -181,14 +181,15 @@
 #endif /* _KERNEL */
 
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
 #endif /* _ASM_H_ */
diff --git a/sys/arch/pc532/include/asm.h b/sys/arch/pc532/include/asm.h
index 23720abaaa72..eacda4d57b7a 100644
--- a/sys/arch/pc532/include/asm.h
+++ b/sys/arch/pc532/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.13 1998/12/02 00:58:43 thorpej Exp $	*/
+/*	$NetBSD: asm.h,v 1.14 1998/12/02 21:16:46 thorpej Exp $	*/
 
 /* 
  * Mach Operating System
@@ -216,14 +216,15 @@
 #endif
 
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
 #endif
diff --git a/sys/arch/sparc/include/asm.h b/sys/arch/sparc/include/asm.h
index ccd4952c8555..86775b1bfe54 100644
--- a/sys/arch/sparc/include/asm.h
+++ b/sys/arch/sparc/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.8 1998/12/02 00:58:43 thorpej Exp $ */
+/*	$NetBSD: asm.h,v 1.9 1998/12/02 21:16:46 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994 Allen Briggs
@@ -106,14 +106,15 @@
 #define RCSID(name)		.asciz name
 
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
 #endif /* _ASM_H_ */
diff --git a/sys/arch/sparc64/include/asm.h b/sys/arch/sparc64/include/asm.h
index 603be7331226..a8e1d0c4230b 100644
--- a/sys/arch/sparc64/include/asm.h
+++ b/sys/arch/sparc64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.6 1998/12/02 00:58:43 thorpej Exp $ */
+/*	$NetBSD: asm.h,v 1.7 1998/12/02 21:16:46 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994 Allen Briggs
@@ -123,14 +123,15 @@
 #endif /* __STDC__ */
 #else
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 #endif /* __ELF__ */
 
diff --git a/sys/arch/vax/include/asm.h b/sys/arch/vax/include/asm.h
index 0bd8538a9e91..55962030e54d 100644
--- a/sys/arch/vax/include/asm.h
+++ b/sys/arch/vax/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.7 1998/12/02 00:58:43 thorpej Exp $ */
+/*	$NetBSD: asm.h,v 1.8 1998/12/02 21:16:46 thorpej Exp $ */
 /*
  * Copyright (c) 1982, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -82,14 +82,15 @@
 #endif
 
 #ifdef __STDC__
+#define	__STRING(x)			#x
 #define	WARN_REFERENCES(sym,msg)					\
-	.stabs \" ## msg ## \",30,0,0,0 ;				\
-	.stabs \"_ ## sym ## \",1,0,0,0
+	.stabs msg ## ,30,0,0,0 ;					\
+	.stabs __STRING(_ ## sym) ## ,1,0,0,0
 #else
-#define	WARN_REFERENCES_STRING(x)	"x"
+#define	__STRING(x)			"x"
 #define	WARN_REFERENCES(sym,msg)					\
 	.stabs msg,30,0,0,0 ;						\
-	.stabs WARN_REFERENCES_STRING(_/**/sym),1,0,0,0
+	.stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
 #endif