From a5a498f96c1db63598685e0fb66fcce54558ac7a Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Thu, 21 Apr 2016 22:06:42 -0700
Subject: [PATCH] Tweaks for arch builds

---
 Android/jni/Application.mk | 2 +-
 Android/jni/apple2ix.mk    | 2 +-
 Android/jni/build.sh       | 2 +-
 Android/jni/sources.mk     | 2 +-
 src/arm/cpu-regs.h         | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Android/jni/Application.mk b/Android/jni/Application.mk
index bdff3774..13883e8b 100644
--- a/Android/jni/Application.mk
+++ b/Android/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_ABI := armeabi armeabi-v7a x86
+APP_ABI := armeabi armeabi-v7a x86 x86_64
 
 # Do not change APP_PLATFORM if we care about Gingerbread (2.3.3) devices!  We must compile against android-10,
 # otherwise we may encounter runtime load-library errors from symbols that should have been inlined against older
diff --git a/Android/jni/apple2ix.mk b/Android/jni/apple2ix.mk
index a40d488d..8d831e84 100644
--- a/Android/jni/apple2ix.mk
+++ b/Android/jni/apple2ix.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := jnicrash.c $(APPLE2_SRC_PATH)/breakpad.C
 LOCAL_CFLAGS    := $(APPLE2_BASE_CFLAGS) $(BREAKPAD_CFLAGS)
 LOCAL_LDLIBS    := $(APPLE2_BASE_LDLIBS)
 
-ifeq ($(TARGET_ARCH_ABI),x86)
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),x86 x86_64))
     LOCAL_SRC_FILES += $(APPLE2_X86_SRC)
     LOCAL_CFLAGS    += -DNO_UNDERSCORES=1
 else
diff --git a/Android/jni/build.sh b/Android/jni/build.sh
index a083927e..7fcc73f0 100755
--- a/Android/jni/build.sh
+++ b/Android/jni/build.sh
@@ -141,7 +141,7 @@ if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
     # Symbolicate and move symbols file into location to be deployed on device
 
     SYMFILE=libapple2ix.so.sym
-    ARCHES_TO_SYMBOLICATE='armeabi armeabi-v7a x86'
+    ARCHES_TO_SYMBOLICATE='armeabi armeabi-v7a x86 x86_64'
 
     for arch in $ARCHES_TO_SYMBOLICATE ; do
         SYMDIR=../assets/symbols/$arch/libapple2ix.so
diff --git a/Android/jni/sources.mk b/Android/jni/sources.mk
index 1e5f8cb9..b44b419a 100644
--- a/Android/jni/sources.mk
+++ b/Android/jni/sources.mk
@@ -40,7 +40,7 @@ APPLE2_MAIN_SRC = \
     jnihooks.c androidkeys.c
 
 APPLE2_OPTIM_CFLAGS := -O2
-APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -DPREVENT_TEXTREL=1 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
+APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
 APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES -latomic
 
 LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures
diff --git a/src/arm/cpu-regs.h b/src/arm/cpu-regs.h
index 6f1e8cfc..ca280a50 100644
--- a/src/arm/cpu-regs.h
+++ b/src/arm/cpu-regs.h
@@ -64,7 +64,7 @@
 #error __COUNTER__ macro should be available in modern compilers
 #endif
 
-#if PREVENT_TEXTREL
+#if __PIC__
 
 #   define _SYM_ADDR_PRE(reg) \
                 ldr     reg, 5f;
@@ -89,7 +89,7 @@
                 _SYM_ADDR_OFF_ARM(reg, __COUNTER__); \
                 _SYM_ADDR_POST(var,8)
 #   endif
-#else /* !PREVENT_TEXTREL */
+#else /* !__PIC__ */
 #   if NO_UNDERSCORES
 #       define SYM(reg,var) \
                 ldr     reg, =var