From d99d8d1a56acfc171d8f3d7d95304079cd8ec06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Tue, 15 Nov 2016 00:00:51 +0100 Subject: [PATCH] (MACH) Fix compilation --- audio/drivers_resampler/cc_resampler_neon.S | 8 ++++++++ audio/drivers_resampler/sinc_resampler_neon.S | 4 ++++ libretro-common/conversion/float_to_s16_neon.S | 4 ++++ libretro-common/conversion/s16_to_float_neon.S | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/audio/drivers_resampler/cc_resampler_neon.S b/audio/drivers_resampler/cc_resampler_neon.S index 2725839ed44..14d7ff13c4c 100644 --- a/audio/drivers_resampler/cc_resampler_neon.S +++ b/audio/drivers_resampler/cc_resampler_neon.S @@ -24,9 +24,13 @@ #endif .align 4 .globl resampler_CC_downsample_neon +#ifndef __MACH__ .type resampler_CC_downsample_neon, %function +#endif .globl _resampler_CC_downsample_neon +#ifndef __MACH__ .type _resampler_CC_downsample_neon, %function +#endif # size_t resampler_CC_downsample_neon(float *outp, const float *inp, # rarch_CC_resampler_t* re_, size_t input_frames, float ratio); @@ -198,9 +202,13 @@ bx lr .align 4 .globl resampler_CC_upsample_neon +#ifndef __MACH__ .type resampler_CC_upsample_neon, %function +#endif .globl _resampler_CC_upsample_neon +#ifndef __MACH__ .type _resampler_CC_upsample_neon, %function +#endif # size_t resampler_CC_upsample_neon(float *outp, const float *inp, # rarch_CC_resampler_t* re_, size_t input_frames, float ratio); diff --git a/audio/drivers_resampler/sinc_resampler_neon.S b/audio/drivers_resampler/sinc_resampler_neon.S index ba8c8e1bd0d..e447ce06cdd 100644 --- a/audio/drivers_resampler/sinc_resampler_neon.S +++ b/audio/drivers_resampler/sinc_resampler_neon.S @@ -19,9 +19,13 @@ #endif .align 4 .globl process_sinc_neon_asm +#ifndef __MACH__ .type process_sinc_neon_asm, %function +#endif .globl _process_sinc_neon_asm +#ifndef __MACH__ .type _process_sinc_neon_asm, %function +#endif # void process_sinc_neon(float *out, const float *left, const float *right, const float *coeff, unsigned taps) # Assumes taps is >= 8, and a multiple of 8. process_sinc_neon_asm: diff --git a/libretro-common/conversion/float_to_s16_neon.S b/libretro-common/conversion/float_to_s16_neon.S index 0676004b512..88aae1afd8d 100644 --- a/libretro-common/conversion/float_to_s16_neon.S +++ b/libretro-common/conversion/float_to_s16_neon.S @@ -27,9 +27,13 @@ .align 4 .globl convert_float_s16_asm +#ifndef __MACH__ .type convert_float_s16_asm, %function +#endif .globl _convert_float_s16_asm +#ifndef __MACH__ .type _convert_float_s16_asm, %function +#endif # convert_float_s16_asm(int16_t *out, const float *in, size_t samples) convert_float_s16_asm: _convert_float_s16_asm: diff --git a/libretro-common/conversion/s16_to_float_neon.S b/libretro-common/conversion/s16_to_float_neon.S index 91b75a38e35..93f6592f34a 100644 --- a/libretro-common/conversion/s16_to_float_neon.S +++ b/libretro-common/conversion/s16_to_float_neon.S @@ -27,9 +27,13 @@ .align 4 .globl convert_s16_float_asm +#ifndef __MACH__ .type convert_s16_float_asm, %function +#endif .globl _convert_s16_float_asm +#ifndef __MACH__ .type _convert_s16_float_asm, %function +#endif # convert_s16_float_asm(float *out, const int16_t *in, size_t samples, const float *gain) convert_s16_float_asm: _convert_s16_float_asm: