summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include/asm.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/include/asm.h')
-rw-r--r--sys/arch/i386/include/asm.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h
index da064ff12c2..7e8288633c2 100644
--- a/sys/arch/i386/include/asm.h
+++ b/sys/arch/i386/include/asm.h
@@ -68,10 +68,15 @@
#endif
#define _ASM_LABEL(x) x
+/* let kernels and others override entrypoint alignment */
+#ifndef _ALIGN_TEXT
+# define _ALIGN_TEXT .align 2, 0x90
+#endif
+
#define _ENTRY(x) \
- .text; .align 2, 0x90; .globl x; .type x,@function; x:
+ .text; _ALIGN_TEXT; .globl x; .type x,@function; x:
-#ifdef PROF
+#ifdef GPROF
# define _PROF_PROLOGUE \
pushl %ebp; movl %esp,%ebp; call PIC_PLT(mcount); popl %ebp
#else
@@ -79,8 +84,11 @@
#endif
#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
+#define NENTRY(y) _ENTRY(_C_LABEL(y))
#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
+#define ALTENTRY(name) .globl _C_LABEL(name); _C_LABEL(name):
+
#define ASMSTR .asciz
#define RCSID(x) .text; .asciz x