From 36f2ca308cd42b8c6ac39b93ee48a824307705fe Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Fri, 10 Jul 2009 13:51:48 +0000 Subject: Switch away from using -traditional-cpp to iso/ansi cpp for asm files. More architectures hopefully to follow. ok kettenis@ --- sys/arch/i386/conf/Makefile.i386 | 4 ++-- sys/arch/i386/i386/apicvec.s | 14 +++++++------- sys/arch/i386/i386/locore.s | 4 ++-- sys/arch/i386/i386/mptramp.s | 6 +++--- sys/arch/i386/i386/vector.s | 18 +++++++++--------- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sys/arch/i386') diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 78ede205a6c..abfc61545cc 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.51 2009/01/11 21:02:03 pirofti Exp $ +# $OpenBSD: Makefile.i386,v 1.52 2009/07/10 13:51:47 jsg Exp $ # Makefile for OpenBSD # @@ -46,7 +46,7 @@ CMACHFLAGS+= -fno-builtin-printf -fno-builtin-log 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 0xD0200120 -e start -N --warn-common STRIPFLAGS= -g -X -x diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s index feaaf66d4aa..bef5d4a5dd2 100644 --- a/sys/arch/i386/i386/apicvec.s +++ b/sys/arch/i386/i386/apicvec.s @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvec.s,v 1.18 2009/06/06 22:37:34 guenther Exp $ */ +/* $OpenBSD: apicvec.s,v 1.19 2009/07/10 13:51:47 jsg Exp $ */ /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */ /*- @@ -36,9 +36,9 @@ #include #ifdef __ELF__ -#define XINTR(vec) Xintr/**/vec +#define XINTR(vec) Xintr##vec #else -#define XINTR(vec) _Xintr/**/vec +#define XINTR(vec) _Xintr##vec #endif .globl _C_LABEL(apic_stray) @@ -271,7 +271,7 @@ XINTR(softtty): */ #define APICINTR(name, num, early_ack, late_ack, mask, unmask, level_mask) \ -_C_LABEL(Xintr_/**/name/**/num): \ +_C_LABEL(Xintr_##name##num): \ pushl $0 ;\ pushl $T_ASTFLT ;\ INTRENTRY ;\ @@ -288,7 +288,7 @@ _C_LABEL(Xintr_/**/name/**/num): \ incl _C_LABEL(apic_intrcount)(,%eax,4) ;\ movl _C_LABEL(apic_intrhand)(,%eax,4),%ebx /* chain head */ ;\ testl %ebx,%ebx ;\ - jz _C_LABEL(Xstray_/**/name/**/num) ;\ + jz _C_LABEL(Xstray_##name##num) ;\ APIC_STRAY_INIT /* nobody claimed it yet */ ;\ 7: \ LOCK_KERNEL(IF_PPL(%esp)) ;\ @@ -315,7 +315,7 @@ _C_LABEL(Xintr_/**/name/**/num): \ unmask(num) /* unmask it in hardware */ ;\ late_ack(num) ;\ jmp _C_LABEL(Xdoreti) ;\ -_C_LABEL(Xstray_/**/name/**/num): \ +_C_LABEL(Xstray_##name##num): \ pushl $num ;\ call _C_LABEL(apic_stray) ;\ addl $4,%esp ;\ @@ -328,7 +328,7 @@ _C_LABEL(Xstray_/**/name/**/num): \ orl %eax,%esi #define APIC_STRAY_TEST(name,num) \ testl %esi,%esi ;\ - jz _C_LABEL(Xstray_/**/name/**/num) + jz _C_LABEL(Xstray_##name##num) #else /* !DEBUG */ #define APIC_STRAY_INIT #define APIC_STRAY_INTEGRATE diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index e2c9eaae415..51b235419c7 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.127 2009/06/03 00:49:12 art Exp $ */ +/* $OpenBSD: locore.s,v 1.128 2009/07/10 13:51:47 jsg Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -1390,7 +1390,7 @@ ENTRY(savectx) * XXX - debugger traps are now interrupt gates so at least bdb doesn't lose * control. The sti's give the standard losing behaviour for ddb and kgdb. */ -#define IDTVEC(name) ALIGN_TEXT; .globl X/**/name; X/**/name: +#define IDTVEC(name) ALIGN_TEXT; .globl X##name; X##name: #define TRAP(a) pushl $(a) ; jmp _C_LABEL(alltraps) #define ZTRAP(a) pushl $0 ; TRAP(a) diff --git a/sys/arch/i386/i386/mptramp.s b/sys/arch/i386/i386/mptramp.s index 2644283b41d..499a36dd722 100644 --- a/sys/arch/i386/i386/mptramp.s +++ b/sys/arch/i386/i386/mptramp.s @@ -1,4 +1,4 @@ -/* $OpenBSD: mptramp.s,v 1.11 2009/02/03 11:24:19 mikeb Exp $ */ +/* $OpenBSD: mptramp.s,v 1.12 2009/07/10 13:51:47 jsg Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -104,8 +104,8 @@ #define HALT(x) 1: movl (%edi),%ebx;cmpl $ x,%ebx ; jle 1b ; movl $x,4(%edi) #define HALTT(x,y) movl y,8(%edi); HALT(x) #else -#define HALT(x) /**/ -#define HALTT(x,y) /**/ +#define HALT(x) +#define HALTT(x,y) #endif .globl _C_LABEL(cpu),_C_LABEL(cpu_id),_C_LABEL(cpu_vendor) diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s index bf38ed5c78f..7af014091c2 100644 --- a/sys/arch/i386/i386/vector.s +++ b/sys/arch/i386/i386/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.12 2008/04/26 14:33:27 kettenis Exp $ */ +/* $OpenBSD: vector.s,v 1.13 2009/07/10 13:51:47 jsg Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -86,11 +86,11 @@ * On exit, we jump to Xdoreti(), to process soft interrupts and ASTs. */ #define INTRSTUB(name, num, early_ack, late_ack, mask, unmask, level_mask) \ -IDTVEC(resume_/**/name/**/num) ;\ +IDTVEC(resume_##name##num) ;\ push %ebx ;\ cli ;\ jmp 1f ;\ -IDTVEC(recurse_/**/name/**/num) ;\ +IDTVEC(recurse_##name##num) ;\ pushfl ;\ pushl %cs ;\ pushl %esi ;\ @@ -102,7 +102,7 @@ IDTVEC(recurse_/**/name/**/num) ;\ push %esi ;\ cli ;\ jmp 1f ;\ -_C_LABEL(Xintr_/**/name/**/num): ;\ +_C_LABEL(Xintr_##name##num): ;\ pushl $0 /* dummy error code */ ;\ pushl $T_ASTFLT /* trap # for doing ASTs */ ;\ INTRENTRY ;\ @@ -113,7 +113,7 @@ _C_LABEL(Xintr_/**/name/**/num): ;\ movl _C_LABEL(iminlevel) + (num) * 4, %eax ;\ movl CPL,%ebx ;\ cmpl %eax,%ebx ;\ - jae _C_LABEL(Xhold_/**/name/**/num)/* currently masked; hold it */;\ + jae _C_LABEL(Xhold_##name##num)/* currently masked; hold it */;\ pushl %ebx /* cpl to restore on exit */ ;\ 1: ;\ movl _C_LABEL(imaxlevel) + (num) * 4,%eax ;\ @@ -121,7 +121,7 @@ _C_LABEL(Xintr_/**/name/**/num): ;\ sti /* safe to take intrs now */ ;\ movl _C_LABEL(intrhand) + (num) * 4,%ebx /* head of chain */ ;\ testl %ebx,%ebx ;\ - jz _C_LABEL(Xstray_/**/name/**/num) /* no handlers; we're stray */ ;\ + jz _C_LABEL(Xstray_##name##num) /* no handlers; we're stray */ ;\ STRAY_INITIALIZE /* nobody claimed it yet */ ;\ LOCK_KERNEL(IF_PPL(%esp)) ;\ 7: movl IH_ARG(%ebx),%eax /* get handler arg */ ;\ @@ -144,12 +144,12 @@ _C_LABEL(Xintr_/**/name/**/num): ;\ 6: unmask(num) /* unmask it in hardware */ ;\ late_ack(num) ;\ jmp _C_LABEL(Xdoreti) /* lower spl and do ASTs */ ;\ -IDTVEC(stray_/**/name/**/num) ;\ +IDTVEC(stray_##name##num) ;\ pushl $num ;\ call _C_LABEL(isa_strayintr) ;\ addl $4,%esp ;\ jmp 6b ;\ -IDTVEC(hold_/**/name/**/num) ;\ +IDTVEC(hold_##name##num) ;\ orb $IRQ_BIT(num),CPUVAR(IPENDING) + IRQ_BYTE(num) ;\ INTRFASTEXIT @@ -160,7 +160,7 @@ IDTVEC(hold_/**/name/**/num) ;\ orl %eax,%esi #define STRAY_TEST(name,num) \ testl %esi,%esi ;\ - jz _C_LABEL(Xstray_/**/name/**/num) + jz _C_LABEL(Xstray_##name##num) #else /* !DEBUG */ #define STRAY_INITIALIZE #define STRAY_INTEGRATE -- cgit v1.2.3