about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/sysdeps/pthread/bits/stdio-lock.h13
-rw-r--r--sysdeps/unix/sysv/linux/ia64/syscalls.list26
3 files changed, 9 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 5596d530b8..05a6dcad6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/ia64/syscalls.list: Remove __syscall_
+	functions.
+
 2003-08-31  Ulrich Drepper  <drepper@redhat.com>
 
 	* libio/libio.h (_IO_acquire_lock_fct): Define as inline function.
diff --git a/nptl/sysdeps/pthread/bits/stdio-lock.h b/nptl/sysdeps/pthread/bits/stdio-lock.h
index 3bc3c06314..b084e91e40 100644
--- a/nptl/sysdeps/pthread/bits/stdio-lock.h
+++ b/nptl/sysdeps/pthread/bits/stdio-lock.h
@@ -90,15 +90,10 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
 # ifdef __EXCEPTIONS
 #  define _IO_acquire_lock(_fp) \
   do {									      \
-    auto inline __attribute__((always_inline)) void			      \
-    _IO_acquire_lock_fct (int *p __attribute__ ((__unused__)))		      \
-      {									      \
-	if (((_fp)->_flags & _IO_USER_LOCK) == 0)			      \
-	  _IO_funlockfile (_fp);					      \
-      }									      \
-    int _IO_acquire_lock_dummy						      \
-      __attribute__ ((cleanup (_IO_acquire_lock_fct)));			      \
-    _IO_flockfile (_fp)
+    _IO_FILE *_IO_acquire_lock_file					      \
+	__attribute__((cleanup (_IO_acquire_lock_fct)))			      \
+	= (_fp);							      \
+    _IO_flockfile (_IO_acquire_lock_file);
 
 # else
 #  define _IO_acquire_lock(_fp) _IO_acquire_lock_needs_exceptions_enabled
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index 5d83df7a6e..3210c48226 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -59,34 +59,8 @@ pciconfig_write	EXTRA	pciconfig_write	5	pciconfig_write
 
 ptrace		-	ptrace		4	__ptrace	ptrace
 
-rt_sigaction	EXTRA	rt_sigaction	i:ippi	__syscall_rt_sigaction		rt_sigaction
-rt_sigpending	EXTRA	rt_sigpending	i:pi	__syscall_rt_sigpending		rt_sigpending
-rt_sigprocmask	EXTRA	rt_sigprocmask	i:ippi	__syscall_rt_sigprocmask	rt_sigprocmask
-rt_sigqueueinfo	EXTRA	rt_sigqueueinfo	i:iip	__syscall_rt_sigqueueinfo	rt_sigqueueinfo
-rt_sigsuspend	EXTRA	rt_sigsuspend	i:pi	__syscall_rt_sigsuspend		rt_sigsuspend
-rt_sigtimedwait	EXTRA	rt_sigtimedwait	i:pppi	__syscall_rt_sigtimedwait	rt_sigtimedwait
 
 # System calls with wrappers.
-s_execve	EXTRA	execve		i:spp	__syscall_execve
-s_exit		exit	exit		i:i	__syscall_exit
-s_exit_group    exit_group exit_group   i:i     __syscall_exit_group
-s_getcwd	getcwd	getcwd		i:pi	__syscall_getcwd	getcwd
-s_getdents	getdents getdents	i:ipi	__syscall_getdents	getdents
-s_getdents64	getdents64 getdents64	i:ipi	__syscall_getdents64
-s_mknod		xmknod	mknod		i:sii	__syscall_mknod
-s_readv		readv	readv		i:ipi	__syscall_readv
-s_writev	writev	writev		i:ipi	__syscall_writev
-s_poll		poll	poll		i:pii	__syscall_poll
-s_reboot	reboot	reboot		i:iii	__syscall_reboot
-s_ustat		ustat	ustat		i:ip	__syscall_ustat
-s_stat		xstat	stat		i:sp	__syscall_stat
-s_lstat		lxstat	lstat		i:sp	__syscall_lstat
-s_fstat		fxstat	fstat		i:ip	__syscall_fstat
-s_sysctl	sysctl	_sysctl		i:p	__syscall__sysctl
-s_open		open	open		i:siv	__syscall_open
-s_wait4		wait4	wait4		i:iWiP	__syscall_wait4
-s_ioctl		ioctl	ioctl		i:iiI	__syscall_ioctl
-s_write		write	write		i:ibn	__syscall_write
 
 # IA-64 specific
 getunwind	EXTRA	getunwind	i:pi	getunwind