Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/m68k/include * Change multiple inclusion protection...



details:   https://anonhg.NetBSD.org/src/rev/3981e8ffad47
branches:  trunk
changeset: 472549:3981e8ffad47
user:      kleink <kleink%NetBSD.org@localhost>
date:      Sat May 01 19:20:52 1999 +0000

description:
* Change multiple inclusion protection symbols to use the standard naming
  convention (not that it should matter for assembly).
* Provide an additional set of _C_LABEL() macros for ELF.
* Provide a PIC_PLT() macro for the benefit of ELF.

diffstat:

 sys/arch/m68k/include/asm.h |  30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r cb6c36d10e14 -r 3981e8ffad47 sys/arch/m68k/include/asm.h
--- a/sys/arch/m68k/include/asm.h       Sat May 01 19:17:06 1999 +0000
+++ b/sys/arch/m68k/include/asm.h       Sat May 01 19:20:52 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.17 1998/12/02 21:16:46 thorpej Exp $ */
+/*     $NetBSD: asm.h,v 1.18 1999/05/01 19:20:52 kleink Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -77,14 +77,28 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ASM_H_
-#define _ASM_H_
+#ifndef _M68K_ASM_H_
+#define _M68K_ASM_H_
+
+#if defined(__ELF__) && defined(PIC)
+#define PIC_PLT(name)  name@PLTPC
+#else
+#define PIC_PLT(name)  name
+#endif
 
-#ifdef __STDC__
-#define        _C_LABEL(name)          _ ## name
-#else
-#define        _C_LABEL(name)          _/**/name
+#ifdef __ELF__
+# if __STDC__
+#  define _C_LABEL(name)       name
+# else
+#  define _C_LABEL(name)       name
 #endif /* __STDC__ */
+#else /* __ELF__ */
+# if __STDC__
+#  define _C_LABEL(name)       _ ## name
+# else
+#  define _C_LABEL(name)       _/**/name
+# endif /* __STDC__ */
+#endif /* __ELF__ */
 
 #define        _ASM_LABEL(name)        name
 
@@ -192,4 +206,4 @@
        .stabs __STRING(_/**/sym),1,0,0,0
 #endif /* __STDC__ */
 
-#endif /* _ASM_H_ */
+#endif /* _M68K_ASM_H_ */



Home | Main Index | Thread Index | Old Index