Don't define _LOCORE here.

sys/arch/alpha/alpha/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.9 1996/02/02 02:33:26 mycroft Exp $	*/
+/*	$NetBSD: locore.s,v 1.10 1996/02/02 20:05:08 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -27,8 +27,6 @@
  * rights to redistribute these changes.
  */
 
-#define _LOCORE
-
 #include <machine/asm.h>
 #ifndef EVCNT_COUNTERS
 #include <machine/intrcnt.h>

sys/arch/pc532/pc532/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.32 1996/02/01 22:32:06 mycroft Exp $	*/
+/*	$NetBSD: locore.s,v 1.33 1996/02/02 20:05:21 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993 Philip A. Nelson.
@@ -47,12 +47,11 @@
 /*
  * Tell include files that we don't want any C stuff.
  */
-#define _LOCORE
-
 #include "assym.h"
 
 #include <sys/errno.h>
 #include <sys/syscall.h>
+
 #include <machine/asm.h>
 #include <machine/psl.h>
 #include <machine/pte.h>

sys/arch/sparc/sparc/amd7930intr.s

@@ -44,9 +44,6 @@
  */
 
 #ifndef AUDIO_C_HANDLER
-#ifndef _LOCORE
-#define _LOCORE
-#endif
 #include "assym.h"
 #include <sparc/sparc/intreg.h>
 /* XXX this goes in a header file -- currently, it's hidden in locore.s */

sys/arch/sparc/sparc/bsd_fdintr.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: bsd_fdintr.s,v 1.6 1996/02/02 02:37:22 mycroft Exp $ */
+/*	$NetBSD: bsd_fdintr.s,v 1.7 1996/02/02 20:05:35 mycroft Exp $ */
 
 /*
  * Copyright (c) 1995 Paul Kranenburg
@@ -32,9 +32,6 @@
  */
 
 #ifndef FDC_C_HANDLER
-#ifndef _LOCORE
-#define _LOCORE
-#endif
 #include "assym.h"
 #include <sparc/sparc/intreg.h>
 #include <sparc/sparc/auxreg.h>

sys/arch/sparc/sparc/locore.s

@@ -42,7 +42,6 @@
  *	@(#)locore.s	8.4 (Berkeley) 12/10/93
  */
 
-#define	_LOCORE
 #include "assym.h"
 #include <sparc/sparc/intreg.h>
 #include <sparc/sparc/timerreg.h>