[PATCH] partially fix ia64 build
Al Stone
ahs3 at fc.hp.com
Wed Mar 7 23:00:43 UTC 2007
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).
Please apply.
Signed-off-by: Al Stone <ahs3 at fc.hp.com>
--
Ciao,
al
----------------------------------------------------------------------
Al Stone Alter Ego:
Open Source and Linux R&D Debian Developer
Hewlett-Packard Company http://www.debian.org
E-mail: ahs3 at fc.hp.com ahs3 at debian.org
----------------------------------------------------------------------
diff --exclude .svn -Naur svn/libc/string/ia64/memcpy.S uClibc-ia64-current/libc/string/ia64/memcpy.S
--- svn/libc/string/ia64/memcpy.S 2007-02-07 17:39:26.000000000 -0700
+++ uClibc-ia64-current/libc/string/ia64/memcpy.S 2007-03-07 15:39:32.000000000 -0700
@@ -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 --exclude .svn -Naur svn/libc/string/ia64/memmove.S uClibc-ia64-current/libc/string/ia64/memmove.S
--- svn/libc/string/ia64/memmove.S 2007-02-07 17:39:26.000000000 -0700
+++ uClibc-ia64-current/libc/string/ia64/memmove.S 2007-03-07 15:40:08.000000000 -0700
@@ -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 --exclude .svn -Naur svn/libc/string/ia64/sysdep.h uClibc-ia64-current/libc/string/ia64/sysdep.h
--- svn/libc/string/ia64/sysdep.h 2007-02-07 17:39:26.000000000 -0700
+++ uClibc-ia64-current/libc/string/ia64/sysdep.h 2007-03-07 15:35:26.000000000 -0700
@@ -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 --exclude .svn -Naur svn/libc/sysdeps/linux/ia64/sysdep.h uClibc-ia64-current/libc/sysdeps/linux/ia64/sysdep.h
--- svn/libc/sysdeps/linux/ia64/sysdep.h 2007-02-07 17:39:44.000000000 -0700
+++ uClibc-ia64-current/libc/sysdeps/linux/ia64/sysdep.h 2007-03-07 14:54:23.000000000 -0700
@@ -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
More information about the uClibc
mailing list