about summary refs log tree commit diff
path: root/ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S
diff options
context:
space:
mode:
Diffstat (limited to 'ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S')
-rw-r--r--ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S10
1 files changed, 7 insertions, 3 deletions
diff --git a/ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S b/ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S
index d21b702e90..e008c041ed 100644
--- a/ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S
+++ b/ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S
@@ -1,3 +1,7 @@
-#define MEMCPY_VFP
-#define memcpy __memcpy_vfp
-#include "memcpy_impl.S"
+/* Under __ARM_NEON__, memcpy_neon.S defines memcpy directly
+   and the __memcpy_vfp code will never be used.  */
+#ifndef __ARM_NEON__
+# define MEMCPY_VFP
+# define memcpy __memcpy_vfp
+# include "memcpy_impl.S"
+#endif