Commit f9d693d2 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: remove arch specific non-optimized memcmp()

The m68k arch implements its own memcmp() function. It is not optimized
in any way (it is the most strait forward coding of memcmp you can get).
Remove it and use the kernels standard memcmp() implementation.

This also goes part of the way to fixing a regression caused by commit

 ("m68k/m68knommu: merge MMU and
non-MMU string.h"), which breaks non-coldfire non-mmu builds (which is
the 68x328 and 68360 families). They currently have no memcmp() function
defined, since there is none in the m68knommu/lib functions.

Signed-off-by: default avatarGreg Ungerer <>
Acked-by: default avatarGeert Uytterhoeven <>
parent b3e338de
......@@ -102,11 +102,9 @@ static inline int strcmp(const char *cs, const char *ct)
extern void *memmove(void *, const void *, __kernel_size_t);
#endif /* CONFIG_COLDFIRE */
extern int memcmp(const void *, const void *, __kernel_size_t);
#define memcmp(d, s, n) __builtin_memcmp(d, s, n)
#endif /* CONFIG_COLDFIRE */
extern void *memset(void *, int, __kernel_size_t);
......@@ -243,14 +243,3 @@ void *memmove(void *dest, const void *src, size_t n)
return xdest;
int memcmp(const void *cs, const void *ct, size_t count)
const unsigned char *su1, *su2;
for (su1 = cs, su2 = ct; count > 0; ++su1, ++su2, count--)
if (*su1 != *su2)
return *su1 < *su2 ? -1 : +1;
return 0;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment