From: Roland McGrath <roland@hack.frob.com>
Date: Tue, 21 Jul 2015 22:48:56 +0000 (-0700)
Subject: NaCl: Use only nacl_irt_dev_filename, never nacl_irt_filename.
X-Git-Tag: glibc-2.22~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b24551cf3a62e0dbbe7577f63b43969f8dfc1fb;p=thirdparty%2Fglibc.git

NaCl: Use only nacl_irt_dev_filename, never nacl_irt_filename.
---

diff --git a/ChangeLog b/ChangeLog
index 93dd2cdf2db..d70fb1080a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-07-21  Roland McGrath  <roland@hack.frob.com>
 
+	* 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.
+
 	* NEWS: New item for arm-nacl port.
 	* sysdeps/arm/nacl/libc.abilist: New file.
 	* sysdeps/nacl/ld.abilist: New file.
diff --git a/sysdeps/nacl/nacl-interface-list.h b/sysdeps/nacl/nacl-interface-list.h
index d09814739a8..cb337510fcf 100644
--- a/sysdeps/nacl/nacl-interface-list.h
+++ b/sysdeps/nacl/nacl-interface-list.h
@@ -20,8 +20,6 @@ NACL_MANDATORY_INTERFACE (rtld,
 			  NACL_IRT_BASIC_v0_1, nacl_irt_basic)
 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,
diff --git a/sysdeps/nacl/open.c b/sysdeps/nacl/open.c
index cb4700ff243..381751a9cd4 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 022cf0294fb..8180c9362c9 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)