From da26383918b63191f0f37410489ad06ff8c4cf3a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 1 Jul 1998 02:35:24 +0000 Subject: [PATCH] Change _C_LABEL() to use proper underscoring depending on __ELF__ or not. --- sys/arch/sparc/include/asm.h | 6 +++++- sys/arch/sparc/include/cdefs.h | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/arch/sparc/include/asm.h b/sys/arch/sparc/include/asm.h index 1f049f9a6108..10f02fca3059 100644 --- a/sys/arch/sparc/include/asm.h +++ b/sys/arch/sparc/include/asm.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.5 1997/07/16 15:16:43 christos Exp $ */ +/* $NetBSD: asm.h,v 1.6 1998/07/01 02:35:24 tv Exp $ */ /* * Copyright (c) 1994 Allen Briggs @@ -44,11 +44,15 @@ #ifndef _ASM_H_ #define _ASM_H_ +#ifdef __ELF__ +#define _C_LABEL(name) name +#else #ifdef __STDC__ #define _C_LABEL(name) _ ## name #else #define _C_LABEL(name) _/**/name #endif +#endif #define _ASM_LABEL(name) name #ifdef PIC diff --git a/sys/arch/sparc/include/cdefs.h b/sys/arch/sparc/include/cdefs.h index ac7514c73447..8a6f2e6d0491 100644 --- a/sys/arch/sparc/include/cdefs.h +++ b/sys/arch/sparc/include/cdefs.h @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.5 1997/11/04 23:10:19 thorpej Exp $ */ +/* $NetBSD: cdefs.h,v 1.6 1998/07/01 02:35:24 tv Exp $ */ /* * Written by J.T. Conklin 01/17/95. @@ -8,7 +8,11 @@ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ +#ifdef __ELF__ +#define _C_LABEL(x) x +#else #define _C_LABEL(x) __CONCAT(_,x) +#endif #ifdef __GNUC__ #define __RENAME(x) __asm__(___STRING(_C_LABEL(x)))