This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] NaCl: Use only nacl_irt_dev_filename, never nacl_irt_filename.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Tue, 21 Jul 2015 16:22:17 -0700 (PDT)
- Subject: [COMMITTED PATCH] NaCl: Use only nacl_irt_dev_filename, never nacl_irt_filename.
- Authentication-results: sourceware.org; auth=none
* sysdeps/nacl/nacl-interface-list.h: Remove nacl_irt_filename.
* sysdeps/nacl/open.c (__libc_open): Use __nacl_irt_dev_filename
rather than __nacl_irt_filename.
* sysdeps/nacl/xstat.c (__xstat): Likewise.
diff --git a/sysdeps/nacl/nacl-interface-list.h b/sysdeps/nacl/nacl-interface-list.h
index d098147..cb33751 100644
--- a/sysdeps/nacl/nacl-interface-list.h
+++ b/sysdeps/nacl/nacl-interface-list.h
@@ -21,8 +21,6 @@ NACL_MANDATORY_INTERFACE (rtld,
NACL_MANDATORY_INTERFACE (rtld,
NACL_IRT_FDIO_v0_1, nacl_irt_fdio)
NACL_MANDATORY_INTERFACE (rtld,
- NACL_IRT_FILENAME_v0_1, nacl_irt_filename)
-NACL_MANDATORY_INTERFACE (rtld,
NACL_IRT_MEMORY_v0_3, nacl_irt_memory)
NACL_MANDATORY_INTERFACE (libc,
NACL_IRT_THREAD_v0_1, nacl_irt_thread)
diff --git a/sysdeps/nacl/open.c b/sysdeps/nacl/open.c
index cb4700f..381751a 100644
--- a/sysdeps/nacl/open.c
+++ b/sysdeps/nacl/open.c
@@ -38,7 +38,7 @@ __libc_open (const char *file, int oflag, ...)
}
int fd;
- return NACL_CALL (__nacl_irt_filename.open (file, oflag, mode, &fd), fd);
+ return NACL_CALL (__nacl_irt_dev_filename.open (file, oflag, mode, &fd), fd);
}
libc_hidden_def (__libc_open)
weak_alias (__libc_open, __open)
diff --git a/sysdeps/nacl/xstat.c b/sysdeps/nacl/xstat.c
index 022cf02..8180c93 100644
--- a/sysdeps/nacl/xstat.c
+++ b/sysdeps/nacl/xstat.c
@@ -35,7 +35,7 @@ int
__xstat (int vers, const char *file, struct stat *buf)
{
nacl_abi_stat_t abi_buf;
- return NACL_CALL (__nacl_irt_filename.stat (file, &abi_buf),
+ return NACL_CALL (__nacl_irt_dev_filename.stat (file, &abi_buf),
__xstat_conv (vers, &abi_buf, buf));
}
hidden_def (__xstat)