2004-07-15 Jakub Jelinek <jakub@redhat.com>
+ * sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Remove
+ static inline __attribute ((always_inline)). Don't define if
+ NO_CANCELLATION.
+ (__libc_fcntl): Use INLINE_SYSCALL directly instead of
+ __fcntl_nocancel.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c (__fcntl_nocancel):
+ Remove static inline __attribute ((always_inline)). Don't define
+ if NO_CANCELLATION.
+ (__libc_fcntl): Use INLINE_SYSCALL directly instead of
+ __fcntl_nocancel.
+ * sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Define to
+ __libc_fcntl if NO_CANCELLATION and __ASSUME_FCNTL64 == 0.
+ Don't define at all if NO_CANCELLATION and __ASSUME_FCNTL64 > 0.
+ (__libc_fcntl): Don't define if __fcntl_nocancel is a macro.
+
[BZ #262]
* sysdeps/i386/elf/start.S (_start): Use @GOT instead of @GOTOFF
for main.
#include <sys/syscall.h>
-#ifdef NO_CANCELLATION
-static inline __attribute ((always_inline))
-#endif
+#ifndef NO_CANCELLATION
int
__fcntl_nocancel (int fd, int cmd, ...)
{
return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
}
+#endif
int
va_end (ap);
if (SINGLE_THREAD_P || cmd != F_SETLKW)
- return __fcntl_nocancel (fd, cmd, arg);
+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
int oldtype = LIBC_CANCEL_ASYNC ();
- int result = __fcntl_nocancel (fd, cmd, arg);
+ int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
LIBC_CANCEL_RESET (oldtype);
int __have_no_fcntl64;
#endif
-
-#ifdef NO_CANCELLATION
-static inline __attribute ((always_inline))
+#if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0
+# define __fcntl_nocancel __libc_fcntl
#endif
+
+#if !defined NO_CANCELLATION || __ASSUME_FCNTL64 == 0
int
__fcntl_nocancel (int fd, int cmd, ...)
{
return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
#endif /* !__ASSUME_FCNTL64 */
}
+#endif /* NO_CANCELLATION || !__ASSUME_FCNTL64 */
+#ifndef __fcntl_nocancel
int
__libc_fcntl (int fd, int cmd, ...)
{
return result;
}
+#endif
libc_hidden_def (__libc_fcntl)
weak_alias (__libc_fcntl, __fcntl)
#include <sys/syscall.h>
-#ifdef NO_CANCELLATION
-static inline __attribute ((always_inline))
-#endif
+#ifndef NO_CANCELLATION
int
__fcntl_nocancel (int fd, int cmd, ...)
{
return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
}
+#endif
int
cmd -= F_GETLK64 - F_GETLK;
if (SINGLE_THREAD_P || cmd != F_SETLKW)
- return __fcntl_nocancel (fd, cmd, arg);
+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
int oldtype = LIBC_CANCEL_ASYNC ();
- int result = __fcntl_nocancel (fd, cmd, arg);
+ int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
LIBC_CANCEL_RESET (oldtype);