summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mbld/cpufeatures+plan9-x64.s9
-rw-r--r--mbld/cpufeatures+posixy-x64.s4
-rwxr-xr-xmk/bootstrap/bootstrap+FreeBSD-amd64.sh2
3 files changed, 7 insertions, 8 deletions
diff --git a/mbld/cpufeatures+plan9-x64.s b/mbld/cpufeatures+plan9-x64.s
index a67e0c9..645d01a 100644
--- a/mbld/cpufeatures+plan9-x64.s
+++ b/mbld/cpufeatures+plan9-x64.s
@@ -1,9 +1,8 @@
TEXT bld$cpufeatures+0(SB),$0
MOVL $0x1,AX
CPUID
- MOVL CX,AX
- ROLQ $32, AX
- SHRQ $32, DX
- ORQ DX, AX
+ MOVL CX, AX
+ MOVL DX, DX
+ ROLQ $32, DX
+ ORQ DX, AX
RET
-
diff --git a/mbld/cpufeatures+posixy-x64.s b/mbld/cpufeatures+posixy-x64.s
index 8202ca1..889c6f1 100644
--- a/mbld/cpufeatures+posixy-x64.s
+++ b/mbld/cpufeatures+posixy-x64.s
@@ -1,7 +1,7 @@
.globl bld$cpufeatures
-.globl bld$_cpufeatures
+.globl _bld$cpufeatures
bld$cpufeatures:
-bld$_cpufeatures:
+_bld$cpufeatures:
mov $0x1, %eax
cpuid
mov %ecx, %eax
diff --git a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
index 63c27dc..fe149c9 100755
--- a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
@@ -4,7 +4,7 @@
pwd=`pwd`
set -x
$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/config.myr
- as -g -o mbld/cpufeatures.o mbld/cpufeatures+x64.s
+ as -g -o mbld/cpufeatures.o mbld/cpufeatures+posixy-x64.s
as -g -o lib/thread/exit.o lib/thread/exit+freebsd-x64.s
as -g -o lib/thread/atomic-impl.o lib/thread/atomic-impl+x64.s
as -g -o lib/std/getbp.o lib/std/getbp+posixy-x64.s