Major Makefile cleanups; gcc 4.3.0 compatiblity

Cleanup and centralize the Makefile system even more.
Fix a gcc 4.3 incompatibility in memdisk (definition of strlen).

1 files changed, 13 insertions, 2 deletions

diff --git a/memdisk/memdisk.h b/memdisk/memdisk.h
index 615e3d1e..9d4a4297 100644
--- a/memdisk/memdisk.h
+++ b/memdisk/memdisk.h
@@ -40,11 +40,22 @@ extern void __attribute__((noreturn)) die(void);
 #define memcpy(a,b,c) __builtin_memcpy(a,b,c)
 #define memset(a,b,c) __builtin_memset(a,b,c)
 #define strcpy(a,b)   __builtin_strcpy(a,b)
-#define strlen(a)     __builtin_strlen(a)
+
+static inline size_t strlen(const char *__a)
+{
+  const char *__D;
+  size_t __c;
+
+  asm("repne;scasb"
+      : "=D" (__D), "=c" (__c)
+      : "D" (__a), "c" (-1), "a" (0), "m" (*__a));
+
+  return __D - __a - 1;
+}
 
 /* memcpy() but returns a pointer to end of buffer */
 static inline void *
-memcpy_endptr(void *__d, const void *__s, unsigned int __n)
+mempcpy(void *__d, const void *__s, unsigned int __n)
 {
   memcpy(__d, __s, __n);
   return (void *)((char *)__d + __n);