Skip to content
This repository
Browse code

[arm] fixed, build under -mcpu=arm1176jzf-s -mfloat-abi=softfp

  • Loading branch information...
commit bc772968ebaa98d37a0baa5d820d7b8abb57a8f3 1 parent c468689
authored February 18, 2013
4  xbmc/cores/AudioEngine/Utils/AEConvert.cpp
@@ -155,7 +155,7 @@ unsigned int CAEConvert::S16LE_Float(uint8_t* data, const unsigned int samples,
155 155
 {
156 156
   static const float mul = 1.0f / (INT16_MAX + 0.5f);
157 157
 
158  
-#if defined(__ARM_NEON__) || defined(__VFP_FP__)
  158
+#if defined(__ARM_NEON__) || (defined(__VFP_FP__) && !defined(__SOFTFP__))
159 159
   for (unsigned int i = 0; i < samples; i++)
160 160
   {
161 161
     __asm__ __volatile__ (
@@ -186,7 +186,7 @@ unsigned int CAEConvert::S16BE_Float(uint8_t* data, const unsigned int samples,
186 186
 {
187 187
   static const float mul = 1.0f / (INT16_MAX + 0.5f);
188 188
 
189  
-#if defined(__ARM_NEON__) || defined(__VFP_FP__)
  189
+#if defined(__ARM_NEON__) || (defined(__VFP_FP__) && !defined(__SOFTFP__))
190 190
   for (unsigned int i = 0; i < samples; i++)
191 191
   {
192 192
     __asm__ __volatile__ (

0 notes on commit bc77296

Please sign in to comment.
Something went wrong with that request. Please try again.