ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vbam-libretro/master'

This commit is contained in:
Rafael Kitover 2019-07-01 08:00:30 +00:00
parent 30b9272412 8cb420030f
commit eaf1ad2429
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gba/GBAcpu.h
View File

@ -4,16 +4,16 @@
extern int armExecute(); extern int armExecute();
extern int thumbExecute(); extern int thumbExecute();
#ifdef __GNUC__ #if defined(__i386__) || defined(__x86_64__)
#ifndef __APPLE__
#define INSN_REGPARM __attribute__((regparm(1))) #define INSN_REGPARM __attribute__((regparm(1)))
#else #else
#define INSN_REGPARM /*nothing*/ #define INSN_REGPARM /*nothing*/
#endif #endif
#ifdef __GNUC__
#define LIKELY(x) __builtin_expect(!!(x), 1) #define LIKELY(x) __builtin_expect(!!(x), 1)
#define UNLIKELY(x) __builtin_expect(!!(x), 0) #define UNLIKELY(x) __builtin_expect(!!(x), 0)
#else #else
#define INSN_REGPARM /*nothing*/
#define LIKELY(x) (x) #define LIKELY(x) (x)
#define UNLIKELY(x) (x) #define UNLIKELY(x) (x)
#endif #endif

3
src/libretro/jni/Application.mk
View File

@ -1,3 +1,2 @@
APP_ABI := all APP_ABI := all
APP_STL := gnustl_static APP_STL := c++_static
NDK_TOOLCHAIN_VERSION := 4.9