From ef7b1f2f0f182829620b592a420cc06c856b4921 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 26 Apr 2003 17:17:45 +0000 Subject: [PATCH] The ENTRY bits were in two places. Remove the one not used (asm.h), but presurve the nice comment by adding it to asmacros.h. --- sys/sparc64/include/asm.h | 24 ------------------------ sys/sparc64/include/asmacros.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h index 694d3832ad48..950849e2251e 100644 --- a/sys/sparc64/include/asm.h +++ b/sys/sparc64/include/asm.h @@ -73,30 +73,6 @@ #define CCFSZ 192 #define SPOFF 2047 -#define _START_ENTRY \ - .text ; \ - .p2align 4 - -/* - * Define a function entry point. - * - * The compiler produces #function for the .type pseudo-op, but the '#' - * character has special meaning in cpp macros, so we use @function like - * other architectures. The assembler seems to accept both. - * The assembler also accepts a .proc pseudo-op, which is used by the - * peep hole optimizer, whose argument is the type code of the return - * value. Since this is difficult to predict and its expected that - * assembler code is already optimized, we leave it out. - */ -#define _ENTRY(x) \ - _START_ENTRY ; \ - .globl CNAME(x) ; \ - .type CNAME(x),@function ; \ -CNAME(x): - -#define ENTRY(x) _ENTRY(x) -#define END(x) .size x, . - x - /* * Kernel RCS ID tag and copyright macros */ diff --git a/sys/sparc64/include/asmacros.h b/sys/sparc64/include/asmacros.h index 9e92645fabf9..b81e2f6a4b20 100644 --- a/sys/sparc64/include/asmacros.h +++ b/sys/sparc64/include/asmacros.h @@ -140,6 +140,17 @@ name: #define EMPTY +/* + * Define a function entry point. + * + * The compiler produces #function for the .type pseudo-op, but the '#' + * character has special meaning in cpp macros, so we use @function like + * other architectures. The assembler seems to accept both. + * The assembler also accepts a .proc pseudo-op, which is used by the + * peep hole optimizer, whose argument is the type code of the return + * value. Since this is difficult to predict and its expected that + * assembler code is already optimized, we leave it out. + */ #define ENTRY(name) \ .text ; \ _ALIGN_TEXT ; \