diff options
| author | Rob Landley <rob@landley.net> | 2007-03-11 23:06:39 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2007-03-11 23:06:39 +0000 |
| commit | 4bb5454cbdfe9f3e0c5d6ea3239de3ee1995bb2e (patch) | |
| tree | 2e0919a37988e397a25680d2fe2df2a1fa4fdd25 | |
| parent | 8e3683e96af9e86e612cf60fffa7723a556c2f05 (diff) | |
Patch from Al Stone to fix ia64:
The attached patch works around some compilation failures on
ia64 caused by the use of the C preprocessor ## operator, and
allows the ia64 default configuration to build again -- or, at
least get as far as an x86 build does (the current source tree
has some problems compiling because of conflicting type
declarations for __kernel_dev_t).
| -rw-r--r-- | libc/string/ia64/memcpy.S | 4 | ||||
| -rw-r--r-- | libc/string/ia64/memmove.S | 2 | ||||
| -rw-r--r-- | libc/string/ia64/sysdep.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/sysdep.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libc/string/ia64/memcpy.S b/libc/string/ia64/memcpy.S index db019f860..810eb0c0e 100644 --- a/libc/string/ia64/memcpy.S +++ b/libc/string/ia64/memcpy.S @@ -115,7 +115,7 @@ #if defined(USE_LFETCH) #define LOOP(shift) \ ALIGN(32); \ -.loop##shift##: \ +.loop##shift : \ { .mmb \ (p[0]) ld8.nt1 r[0] = [asrc], 8 ; \ (p[0]) lfetch.nt1 [ptr1], 16 ; \ @@ -139,7 +139,7 @@ #else #define LOOP(shift) \ ALIGN(32); \ -.loop##shift##: \ +.loop##shift : \ { .mmb \ (p[0]) ld8.nt1 r[0] = [asrc], 8 ; \ nop.b 0 ; \ diff --git a/libc/string/ia64/memmove.S b/libc/string/ia64/memmove.S index 0328f84de..00342d8e0 100644 --- a/libc/string/ia64/memmove.S +++ b/libc/string/ia64/memmove.S @@ -64,7 +64,7 @@ #define LOOP(shift) \ ALIGN(32); \ -.loop##shift##: \ +.loop##shift : \ (p[0]) ld8 r[0] = [asrc], 8 ; /* w1 */ \ (p[MEMLAT+1]) st8 [dest] = value, 8 ; \ (p[MEMLAT]) shrp value = r[MEMLAT], r[MEMLAT+1], shift ; \ diff --git a/libc/string/ia64/sysdep.h b/libc/string/ia64/sysdep.h index 03e74360d..d10020ac1 100644 --- a/libc/string/ia64/sysdep.h +++ b/libc/string/ia64/sysdep.h @@ -34,7 +34,7 @@ #define ASM_UNW_PRLG_GRSAVE(ninputs) (32+(ninputs)) #ifdef __STDC__ -#define C_LABEL(name) name##: +#define C_LABEL(name) name : #else #define C_LABEL(name) name/**/: #endif diff --git a/libc/sysdeps/linux/ia64/sysdep.h b/libc/sysdeps/linux/ia64/sysdep.h index 03e74360d..d10020ac1 100644 --- a/libc/sysdeps/linux/ia64/sysdep.h +++ b/libc/sysdeps/linux/ia64/sysdep.h @@ -34,7 +34,7 @@ #define ASM_UNW_PRLG_GRSAVE(ninputs) (32+(ninputs)) #ifdef __STDC__ -#define C_LABEL(name) name##: +#define C_LABEL(name) name : #else #define C_LABEL(name) name/**/: #endif |