aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2015-08-10 15:04:09 +0200
committerAndreas Schwab <schwab@suse.de>2015-08-11 09:37:38 +0200
commitdc8a7ff24dfd1fd97a50b4b83a715958b31e4b92 (patch)
tree1146f205cbd2f22bd875d5ce086aa29444e99098
parent4afe4b20ce120fd46bd67e212b102019c2e40e81 (diff)
downloadglibc-dc8a7ff24dfd1fd97a50b4b83a715958b31e4b92.tar
glibc-dc8a7ff24dfd1fd97a50b4b83a715958b31e4b92.tar.gz
glibc-dc8a7ff24dfd1fd97a50b4b83a715958b31e4b92.tar.bz2
glibc-dc8a7ff24dfd1fd97a50b4b83a715958b31e4b92.zip
Remove unused definition of __openat(64)_nocancel
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/openat.c18
-rw-r--r--sysdeps/unix/sysv/linux/wordsize-64/openat.c3
3 files changed, 6 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index ab060688a9..09218b8aad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-11 Andreas Schwab <schwab@suse.de>
+
+ * 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 <joseph@codesourcery.com>
* 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 ad8e31d6cf..5d4cc0c104 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 12e027158c..be31a35105 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)