--- Libc/Libc-583/arm/string/memset_pattern.s
+++ Libc/Libc-825.24/arm/string/memset_pattern.s
@@ -23,7 +23,16 @@
 
 #include <arm/arch.h>
 
-#if defined(_ARM_ARCH_6)
+//  Only built for armv6 and higher.
+#if defined _ARM_ARCH_6
+
+//  If we're building for armv7, and not for DYLD, then we have a symbol
+//  resolver so we need to rename these implementations.
+#if defined _ARM_ARCH_7 && !defined VARIANT_DYLD
+#define _memset_pattern4  _memset_pattern4$VARIANT$Generic
+#define _memset_pattern8  _memset_pattern8$VARIANT$Generic
+#define _memset_pattern16 _memset_pattern16$VARIANT$Generic
+#endif
 
 #include <mach/machine/asm.h>