diff --git a/sys/arch/sh5/include/asm.h b/sys/arch/sh5/include/asm.h
index 984a624607cb..1a31b3efa719 100644
--- a/sys/arch/sh5/include/asm.h
+++ b/sys/arch/sh5/include/asm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.2 2002/07/10 10:24:16 scw Exp $	*/
+/*	$NetBSD: asm.h,v 1.3 2002/07/10 11:36:23 scw Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -81,8 +81,16 @@
 #define	PIC_GOT(x)	x
 #define	PIC_GOTOFF(x)	x
 
+/*
+ * XXX: Remove underscore when we switch to native NetBSD toolchain
+ */
+#if __STDC__
+#define _C_LABEL(x)	_ ## x
+#define _ASM_LABEL(x)	_ ## x
+#else
 #define _C_LABEL(x)	_/**/x
-#define	_ASM_LABEL(x)	_/**/x
+#define _ASM_LABEL(x)	_/**/x
+#endif
 
 /* let kernels and others override entrypoint alignment */
 #ifndef _ALIGN_TEXT
diff --git a/sys/arch/sh5/include/cdefs.h b/sys/arch/sh5/include/cdefs.h
index 9a3700efb8c1..b8f76a1b3f8d 100644
--- a/sys/arch/sh5/include/cdefs.h
+++ b/sys/arch/sh5/include/cdefs.h
@@ -1,7 +1,9 @@
-/*	$NetBSD: cdefs.h,v 1.1 2002/07/05 13:31:56 scw Exp $	*/
+/*	$NetBSD: cdefs.h,v 1.2 2002/07/10 11:36:23 scw Exp $	*/
 
 #ifndef _SH5_CDEFS_H_
 #define	_SH5_CDEFS_H_
 
+/* XXX: Temporary, until we switch to native NetBSD toolchain */
+#define	__LEADING_UNDERSCORE
 
 #endif /* _SH5_CDEFS_H_ */