summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-01-23 23:51:58 +0000
committerderaadt <deraadt@openbsd.org>2019-01-23 23:51:58 +0000
commit25dd6bb3a5247129e77d330962b43d151cbed5ed (patch)
treef170689789ee4307e05ab10789bcd3c479c00eb4
parentCorrect ECDSA_SECP512R1 typo to ECDSA_SECP521R1 (diff)
downloadwireguard-openbsd-25dd6bb3a5247129e77d330962b43d151cbed5ed.tar.xz
wireguard-openbsd-25dd6bb3a5247129e77d330962b43d151cbed5ed.zip
using _C_LABEL() inside a macro which uses _C_LABEL() is silly and wrong
-rw-r--r--sys/arch/amd64/amd64/locore0.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/locore0.S b/sys/arch/amd64/amd64/locore0.S
index f9d07b3c9a1..fb10cd96ae5 100644
--- a/sys/arch/amd64/amd64/locore0.S
+++ b/sys/arch/amd64/amd64/locore0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore0.S,v 1.11 2019/01/11 06:25:06 mlarkin Exp $ */
+/* $OpenBSD: locore0.S,v 1.12 2019/01/23 23:51:58 deraadt Exp $ */
/* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */
/*
@@ -252,9 +252,9 @@ bi_size_ok:
movl $0x0a,%eax
cpuid
- movl %eax,RELOC(_C_LABEL(cpu_perf_eax))
- movl %ebx,RELOC(_C_LABEL(cpu_perf_ebx))
- movl %edx,RELOC(_C_LABEL(cpu_perf_edx))
+ movl %eax,RELOC(cpu_perf_eax)
+ movl %ebx,RELOC(cpu_perf_ebx)
+ movl %edx,RELOC(cpu_perf_edx)
movl $0x80000001, %eax
cpuid
@@ -276,7 +276,7 @@ cont:
movl $0x80000007,%eax
cpuid
- movl %edx,RELOC(_C_LABEL(cpu_apmi_edx))
+ movl %edx,RELOC(cpu_apmi_edx)
/*
* Finished with old stack; load new %esp now instead of later so we