The following is needed to be able to compile glibc succesfully (glibc
redefines ENTRY that makes uses of END).
Ok to apply?
2005-05-24 Alfred M. Szmidt <[EMAIL PROTECTED]>
* i386/include/mach/i386/asm.h (END): New macro.
* i386/include/mach/i386/syscall_sw.h (kernel_trap): Call END.
--- i386/include/mach/i386/asm.h
+++ i386/include/mach/i386/asm.h
@@ -100,7 +100,7 @@
.p2align TEXT_ALIGN; LEXT(x) LEXT(y)
#define ASENTRY(x) .globl x; .p2align TEXT_ALIGN; gLB(x) ; \
pushl %ebp; movl %esp, %ebp; MCOUNT; popl %ebp;
-
+#define END(x) /* Do nothing. */
#else /* GPROF */
#define MCOUNT
@@ -108,6 +108,7 @@
#define ENTRY2(x,y) .globl EXT(x); .globl EXT(y); \
.p2align TEXT_ALIGN; LEXT(x) LEXT(y)
#define ASENTRY(x) .globl x; .p2align TEXT_ALIGN; gLB(x)
+#define END(x) /* Do nothing. */
#endif /* GPROF */
#define Entry(x) .globl EXT(x); .p2align TEXT_ALIGN; LEXT(x)
--- i386/include/mach/i386/syscall_sw.h
+++ i386/include/mach/i386/syscall_sw.h
@@ -35,13 +35,15 @@
movl $ trap_number,%eax; \
SVC; \
jb LCL(cerror); \
- ret;
+ ret; \
+END(trap_name)
#else
#define kernel_trap(trap_name,trap_number,number_args) \
ENTRY(trap_name) \
movl $ trap_number,%eax; \
SVC; \
- ret;
+ ret; \
+END(trap_name)
#endif
#endif /* _MACH_I386_SYSCALL_SW_H_ */
_______________________________________________
Bug-hurd mailing list
Bug-hurd@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-hurd
