Fix mip64 build.
Fallout from the unified sysroot work.
Bug: N/A
Test: builds
Change-Id: If0595a241b9ce0d8c8c7137ddaf8fca932487b7c
diff --git a/libc/arch-mips64/bionic/__bionic_clone.S b/libc/arch-mips64/bionic/__bionic_clone.S
index 0d266ee..d725efc 100644
--- a/libc/arch-mips64/bionic/__bionic_clone.S
+++ b/libc/arch-mips64/bionic/__bionic_clone.S
@@ -43,59 +43,59 @@
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
LEAF(__bionic_clone, FRAMESZ)
- PTR_SUBU sp, FRAMESZ # allocate stack frame
+ PTR_SUBU $sp, FRAMESZ # allocate stack frame
SETUP_GP64(FRAME_GP,__bionic_clone)
SAVE_GP(FRAME_GP)
# set up child stack
- PTR_SUBU a1,FRAMESZ
+ PTR_SUBU $a1,FRAMESZ
#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32)
- PTR_L t0,FRAMESZ+5*REGSZ(sp) # fn
- PRL_L t1,FRAMESZ+6*REGSZ(sp) # arg
- PTR_S t0,FRAME_FN(a1) # fn
- PTR_S t1,FRAME_ARG(a1) # arg
+ PTR_L $t0,FRAMESZ+5*REGSZ($sp) # fn
+ PRL_L $t1,FRAMESZ+6*REGSZ($sp) # arg
+ PTR_S $t0,FRAME_FN($a1) # fn
+ PTR_S $t1,FRAME_ARG($a1) # arg
#else
- PTR_L t0,FRAME_GP(sp) # copy gp to child stack
- PTR_S t0,FRAME_GP(a1)
- PTR_S a5,FRAME_FN(a1) # fn
- PTR_S a6,FRAME_ARG(a1) # arg
+ PTR_L $t0,FRAME_GP($sp) # copy gp to child stack
+ PTR_S $t0,FRAME_GP($a1)
+ PTR_S $a5,FRAME_FN($a1) # fn
+ PTR_S $a6,FRAME_ARG($a1) # arg
# endif
# remainder of arguments are correct for clone system call
- LI v0,__NR_clone
+ LI $v0,__NR_clone
syscall
- move a0,v0
- bnez a3,.L__error_bc
+ move $a0,$v0
+ bnez $a3,.L__error_bc
- beqz v0,.L__thread_start_bc
+ beqz $v0,.L__thread_start_bc
RESTORE_GP64
- PTR_ADDU sp,FRAMESZ
- j ra
+ PTR_ADDU $sp,FRAMESZ
+ j $ra
.L__thread_start_bc:
# Clear return address in child so we don't unwind further.
- li ra,0
+ li $ra,0
# void __start_thread(int (*func)(void*), void *arg)
- PTR_L a0,FRAME_FN(sp) # fn
- PTR_L a1,FRAME_ARG(sp) # arg
- LA t9,__start_thread
+ PTR_L $a0,FRAME_FN($sp) # fn
+ PTR_L $a1,FRAME_ARG($sp) # arg
+ LA $t9,__start_thread
RESTORE_GP64
/*
* For O32 etc the child stack must have space for a0..a3 to be stored
* For N64 etc, the child stack can be restored to the original value
*/
#if !((_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32))
- PTR_ADDU sp,FRAMESZ
+ PTR_ADDU $sp,FRAMESZ
#endif
- j t9
+ j $t9
.L__error_bc:
- LA t9,__set_errno_internal
+ LA $t9,__set_errno_internal
RESTORE_GP64
- PTR_ADDU sp,FRAMESZ
- j t9
+ PTR_ADDU $sp,FRAMESZ
+ j $t9
END(__bionic_clone)
.hidden __bionic_clone
diff --git a/libc/arch-mips64/bionic/_exit_with_stack_teardown.S b/libc/arch-mips64/bionic/_exit_with_stack_teardown.S
index fcf8cc1..4f80801 100644
--- a/libc/arch-mips64/bionic/_exit_with_stack_teardown.S
+++ b/libc/arch-mips64/bionic/_exit_with_stack_teardown.S
@@ -30,12 +30,12 @@
// void _exit_with_stack_teardown(void* stackBase, size_t stackSize)
ENTRY_PRIVATE(_exit_with_stack_teardown)
- li v0, __NR_munmap
+ li $v0, __NR_munmap
syscall
// If munmap failed, we ignore the failure and exit anyway.
- li a0, 0
- li v0, __NR_exit
+ li $a0, 0
+ li $v0, __NR_exit
syscall
// The exit syscall does not return.
END(_exit_with_stack_teardown)
diff --git a/libc/arch-mips64/bionic/syscall.S b/libc/arch-mips64/bionic/syscall.S
index 4c739fd..ce5dfd3 100644
--- a/libc/arch-mips64/bionic/syscall.S
+++ b/libc/arch-mips64/bionic/syscall.S
@@ -36,33 +36,33 @@
#endif
LEAF(syscall,FRAMESZ)
- PTR_SUBU sp, FRAMESZ # allocate stack frame
+ PTR_SUBU $sp, FRAMESZ # allocate stack frame
SETUP_GP64(FRAME_GP,syscall)
SAVE_GP(FRAME_GP)
- move v0, a0 # syscall number to v0
- move a0, a1 # shift args down
- move a1, a2
- move a2, a3
+ move $v0, $a0 # syscall number to v0
+ move $a0, $a1 # shift args down
+ move $a1, $a2
+ move $a2, $a3
#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32)
- REG_L a3, FRAMESZ+4*REGSZ(sp)
- REG_L t0, FRAMESZ+5*REGSZ(sp)
- REG_L t1, FRAMESZ+6*REGSZ(sp)
- REG_S t0, 4*REGSZ(sp)
- REG_S t1, 5*REGSZ(sp)
+ REG_L $a3, FRAMESZ+4*REGSZ($sp)
+ REG_L $t0, FRAMESZ+5*REGSZ($sp)
+ REG_L $t1, FRAMESZ+6*REGSZ($sp)
+ REG_S $t0, 4*REGSZ($sp)
+ REG_S $t1, 5*REGSZ($sp)
#else
- move a3, a4
- move a4, a5
- move a5, a6
+ move $a3, $a4
+ move $a4, $a5
+ move $a5, $a6
#endif
syscall
- move a0, v0
- bnez a3, 1f
+ move $a0, $v0
+ bnez $a3, 1f
RESTORE_GP64
- PTR_ADDU sp, FRAMESZ
- j ra
+ PTR_ADDU $sp, FRAMESZ
+ j $ra
1:
- LA t9,__set_errno_internal
+ LA $t9,__set_errno_internal
RESTORE_GP64
- PTR_ADDU sp, FRAMESZ
- j t9
+ PTR_ADDU $sp, FRAMESZ
+ j $t9
END(syscall)
diff --git a/libc/arch-mips64/bionic/vfork.S b/libc/arch-mips64/bionic/vfork.S
index e0a39ed..5d457a9 100644
--- a/libc/arch-mips64/bionic/vfork.S
+++ b/libc/arch-mips64/bionic/vfork.S
@@ -43,35 +43,35 @@
LEAF(vfork,FRAMESZ)
#if FRAMESZ!=0
- PTR_SUBU sp, FRAMESZ
+ PTR_SUBU $sp, FRAMESZ
#endif
- SETUP_GP64(a5, vfork)
+ SETUP_GP64($a5, vfork)
// __get_tls()[TLS_SLOT_THREAD_ID]->cached_pid_ = 0
- rdhwr v0, $29 // v0 = tls
- REG_L v0, REGSZ*1(v0) // v0 = v0[TLS_SLOT_THREAD_ID ie 1]
- sw $0, REGSZ*2+4(v0) // v0->cached_pid_ = 0
+ rdhwr $v0, $29 // v0 = tls
+ REG_L $v0, REGSZ*1($v0) // v0 = v0[TLS_SLOT_THREAD_ID ie 1]
+ sw $0, REGSZ*2+4($v0) // v0->cached_pid_ = 0
- LI a0, (CLONE_VM | CLONE_VFORK | SIGCHLD)
- move a1, $0
- move a2, $0
- move a3, $0
+ LI $a0, (CLONE_VM | CLONE_VFORK | SIGCHLD)
+ move $a1, $0
+ move $a2, $0
+ move $a3, $0
#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32)
REG_S $0, 4*REGSZ(sp)
#else
- move a4, $0
+ move $a4, $0
#endif
- LI v0, __NR_clone
+ LI $v0, __NR_clone
syscall
#if FRAMESZ!=0
- PTR_ADDU sp,FRAMESZ
+ PTR_ADDU $sp,FRAMESZ
#endif
- move a0, v0
- bnez a3, 1f
+ move $a0, $v0
+ bnez $a3, 1f
RESTORE_GP64
- j ra
+ j $ra
1:
- LA t9,__set_errno_internal
+ LA $t9,__set_errno_internal
RESTORE_GP64
- j t9
+ j $t9
END(vfork)