diff --git a/src/arm/cpu-regs.h b/src/arm/cpu-regs.h index ca280a50..081d5cd7 100644 --- a/src/arm/cpu-regs.h +++ b/src/arm/cpu-regs.h @@ -64,7 +64,8 @@ #error __COUNTER__ macro should be available in modern compilers #endif -#if __PIC__ +#if __PIC__ && !__APPLE__ +// 2016/07/15 : TODO FIXME : this PIC code does not work on ARM-Darwin # define _SYM_ADDR_PRE(reg) \ ldr reg, 5f; @@ -89,7 +90,7 @@ _SYM_ADDR_OFF_ARM(reg, __COUNTER__); \ _SYM_ADDR_POST(var,8) # endif -#else /* !__PIC__ */ +#else # if NO_UNDERSCORES # define SYM(reg,var) \ ldr reg, =var diff --git a/src/darwin-cpu-glue.S b/src/darwin-cpu-glue.S index d47d4c8d..a0e6bfcd 100644 --- a/src/darwin-cpu-glue.S +++ b/src/darwin-cpu-glue.S @@ -11,13 +11,13 @@ #ifdef __APPLE__ # if defined(__arm__) -# include "arm/cpu.S" # include "arm/glue.S" +# include "arm/cpu.S" # elif defined(__arm64__) # error aarch64 not implemented ... TODO SOON # else // simulator is x86 -# include "x86/cpu.S" # include "x86/glue.S" +# include "x86/cpu.S" # endif #endif