Skip to content
Permalink
Browse files

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

  • Loading branch information
rkitover committed Jul 1, 2019
2 parents 30b9272 + 8cb4200 commit eaf1ad24292a99ba09b1a562a25abb1626b80b85
Showing with 4 additions and 5 deletions.
  1. +3 −3 src/gba/GBAcpu.h
  2. +1 −2 src/libretro/jni/Application.mk
@@ -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
@@ -1,3 +1,2 @@
APP_ABI := all
APP_STL := gnustl_static
NDK_TOOLCHAIN_VERSION := 4.9
APP_STL := c++_static

0 comments on commit eaf1ad2

Please sign in to comment.
You can’t perform that action at this time.