This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.27.9000-479-g8c9d534
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Jun 2018 01:05:21 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.27.9000-479-g8c9d534
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 8c9d53428e463da0ab99ff5162d94c3a043b3a2d (commit)
via b0344cf5c55b4ca83f383c7a1896a016dfe66687 (commit)
via 7a646a93fadef8841c724501fe723b383069191e (commit)
via c1b7586c544957998c0f53711fa91e5de72cc819 (commit)
via 932d05f0dc89b905570bf8bd69bfe7fda2821ccf (commit)
via 57e1651557e833744d345deff0cd595b31e621ff (commit)
via faf7bbc2d051f7351af5761e3f84f1c3c8b6479f (commit)
via 298a8b59d43cf9a75c44e9b2836e07282a6d34ed (commit)
from b12c1e7991cbde3d6fc70abfdf72abecce8b318c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8c9d53428e463da0ab99ff5162d94c3a043b3a2d
commit 8c9d53428e463da0ab99ff5162d94c3a043b3a2d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 02:59:14 2018 +0200
hurd: Whitelist PLT refs which are difficult to avoid
* sysdeps/mach/hurd/localplt.data (siglongjmp, longjmp,
__libc_lseek64, _IO_funlockfile): Whitelist PLT references.
diff --git a/ChangeLog b/ChangeLog
index 8c4b6cc..2fc3a71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@
* sysdeps/mach/include/mach/mach_traps.h (__mach_reply_port,
__mach_thread_self, __mach_task_self, __mach_host_self, __swtch,
__swtch_pri, __thread_switch, __evc_wait): Add hidden prototypes.
+ * sysdeps/mach/hurd/localplt.data (siglongjmp, longjmp,
+ __libc_lseek64, _IO_funlockfile): Whitelist PLT references.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/sysdeps/mach/hurd/localplt.data b/sysdeps/mach/hurd/localplt.data
index 58d119e..a1f1ae6 100644
--- a/sysdeps/mach/hurd/localplt.data
+++ b/sysdeps/mach/hurd/localplt.data
@@ -52,3 +52,11 @@ ld.so: _dl_init_first
ld.so: _dl_mcount
ld.so: ___tls_get_addr
ld.so: __tunable_get_val
+
+# These should ideally be avoided, but is currently difficult
+libc.so: siglongjmp ?
+libc.so: longjmp ?
+# This is from lseek.c
+libc.so: __libc_lseek64 ?
+# This is through cleanup_region_start from vfprintf.c
+libc.so: _IO_funlockfile ?
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b0344cf5c55b4ca83f383c7a1896a016dfe66687
commit b0344cf5c55b4ca83f383c7a1896a016dfe66687
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 02:47:51 2018 +0200
hurd: Avoid PLT references to syscalls
* mach/Makefile ($(mach-syscalls:%=$(objpfx))): Add hidden definition.
* sysdeps/mach/include/mach/mach_traps.h (__mach_reply_port,
__mach_thread_self, __mach_task_self, __mach_host_self, __swtch,
__swtch_pri, __thread_switch, __evc_wait): Add hidden prototypes.
diff --git a/ChangeLog b/ChangeLog
index d81c823..8c4b6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,10 @@
(__mach_msg): Add hidden prototype.
* mach/msg.c: Include <mach.h>.
(__mach_msg): Add hidden definition.
+ * mach/Makefile ($(mach-syscalls:%=$(objpfx))): Add hidden definition.
+ * sysdeps/mach/include/mach/mach_traps.h (__mach_reply_port,
+ __mach_thread_self, __mach_task_self, __mach_host_self, __swtch,
+ __swtch_pri, __thread_switch, __evc_wait): Add hidden prototypes.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/mach/Makefile b/mach/Makefile
index 2683587..435ae68 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -97,7 +97,8 @@ else
$(mach-syscalls:%=$(objpfx)%.S): $(objpfx)%.S: $(objpfx)mach-syscalls.mk
(echo '#include <sysdep.h>'; \
echo 'kernel_trap (__$*,$(sysno-$*),$(nargs-$*))'; \
- echo 'weak_alias (__$*, $*)') > $@-new
+ echo 'weak_alias (__$*, $*)'; \
+ echo 'libc_hidden_def (__$*)') > $@-new
mv -f $@-new $@
generated += $(mach-syscalls:=.S)
endif # mach-syscalls
diff --git a/sysdeps/mach/include/mach/mach_traps.h b/sysdeps/mach/include/mach/mach_traps.h
index d1b2feb..2d4c1f9 100644
--- a/sysdeps/mach/include/mach/mach_traps.h
+++ b/sysdeps/mach/include/mach/mach_traps.h
@@ -1,13 +1,21 @@
#ifndef _MACH_MACH_TRAPS_H
#include_next <mach/mach_traps.h>
-extern mach_port_t __mach_reply_port (void) attribute_hidden;
+extern mach_port_t __mach_reply_port (void);
+libc_hidden_proto (__mach_reply_port)
extern mach_port_t __mach_thread_self (void);
+libc_hidden_proto (__mach_thread_self)
extern mach_port_t (__mach_task_self) (void);
-extern mach_port_t (__mach_host_self) (void) attribute_hidden;
-extern boolean_t __swtch (void) attribute_hidden;
-extern boolean_t __swtch_pri (int priority) attribute_hidden;
+libc_hidden_proto (__mach_task_self)
+extern mach_port_t (__mach_host_self) (void);
+libc_hidden_proto (__mach_host_self)
+extern boolean_t __swtch (void);
+libc_hidden_proto (__swtch)
+extern boolean_t __swtch_pri (int priority);
+libc_hidden_proto (__swtch_pri)
kern_return_t __thread_switch (mach_port_t new_thread,
- int option, mach_msg_timeout_t option_time) attribute_hidden;
-kern_return_t __evc_wait (unsigned int event) attribute_hidden;
+ int option, mach_msg_timeout_t option_time);
+libc_hidden_proto (__thread_switch)
+kern_return_t __evc_wait (unsigned int event);
+libc_hidden_proto (__evc_wait)
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7a646a93fadef8841c724501fe723b383069191e
commit 7a646a93fadef8841c724501fe723b383069191e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 02:35:17 2018 +0200
hurd: Avoid PLT ref to __mach_msg
* sysdeps/mach/include/mach.h (__mach_msg): Add hidden prototype.
* mach/msg.c: Include <mach.h>.
(__mach_msg): Add hidden definition.
diff --git a/ChangeLog b/ChangeLog
index 4defdb6..d81c823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
* mach/shortcut.awk: Make syscall stubs include
<mach-shortcuts-hidden.h> and add hidden definition.
* sysdeps/mach/include/mach.h: Include <mach-shortcuts-hidden.h>.
+ (__mach_msg): Add hidden prototype.
+ * mach/msg.c: Include <mach.h>.
+ (__mach_msg): Add hidden definition.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/mach/msg.c b/mach/msg.c
index bccad7f..8eb252a 100644
--- a/mach/msg.c
+++ b/mach/msg.c
@@ -25,6 +25,7 @@
*/
#include <mach/port.h>
#include <mach/message.h>
+#include <mach.h>
#ifdef MACH_MSG_OVERWRITE
/* In variants with this feature, the actual system call is
@@ -125,6 +126,7 @@ __mach_msg (mach_msg_header_t *msg,
return ret;
}
weak_alias (__mach_msg, mach_msg)
+libc_hidden_def (__mach_msg)
mach_msg_return_t
__mach_msg_send (mach_msg_header_t *msg)
diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h
index fff8349..65f8d97 100644
--- a/sysdeps/mach/include/mach.h
+++ b/sysdeps/mach/include/mach.h
@@ -3,5 +3,6 @@
#include <mach-shortcuts-hidden.h>
#ifndef _ISOMAC
libc_hidden_proto (__mach_msg_destroy)
+libc_hidden_proto (__mach_msg)
#endif
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c1b7586c544957998c0f53711fa91e5de72cc819
commit c1b7586c544957998c0f53711fa91e5de72cc819
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 02:19:47 2018 +0200
hurd: Avoid PLT references to shortcuts
* sysdeps/mach/include/mach-shortcuts-hidden.h: New file.
* mach/shortcut.awk: Make syscall stubs include
<mach-shortcuts-hidden.h> and add hidden definition.
* sysdeps/mach/include/mach.h: Include <mach-shortcuts-hidden.h>.
diff --git a/ChangeLog b/ChangeLog
index 7ceaa82..4defdb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Remove
prototype.
* sysdeps/mach/hurd/localplt.data (ld.so): Make ref to __open optional.
+ * sysdeps/mach/include/mach-shortcuts-hidden.h: New file.
+ * mach/shortcut.awk: Make syscall stubs include
+ <mach-shortcuts-hidden.h> and add hidden definition.
+ * sysdeps/mach/include/mach.h: Include <mach-shortcuts-hidden.h>.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/mach/shortcut.awk b/mach/shortcut.awk
index ea283d4..090da82 100644
--- a/mach/shortcut.awk
+++ b/mach/shortcut.awk
@@ -1,6 +1,7 @@
# Icky intimate knowledge of MiG output.
BEGIN { print "/* This file is generated by shortcut.awk. */";
+ print "#include <mach-shortcuts-hidden.h>";
echo=1;
inproto=0; proto=""; arglist="";
}
@@ -44,6 +45,7 @@ echo == 1 { print $0; }
print " return err;"
print "}";
print "weak_alias (" call ", " alias ")";
+ print "libc_hidden_def (" call ")";
# Declare RPC so the weak_alias that follows will work.
print "extern __typeof (" call ") " rpc ";";
echo = 1;
diff --git a/sysdeps/mach/include/mach-shortcuts-hidden.h b/sysdeps/mach/include/mach-shortcuts-hidden.h
new file mode 100644
index 0000000..0942871
--- /dev/null
+++ b/sysdeps/mach/include/mach-shortcuts-hidden.h
@@ -0,0 +1,13 @@
+#include <mach-shortcuts.h>
+libc_hidden_proto (__task_create)
+libc_hidden_proto (__task_terminate)
+libc_hidden_proto (__vm_allocate)
+libc_hidden_proto (__vm_deallocate)
+libc_hidden_proto (__task_suspend)
+libc_hidden_proto (__task_set_special_port)
+libc_hidden_proto (__vm_map)
+libc_hidden_proto (__thread_depress_abort)
+libc_hidden_proto (__mach_port_allocate_name)
+libc_hidden_proto (__mach_port_allocate)
+libc_hidden_proto (__mach_port_deallocate)
+libc_hidden_proto (__mach_port_insert_right)
diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h
index b4c2f45..fff8349 100644
--- a/sysdeps/mach/include/mach.h
+++ b/sysdeps/mach/include/mach.h
@@ -1,5 +1,6 @@
#ifndef _MACH_H
#include_next <mach.h>
+#include <mach-shortcuts-hidden.h>
#ifndef _ISOMAC
libc_hidden_proto (__mach_msg_destroy)
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=932d05f0dc89b905570bf8bd69bfe7fda2821ccf
commit 932d05f0dc89b905570bf8bd69bfe7fda2821ccf
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 01:49:29 2018 +0200
hurd: Avoid missing PLT ref from ld.so requirement
* sysdeps/mach/hurd/localplt.data (ld.so): Make ref to __open optional.
diff --git a/ChangeLog b/ChangeLog
index 390c2a1..7ceaa82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
(__pthread_get_cleanup_stack): Add hidden proto.
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Remove
prototype.
+ * sysdeps/mach/hurd/localplt.data (ld.so): Make ref to __open optional.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/sysdeps/mach/hurd/localplt.data b/sysdeps/mach/hurd/localplt.data
index 4df5ae5..58d119e 100644
--- a/sysdeps/mach/hurd/localplt.data
+++ b/sysdeps/mach/hurd/localplt.data
@@ -20,7 +20,7 @@ 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: __open ?
ld.so: __open64 ?
ld.so: __close
ld.so: __read ?
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=57e1651557e833744d345deff0cd595b31e621ff
commit 57e1651557e833744d345deff0cd595b31e621ff
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 01:22:43 2018 +0200
hurd: Avoid PLT ref for __pthread_get_cleanup_stack
* htl/pt-cleanup.c (___pthread_get_cleanup_stack): Rename to
__pthread_get_cleanup_stack.
(__pthread_get_cleanup_stack): Remove alias, add hidden def.
* htl/pt-exit.c (__pthread_exit): Use __pthread_get_cleanup_stack
instead of ___pthread_get_cleanup_stack.
* sysdeps/htl/pthread-functions.h [libpthread]
(__pthread_get_cleanup_stack): Add hidden proto.
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Remove
prototype.
diff --git a/ChangeLog b/ChangeLog
index 0a2e082..390c2a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,15 @@
* sysdeps/mach/hurd/lseek.c: Include <errno.h>.
* sysdeps/mach/hurd/lseek.c (__libc_lseek): Check that the value
returned by __lseek64 can fit off_t, return EOVERFLOW otherwise.
+ * htl/pt-cleanup.c (___pthread_get_cleanup_stack): Rename to
+ __pthread_get_cleanup_stack.
+ (__pthread_get_cleanup_stack): Remove alias, add hidden def.
+ * htl/pt-exit.c (__pthread_exit): Use __pthread_get_cleanup_stack
+ instead of ___pthread_get_cleanup_stack.
+ * sysdeps/htl/pthread-functions.h [libpthread]
+ (__pthread_get_cleanup_stack): Add hidden proto.
+ * sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Remove
+ prototype.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/htl/pt-cleanup.c b/htl/pt-cleanup.c
index 1b860c7..b4a9834 100644
--- a/htl/pt-cleanup.c
+++ b/htl/pt-cleanup.c
@@ -21,8 +21,8 @@
#include <pt-internal.h>
struct __pthread_cancelation_handler **
-___pthread_get_cleanup_stack (void)
+__pthread_get_cleanup_stack (void)
{
return &_pthread_self ()->cancelation_handlers;
}
-strong_alias (___pthread_get_cleanup_stack, __pthread_get_cleanup_stack)
+libc_hidden_def (__pthread_get_cleanup_stack)
diff --git a/htl/pt-exit.c b/htl/pt-exit.c
index cb62f47..823e09e 100644
--- a/htl/pt-exit.c
+++ b/htl/pt-exit.c
@@ -41,7 +41,7 @@ __pthread_exit (void *status)
disabled. */
__pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
- for (handlers = ___pthread_get_cleanup_stack ();
+ for (handlers = __pthread_get_cleanup_stack ();
*handlers != NULL;
*handlers = (*handlers)->__next)
(*handlers)->__handler ((*handlers)->__arg);
diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index a0d06cc..bb901e3 100644
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -60,6 +60,9 @@ pthread_t __pthread_self (void);
int __pthread_setcancelstate (int, int *);
int __pthread_setcanceltype (int, int *);
struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
+#if IS_IN (libpthread)
+hidden_proto (__pthread_get_cleanup_stack)
+#endif
int __pthread_once (pthread_once_t *, void (*) (void));
int __pthread_rwlock_rdlock (pthread_rwlock_t *);
int __pthread_rwlock_wrlock (pthread_rwlock_t *);
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 6c9aa6c..3fcb811 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -64,7 +64,6 @@ int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
size_t __stacksize);
int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *);
-struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void);
#if IS_IN (libpthread)
hidden_proto (__pthread_key_create)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=faf7bbc2d051f7351af5761e3f84f1c3c8b6479f
commit faf7bbc2d051f7351af5761e3f84f1c3c8b6479f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 01:00:00 2018 +0200
hurd: Detect 32bit overflow in value returned by lseek
* sysdeps/mach/hurd/lseek.c: Include <errno.h>.
* sysdeps/mach/hurd/lseek.c (__libc_lseek): Check that the value returned
by __lseek64 can fit off_t, return EOVERFLOW otherwise.
diff --git a/ChangeLog b/ChangeLog
index 74c14d4..0a2e082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
of sendfile.
* sysdeps/mach/hurd/sendfile64.c (sendfile64): Rename to __sendfile64.
(sendfile64): New strong alias.
+ * sysdeps/mach/hurd/lseek.c: Include <errno.h>.
+ * sysdeps/mach/hurd/lseek.c (__libc_lseek): Check that the value
+ returned by __lseek64 can fit off_t, return EOVERFLOW otherwise.
2018-06-15 Joseph Myers <joseph@codesourcery.com>
diff --git a/sysdeps/mach/hurd/lseek.c b/sysdeps/mach/hurd/lseek.c
index 6677e01..0a40772 100644
--- a/sysdeps/mach/hurd/lseek.c
+++ b/sysdeps/mach/hurd/lseek.c
@@ -17,12 +17,22 @@
#include <unistd.h>
#include <sys/types.h>
+#include <errno.h>
/* Seek to OFFSET on FD, starting from WHENCE. */
off_t
__libc_lseek (int fd, off_t offset, int whence)
{
- return __libc_lseek64 (fd, (off64_t) offset, whence);
+ off64_t res64 = __libc_lseek64 (fd, (off64_t) offset, whence);
+ off_t res = (off_t) res64;
+
+ if (sizeof res != sizeof res64 && res != res64)
+ {
+ __set_errno (EOVERFLOW);
+ return (off_t) -1;
+ }
+
+ return res;
}
weak_alias (__libc_lseek, __lseek)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=298a8b59d43cf9a75c44e9b2836e07282a6d34ed
commit 298a8b59d43cf9a75c44e9b2836e07282a6d34ed
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jun 16 00:44:17 2018 +0200
hurd: avoid PLT ref between sendfile and sendfile64
* include/sys/sendfile.h (__sendfile64): Declare hidden prototype.
* sysdeps/mach/hurd/sendfile.c (sendfile): Call __sendfile64 instead
of sendfile.
* sysdeps/mach/hurd/sendfile64.c (sendfile64): Rename to __sendfile64.
(sendfile64): New strong alias.
diff --git a/ChangeLog b/ChangeLog
index a8f711f..74c14d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-15 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * include/sys/sendfile.h (__sendfile64): Declare hidden prototype.
+ * sysdeps/mach/hurd/sendfile.c (sendfile): Call __sendfile64 instead
+ of sendfile.
+ * sysdeps/mach/hurd/sendfile64.c (sendfile64): Rename to __sendfile64.
+ (sendfile64): New strong alias.
+
2018-06-15 Joseph Myers <joseph@codesourcery.com>
[BZ #23007]
diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h
index abe0976..b88cca2 100644
--- a/include/sys/sendfile.h
+++ b/include/sys/sendfile.h
@@ -1 +1,7 @@
#include <io/sys/sendfile.h>
+
+#ifndef _ISOMAC
+
+extern __typeof (sendfile64) __sendfile64 attribute_hidden;
+
+#endif
diff --git a/sysdeps/mach/hurd/sendfile.c b/sysdeps/mach/hurd/sendfile.c
index 6a3de0f..4df66b5 100644
--- a/sysdeps/mach/hurd/sendfile.c
+++ b/sysdeps/mach/hurd/sendfile.c
@@ -25,11 +25,11 @@ ssize_t
sendfile (int out_fd, int in_fd, off_t *offset, size_t count)
{
if (offset == NULL || sizeof (off_t) == sizeof (off64_t))
- return sendfile64 (out_fd, in_fd, (off64_t *) offset, count);
+ return __sendfile64 (out_fd, in_fd, (off64_t *) offset, count);
else
{
off64_t ofs = *offset;
- ssize_t ret = sendfile64 (out_fd, in_fd, &ofs, count);
+ ssize_t ret = __sendfile64 (out_fd, in_fd, &ofs, count);
*offset = ofs;
return ret;
}
diff --git a/sysdeps/mach/hurd/sendfile64.c b/sysdeps/mach/hurd/sendfile64.c
index f69ccd4..ea4e96d 100644
--- a/sysdeps/mach/hurd/sendfile64.c
+++ b/sysdeps/mach/hurd/sendfile64.c
@@ -24,7 +24,7 @@
/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to
descriptor OUT_FD. */
ssize_t
-sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count)
+__sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count)
{
/* We just do a vanilla io_read followed by a vanilla io_write here.
In theory the IN_FD filesystem can return us out-of-line data that
@@ -57,3 +57,4 @@ sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count)
}
return __hurd_fail (err);
}
+strong_alias (__sendfile64, sendfile64)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 34 ++++++++++++++++++++++++++
htl/pt-cleanup.c | 4 +-
htl/pt-exit.c | 2 +-
include/sys/sendfile.h | 6 ++++
mach/Makefile | 3 +-
mach/msg.c | 2 +
mach/shortcut.awk | 2 +
sysdeps/htl/pthread-functions.h | 3 ++
sysdeps/htl/pthreadP.h | 1 -
sysdeps/mach/hurd/localplt.data | 10 +++++++-
sysdeps/mach/hurd/lseek.c | 12 ++++++++-
sysdeps/mach/hurd/sendfile.c | 4 +-
sysdeps/mach/hurd/sendfile64.c | 3 +-
sysdeps/mach/include/mach-shortcuts-hidden.h | 13 ++++++++++
sysdeps/mach/include/mach.h | 2 +
sysdeps/mach/include/mach/mach_traps.h | 20 ++++++++++----
16 files changed, 105 insertions(+), 16 deletions(-)
create mode 100644 sysdeps/mach/include/mach-shortcuts-hidden.h
hooks/post-receive
--
GNU C Library master sources