svn commit: trunk/uClibc/libc: string/ia64 sysdeps/linux/ia64

[landley at uclibc.org]

Author: landley
Date: 2007-03-11 16:06:39 -0700 (Sun, 11 Mar 2007)
New Revision: 18068

Log:
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).


Modified:
   trunk/uClibc/libc/string/ia64/memcpy.S
   trunk/uClibc/libc/string/ia64/memmove.S
   trunk/uClibc/libc/string/ia64/sysdep.h
   trunk/uClibc/libc/sysdeps/linux/ia64/sysdep.h


Changeset:
Modified: trunk/uClibc/libc/string/ia64/memcpy.S
===================================================================
--- trunk/uClibc/libc/string/ia64/memcpy.S	2007-03-11 22:16:02 UTC (rev 18067)
+++ trunk/uClibc/libc/string/ia64/memcpy.S	2007-03-11 23:06:39 UTC (rev 18068)
@@ -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 ;						\

Modified: trunk/uClibc/libc/string/ia64/memmove.S
===================================================================
--- trunk/uClibc/libc/string/ia64/memmove.S	2007-03-11 22:16:02 UTC (rev 18067)
+++ trunk/uClibc/libc/string/ia64/memmove.S	2007-03-11 23:06:39 UTC (rev 18068)
@@ -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 ;		\

Modified: trunk/uClibc/libc/string/ia64/sysdep.h
===================================================================
--- trunk/uClibc/libc/string/ia64/sysdep.h	2007-03-11 22:16:02 UTC (rev 18067)
+++ trunk/uClibc/libc/string/ia64/sysdep.h	2007-03-11 23:06:39 UTC (rev 18068)
@@ -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

Modified: trunk/uClibc/libc/sysdeps/linux/ia64/sysdep.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/ia64/sysdep.h	2007-03-11 22:16:02 UTC (rev 18067)
+++ trunk/uClibc/libc/sysdeps/linux/ia64/sysdep.h	2007-03-11 23:06:39 UTC (rev 18068)
@@ -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