Update.

2004-09-20  H.J. Lu  <hongjiu.lu@intel.com>

	* sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL):
	Renamed to ...
	(DO_INLINE_SYSCALL_NCS): This.
	(DO_INLINE_SYSCALL): New.
	(INLINE_SYSCALL): Updated.
	(INTERNAL_SYSCALL_NCS): Updated.

diff --git a/ChangeLog b/ChangeLog
index dd504cf..66e101f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL):
+       Renamed to ...
+       (DO_INLINE_SYSCALL_NCS): This.
+       (DO_INLINE_SYSCALL): New.
+       (INLINE_SYSCALL): Updated.
+       (INTERNAL_SYSCALL_NCS): Updated.
+
 2004-09-21  Ulrich Drepper  <drepper@redhat.com>
 
        * elf/sprof.c (load_shobj): Add support for reading symbol table

diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 0ebfc56..0347641 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -199,7 +199,7 @@
 
 #ifdef IA64_USE_NEW_STUB
 
-# define DO_INLINE_SYSCALL(name, nr, args...)                                \
+# define DO_INLINE_SYSCALL_NCS(name, nr, args...)                            \
     LOAD_ARGS_##nr (args)                                                    \
     register long _r8 __asm ("r8");                                          \
     register long _r10 __asm ("r10");                                        \
@@ -221,7 +221,7 @@
 
 #else /* !IA64_USE_NEW_STUB */
 
-# define DO_INLINE_SYSCALL(name, nr, args...)                  \
+# define DO_INLINE_SYSCALL_NCS(name, nr, args...)              \
     LOAD_ARGS_##nr (args)                                      \
     register long _r8 asm ("r8");                              \
     register long _r10 asm ("r10");                            \
@@ -237,10 +237,13 @@
 
 #endif /* !IA64_USE_NEW_STUB */
 
+#define DO_INLINE_SYSCALL(name, nr, args...)   \
+  DO_INLINE_SYSCALL_NCS (__NR_##name, nr, ##args)
+
 #undef INLINE_SYSCALL
 #define INLINE_SYSCALL(name, nr, args...)      \
   ({                                           \
-    DO_INLINE_SYSCALL(__NR_##name, nr, args)   \
+    DO_INLINE_SYSCALL_NCS(__NR_##name, nr, args)\
     if (_r10 == -1)                            \
       {                                                \
        __set_errno (_retval);                  \
@@ -254,7 +257,7 @@
 #undef INTERNAL_SYSCALL
 #define INTERNAL_SYSCALL_NCS(name, err, nr, args...)   \
   ({                                                   \
-    DO_INLINE_SYSCALL(name, nr, args)                  \
+    DO_INLINE_SYSCALL_NCS(name, nr, args)              \
     err = _r10;                                                \
     _retval; })
 #define INTERNAL_SYSCALL(name, err, nr, args...)       \