[hurd,commited] hurd: Update localplt.data

[hurd,commited] hurd: Update localplt.data

[Samuel Thibault]

* sysdeps/mach/hurd/localplt.data: Inherit sysdeps/generic/localplt.data
and comment functions currently unused.
---
 sysdeps/mach/hurd/localplt.data | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/sysdeps/mach/hurd/localplt.data b/sysdeps/mach/hurd/localplt.data
index 53c1ba9e1c..2417b715d4 100644
--- a/sysdeps/mach/hurd/localplt.data
+++ b/sysdeps/mach/hurd/localplt.data
@@ -1,21 +1,41 @@
+# See scripts/check-localplt.awk for how this file is processed.
+# PLT use is required for the malloc family and for matherr because
+# users can define their own functions and have library internals call them.
+libc.so: calloc
+libc.so: free
+libc.so: malloc
+libc.so: memalign
+libc.so: realloc
+libm.so: matherr
+# The main malloc is interposed into the dynamic linker, for
+# allocations after the initial link (when dlopen is used).
+ld.so: malloc
+ld.so: calloc
+ld.so: realloc
+ld.so: free
+# The TLS-enabled version of these functions is interposed from libc.so.
+ld.so: _dl_signal_error
+ld.so: _dl_catch_error
+ld.so: _dl_signal_exception
+ld.so: _dl_catch_exception
 # The dynamic linker has its own versions of basic functions for initial loading
 # of shared libraries.  These need to be overriden by libc once loaded.
 ld.so: __open
 ld.so: __close
 ld.so: __libc_read
 ld.so: __libc_write
-ld.so: __writev
+#ld.so: __writev
 ld.so: __libc_lseek64
-ld.so: __map
+ld.so: __mmap
 ld.so: __fxstat64
 ld.so: __xstat64
-ld.so: __access
-ld.so: __access_noerrno
+#ld.so: __access
+#ld.so: __access_noerrno
 ld.so: __getpid
-ld.so: __getcwd
-ld.so: __sbrk
-ld.so: __strtoul_internal
-ld.so: _exit
+#ld.so: __getcwd
+#ld.so: __sbrk
+#ld.so: __strtoul_internal
+#ld.so: _exit
 ld.so: abort
 ld.so: _hurd_intr_rpc_mach_msg
 ld.so: __errno_location
-- 
2.16.2

[hurd,commited] hurd: update localplt.data

[Samuel Thibault]

after 329ea513b451 ("Avoid cancellable I/O primitives in ld.so.")

	* sysdeps/mach/hurd/localplt.data (ld.so): Add __open64, rename
	__libc_read and __libc_write to __read and __write.
---
 ChangeLog                       | 2 ++
 sysdeps/mach/hurd/localplt.data | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab8926d30f..61e7c1758f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* sysdeps/mach/hurd/i386/Makefile (test-xfail-check-abi-libhurduser,
 	test-xfail-check-abi-libmachuser): Add.
+	* sysdeps/mach/hurd/localplt.data (ld.so): Add __open64, rename
+	__libc_read and __libc_write to __read and __write.
 
 2018-06-13  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/sysdeps/mach/hurd/localplt.data b/sysdeps/mach/hurd/localplt.data
index ca43cce323..4df5ae5d63 100644
--- a/sysdeps/mach/hurd/localplt.data
+++ b/sysdeps/mach/hurd/localplt.data
@@ -21,9 +21,10 @@ ld.so: _dl_catch_exception
 # The dynamic linker has its own versions of basic functions for initial loading
 # of shared libraries.  These need to be overriden by libc once loaded.
 ld.so: __open
+ld.so: __open64 ?
 ld.so: __close
-ld.so: __libc_read
-ld.so: __libc_write
+ld.so: __read ?
+ld.so: __write ?
 #ld.so: __writev
 ld.so: __libc_lseek64
 ld.so: __mmap
-- 
2.17.1