x86: string_32.h: workaround for broken gcc 4.0

[linux-2.6-omap-h63xx.git] / include / asm-x86 / string_32.h

diff --git a/include/asm-x86/string_32.h b/include/asm-x86/string_32.h
index 8d0c593c44137fc0bf37e22679ffbab6d6e285ce..193578cd1fd98af422fb5146c110ca03625d26cb 100644 (file)
--- a/include/asm-x86/string_32.h
+++ b/include/asm-x86/string_32.h
@@ -267,11 +267,18 @@ void *__constant_c_and_count_memset(void *s, unsigned long pattern,
        asm volatile("rep ; stosl"                                      \
                     x                                                  \
                     : "=&c" (d0), "=&D" (d1)                           \
-                    : "a" (pattern), "0" (count/4), "1" ((long)s)      \
+                    : "a" (eax), "0" (count/4), "1" ((long)s)  \
                     : "memory")
 
        {
                int d0, d1;
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 0
+               /* Workaround for broken gcc 4.0 */
+               register unsigned long eax asm("%eax") = pattern;
+#else
+               unsigned long eax = pattern;
+#endif
+
                switch (count % 4) {
                case 0:
                        COMMON("");