From 8b01ffe13348eaa7e2611bc1d302aabd35dfcb49 Mon Sep 17 00:00:00 2001 From: hogliux Date: Fri, 26 Jun 2015 16:28:46 +0100 Subject: [PATCH] Ensure that JNI callbacks have soft float ABI on arm processors --- modules/juce_core/native/juce_android_JNIHelpers.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/juce_core/native/juce_android_JNIHelpers.h b/modules/juce_core/native/juce_android_JNIHelpers.h index 0c35c63dd2..704012f0b9 100644 --- a/modules/juce_core/native/juce_android_JNIHelpers.h +++ b/modules/juce_core/native/juce_android_JNIHelpers.h @@ -227,8 +227,14 @@ private: //============================================================================== +#if defined (__arm__) + #define JUCE_ARM_SOFT_FLOAT_ABI __attribute__ ((pcs("aapcs"))) +#else + #define JUCE_ARM_SOFT_FLOAT_ABI +#endif + #define JUCE_JNI_CALLBACK(className, methodName, returnType, params) \ - extern "C" __attribute__ ((visibility("default"))) returnType JUCE_JOIN_MACRO (JUCE_JOIN_MACRO (Java_, className), _ ## methodName) params + extern "C" __attribute__ ((visibility("default"))) JUCE_ARM_SOFT_FLOAT_ABI returnType JUCE_JOIN_MACRO (JUCE_JOIN_MACRO (Java_, className), _ ## methodName) params //============================================================================== class AndroidSystem