aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>2003-08-05 07:07:37 +0000
committerBruce Evans <bde@FreeBSD.org>2003-08-05 07:07:37 +0000
commit8daec3f7eade840f068945158d6276921291fe4c (patch)
treef394b54b39bd2a3c0db6ca85afb0b73ff3414b63
parenta9c8e89592ae857ac5cb29aadd34b826a6e1c005 (diff)
downloadsrc-8daec3f7eade840f068945158d6276921291fe4c.tar.gz
src-8daec3f7eade840f068945158d6276921291fe4c.zip
MFC: 1.94 and 1.125 (don't use hard newlines in string literals, and fix
some style bugs on the same lines). This completes making some RELENG_3 kernels work when compiled by gcc-3.3.
Notes
Notes: svn path=/stable/3/; revision=118470
-rw-r--r--sys/i386/i386/identcpu.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index f70a279b1564..37622ffd1095 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -661,15 +661,15 @@ static volatile u_int trap_by_rdmsr;
*/
inthand_t bluetrap6;
__asm
-("
- .text
- .p2align 2,0x90
- .type " __XSTRING(CNAME(bluetrap6)) ",@function
-" __XSTRING(CNAME(bluetrap6)) ":
- ss
- movl $0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
- addl $2, (%esp) # I know rdmsr is a 2-bytes instruction.
- iret
+(" \n\
+ .text \n\
+ .p2align 2,0x90 \n\
+ .type " __XSTRING(CNAME(bluetrap6)) ",@function \n\
+" __XSTRING(CNAME(bluetrap6)) ": \n\
+ ss \n\
+ movl $0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) " \n\
+ addl $2, (%esp) /* rdmsr is a 2-byte instruction */ \n\
+ iret \n\
");
/*
@@ -678,16 +678,16 @@ __asm
*/
inthand_t bluetrap13;
__asm
-("
- .text
- .p2align 2,0x90
- .type " __XSTRING(CNAME(bluetrap13)) ",@function
-" __XSTRING(CNAME(bluetrap13)) ":
- ss
- movl $0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "
- popl %eax # discard errorcode.
- addl $2, (%esp) # I know rdmsr is a 2-bytes instruction.
- iret
+(" \n\
+ .text \n\
+ .p2align 2,0x90 \n\
+ .type " __XSTRING(CNAME(bluetrap13)) ",@function \n\
+" __XSTRING(CNAME(bluetrap13)) ": \n\
+ ss \n\
+ movl $0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) " \n\
+ popl %eax /* discard error code */ \n\
+ addl $2, (%esp) /* rdmsr is a 2-byte instruction */ \n\
+ iret \n\
");
/*