From 2e1333e1bb92b6d66ce8ab3883bce9a465df7065 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Thu, 23 May 2019 15:28:09 -0500 Subject: [PATCH 1/2] regparm is an x86 only attribute, only define it there --- src/gba/GBAcpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gba/GBAcpu.h b/src/gba/GBAcpu.h index 5386c0acf..9476bf584 100644 --- a/src/gba/GBAcpu.h +++ b/src/gba/GBAcpu.h @@ -4,16 +4,16 @@ extern int armExecute(); extern int thumbExecute(); -#ifdef __GNUC__ -#ifndef __APPLE__ +#if defined(__i386__) || defined(__x86_64__) #define INSN_REGPARM __attribute__((regparm(1))) #else #define INSN_REGPARM /*nothing*/ #endif + +#ifdef __GNUC__ #define LIKELY(x) __builtin_expect(!!(x), 1) #define UNLIKELY(x) __builtin_expect(!!(x), 0) #else -#define INSN_REGPARM /*nothing*/ #define LIKELY(x) (x) #define UNLIKELY(x) (x) #endif From 055b7c4d496e3d8a2ac04491b9a16f088e1039fb Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Thu, 23 May 2019 15:29:16 -0500 Subject: [PATCH 2/2] libretro: jni: Switch to clang compiler in preparation for ndk r20 --- src/libretro/jni/Application.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libretro/jni/Application.mk b/src/libretro/jni/Application.mk index cfdbac16a..338f063ef 100644 --- a/src/libretro/jni/Application.mk +++ b/src/libretro/jni/Application.mk @@ -1,3 +1,2 @@ APP_ABI := all -APP_STL := gnustl_static -NDK_TOOLCHAIN_VERSION := 4.9 +APP_STL := c++_static