From dc8a7ff24dfd1fd97a50b4b83a715958b31e4b92 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 10 Aug 2015 15:04:09 +0200 Subject: [PATCH] Remove unused definition of __openat(64)_nocancel --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/openat.c | 18 ------------------ sysdeps/unix/sysv/linux/wordsize-64/openat.c | 3 --- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab06068..09218b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-11 Andreas Schwab + + * sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Don't define. + * sysdeps/unix/sysv/linux/wordsize-64/openat.c + (__openat64_nocancel): Likewise. + 2015-08-11 Joseph Myers * math/auto-libm-test-in: Add more tests of acosh, asin, asinh, diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c index ad8e31d..5d4cc0c 100644 --- a/sysdeps/unix/sysv/linux/openat.c +++ b/sysdeps/unix/sysv/linux/openat.c @@ -30,24 +30,6 @@ # define OPENAT openat #endif - -#define OPENAT_NOT_CANCEL CONCAT (OPENAT) -#define CONCAT(name) CONCAT2 (name) -#define CONCAT2(name) __##name##_nocancel - - -int -OPENAT_NOT_CANCEL (int fd, const char *file, int oflag, mode_t mode) -{ - - /* We have to add the O_LARGEFILE flag for openat64. */ -#ifdef MORE_OFLAGS - oflag |= MORE_OFLAGS; -#endif - - return INLINE_SYSCALL (openat, 4, fd, file, oflag, mode); -} - #define UNDERIZE(name) UNDERIZE_1 (name) #define UNDERIZE_1(name) __##name #define __OPENAT UNDERIZE (OPENAT) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/openat.c b/sysdeps/unix/sysv/linux/wordsize-64/openat.c index 12e0271..be31a35 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/openat.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/openat.c @@ -1,14 +1,11 @@ #define __openat64 __rename___openat64 -#define __openat64_nocancel __rename___openat64_nocancel #define openat64 __rename_openat64 #include "../openat.c" #undef __openat64 -#undef __openat64_nocancel #undef openat64 strong_alias (__openat, __openat64) hidden_ver (__openat, __openat64) -strong_alias (__openat_nocancel, __openat64_nocancel) weak_alias (openat, openat64) -- 2.7.4