diff options
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/vector.S | 12 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S index 475aa42372b..0e140e93df5 100644 --- a/sys/arch/amd64/amd64/vector.S +++ b/sys/arch/amd64/amd64/vector.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.S,v 1.22 2009/06/09 02:56:38 krw Exp $ */ +/* $OpenBSD: vector.S,v 1.23 2009/07/10 13:51:47 jsg Exp $ */ /* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */ /* @@ -265,9 +265,9 @@ calltrap: /* XXX See comment in locore.s */ #ifdef __ELF__ -#define XINTR(name,num) Xintr_/**/name/**/num +#define XINTR(name,num) Xintr_##name##num #else -#define XINTR(name,num) _Xintr_/**/name/**/num +#define XINTR(name,num) _Xintr_##name##num #endif #if NLAPIC > 0 @@ -398,18 +398,18 @@ IDTVEC(resume_lapic_ltimer) */ #define INTRSTUB(name, num, early_ack, late_ack, mask, unmask, level_mask) \ -IDTVEC(recurse_/**/name/**/num) ;\ +IDTVEC(recurse_##name##num) ;\ INTR_RECURSE_HWFRAME ;\ subq $8,%rsp ;\ pushq $T_ASTFLT /* trap # for doing ASTs */ ;\ INTRENTRY ;\ -IDTVEC(resume_/**/name/**/num) \ +IDTVEC(resume_##name##num) \ movq $IREENT_MAGIC,TF_ERR(%rsp) ;\ movl %ebx,%r13d ;\ movq CPUVAR(ISOURCES) + (num) * 8, %r14 ;\ movl IS_MAXLEVEL(%r14),%ebx ;\ jmp 1f ;\ -IDTVEC(intr_/**/name/**/num) ;\ +IDTVEC(intr_##name##num) ;\ pushq $0 /* dummy error code */ ;\ pushq $T_ASTFLT /* trap # for doing ASTs */ ;\ INTRENTRY ;\ diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 9f08dea2ce9..07d6902b428 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.16 2009/03/23 18:51:51 guenther Exp $ +# $OpenBSD: Makefile.amd64,v 1.17 2009/07/10 13:51:47 jsg Exp $ # Makefile for OpenBSD # @@ -48,7 +48,7 @@ CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} -AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE +AFLAGS= -x assembler-with-cpp -D_LOCORE LINKFLAGS= -Ttext 0xffffffff801001e0 -e start -X STRIPFLAGS= -g -x |