patch-2.4.0-test10 linux/include/asm-alpha/string.h

• Lines: 29
• Date: Fri Oct 27 10:55:01 2000
• Orig file: v2.4.0-test9/linux/include/asm-alpha/string.h
• Orig date: Mon May 8 15:55:00 2000

diff -u --recursive --new-file v2.4.0-test9/linux/include/asm-alpha/string.h linux/include/asm-alpha/string.h
@@ -18,28 +18,19 @@
 /* For backward compatibility with modules.  Unused otherwise.  */
 extern void * __memcpy(void *, const void *, size_t);
 
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 #define memcpy __builtin_memcpy
-#endif
 
 #define __HAVE_ARCH_MEMSET
 extern void * __constant_c_memset(void *, unsigned long, size_t);
 extern void * __memset(void *, int, size_t);
 extern void * memset(void *, int, size_t);
 
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
 #define memset(s, c, n)							    \
 (__builtin_constant_p(c)						    \
  ? (__builtin_constant_p(n) && (c) == 0					    \
     ? __builtin_memset((s),0,(n)) 					    \
     : __constant_c_memset((s),0x0101010101010101UL*(unsigned char)(c),(n))) \
  : __memset((s),(c),(n)))
-#else
-#define memset(s, c, n)							\
-(__builtin_constant_p(c)						\
- ? __constant_c_memset((s),0x0101010101010101UL*(unsigned char)(c),(n)) \
- : __memset((s),(c),(n)))
-#endif
 
 #define __HAVE_ARCH_STRCPY
 extern char * strcpy(char *,const char *);