From 97f52ef2ff8b8dc56d5178832f143beb2819b8de Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sat, 5 Dec 2015 17:48:25 -0800 Subject: [PATCH] Get Android build unstuck --- src/arm/cpu-regs.h | 4 +++- src/arm/cpu.S | 2 +- src/arm/glue-prologue.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/arm/cpu-regs.h b/src/arm/cpu-regs.h index 87138138..6f1e8cfc 100644 --- a/src/arm/cpu-regs.h +++ b/src/arm/cpu-regs.h @@ -32,7 +32,6 @@ // r14 ARM return addr // r15 ARM PC - #ifdef __aarch64__ # error 20150205 ARM 64bit untested!!! # define PTR_SHIFT #4 // 4<<1 = 8 @@ -45,6 +44,9 @@ #if !defined(__APPLE__) # define NO_UNDERSCORES 1 +# define STRBNE strneb +#else +# define STRBNE strbne #endif #if NO_UNDERSCORES diff --git a/src/arm/cpu.S b/src/arm/cpu.S index 55104ed3..eacdb4fe 100644 --- a/src/arm/cpu.S +++ b/src/arm/cpu.S @@ -2511,7 +2511,7 @@ ENTRY(cpu65_run) ldrb r0, [r1] teq r0, #0 eorne r0, r0, r0 - strbne r0, [r1] + STRBNE r0, [r1] bne ex_reset b continue1 diff --git a/src/arm/glue-prologue.h b/src/arm/glue-prologue.h index 76ab979d..d8037c8d 100644 --- a/src/arm/glue-prologue.h +++ b/src/arm/glue-prologue.h @@ -45,7 +45,7 @@ ENTRY(func) SYM(r1, pointer); \ ENTRY(func) SYM(r1, pointer); \ ldr r1, [r1]; \ teq r1, #0; \ - strbne r0, [r1, EffectiveAddr]; \ + STRBNE r0, [r1, EffectiveAddr]; \ mov pc, lr;