Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 Makefile                    |    3 +--
 arch/i386/Makefile          |    3 +++
 include/asm-x86_64/string.h |   17 +++--------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff -puN arch/i386/Makefile~x86_64-mm-fix-string arch/i386/Makefile
--- devel/arch/i386/Makefile~x86_64-mm-fix-string	2006-02-27 20:57:37.000000000 -0800
+++ devel-akpm/arch/i386/Makefile	2006-02-27 20:57:37.000000000 -0800
@@ -39,6 +39,9 @@ include $(srctree)/arch/i386/Makefile.cp
 
 cflags-$(CONFIG_REGPARM) += -mregparm=3
 
+# temporary until string.h is fixed
+cflags-y += -ffreestanding
+
 # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
 # a lot more stack due to the lack of sharing of stacklots:
 CFLAGS				+= $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;)
diff -puN include/asm-x86_64/string.h~x86_64-mm-fix-string include/asm-x86_64/string.h
--- devel/include/asm-x86_64/string.h~x86_64-mm-fix-string	2006-02-27 20:57:37.000000000 -0800
+++ devel-akpm/include/asm-x86_64/string.h	2006-02-27 20:57:37.000000000 -0800
@@ -40,26 +40,15 @@ extern void *__memcpy(void *to, const vo
 
 
 #define __HAVE_ARCH_MEMSET
-#define memset __builtin_memset
+void *memset(void *s, int c, size_t n);
 
 #define __HAVE_ARCH_MEMMOVE
 void * memmove(void * dest,const void *src,size_t count);
 
-/* Use C out of line version for memcmp */ 
-#define memcmp __builtin_memcmp
 int memcmp(const void * cs,const void * ct,size_t count);
-
-/* out of line string functions use always C versions */ 
-#define strlen __builtin_strlen
 size_t strlen(const char * s);
-
-#define strcpy __builtin_strcpy
-char * strcpy(char * dest,const char *src);
-
-#define strcat __builtin_strcat
-char * strcat(char * dest, const char * src);
-
-#define strcmp __builtin_strcmp
+char *strcpy(char * dest,const char *src);
+char *strcat(char * dest, const char * src);
 int strcmp(const char * cs,const char * ct);
 
 #endif /* __KERNEL__ */
diff -puN Makefile~x86_64-mm-fix-string Makefile
--- Makefile~x86_64-mm-fix-string	2006-02-27 20:57:37.000000000 -0800
+++ devel-akpm/Makefile	2006-02-27 20:57:37.000000000 -0800
@@ -306,8 +306,7 @@ LINUXINCLUDE    := -Iinclude \
 CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 
 CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-	  	   -fno-strict-aliasing -fno-common \
-		   -ffreestanding
+	  	   -fno-strict-aliasing -fno-common
 AFLAGS		:= -D__ASSEMBLY__
 
 # Read KERNELRELEASE from .kernelrelease (if it exists)
_