aboutsummaryrefslogtreecommitdiff
path: root/mach
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-11-13 15:56:51 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-11-14 00:52:52 +0100
commit56010b73e81e2cb1082e418699f98353598fe671 (patch)
treee6e4b6e7a05b77e9de56b6c15b2d4997d5ad76eb /mach
parenta24f414ba11a7acdf3c5ccec3fb327fc72166556 (diff)
downloadglibc-56010b73e81e2cb1082e418699f98353598fe671.zip
glibc-56010b73e81e2cb1082e418699f98353598fe671.tar.gz
glibc-56010b73e81e2cb1082e418699f98353598fe671.tar.bz2
hurd: break relocation loop between libc.so and lib{mach,hurd}user.so
See https://sourceware.org/pipermail/libc-alpha/2020-November/119575.html lib{mach,hurd}user.so gets relocated before libc.so, but its references to strpcpy and memcpy would need an ifunc decision, which e.g. on x86 relies on cpu_features, but libc.so's _rtld_global_ro is not relocated yet. We can however just make lib{mach,hurd}user.so only call non-ifunc functions, which can be relocated before libc.so is relocated.
Diffstat (limited to 'mach')
-rw-r--r--mach/Makefile2
-rw-r--r--mach/Versions4
-rw-r--r--mach/mach/mig_support.h15
-rw-r--r--mach/mig_memcpy.c26
4 files changed, 32 insertions, 15 deletions
diff --git a/mach/Makefile b/mach/Makefile
index bd9d7c8..b3ad3f4 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -25,7 +25,7 @@ headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \
lock = spin-solid spin-lock mutex-init mutex-solid
lock-headers = lock-intern.h spin-lock.h
routines = $(mach-syscalls) $(mach-shortcuts) \
- mach_init mig_strncpy msg \
+ mach_init mig_strncpy mig_memcpy msg \
mig-alloc mig-dealloc mig-reply \
msg-destroy msgserver \
mach_error errstring error_compat errsystems \
diff --git a/mach/Versions b/mach/Versions
index eef52c8..b525cfd 100644
--- a/mach/Versions
+++ b/mach/Versions
@@ -68,4 +68,8 @@ libc {
__spin_lock; __spin_lock_init; __spin_lock_solid; __spin_try_lock;
__spin_unlock;
}
+ GLIBC_PRIVATE {
+ # functions used by RPC stubs
+ __mig_memcpy;
+ }
}
diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h
index a5b74bf..cca0716 100644
--- a/mach/mach/mig_support.h
+++ b/mach/mach/mig_support.h
@@ -54,19 +54,6 @@ extern void mig_reply_setup (const mach_msg_header_t *__request,
extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len);
extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t);
-#if defined __USE_EXTERN_INLINES && defined _LIBC
-__extern_inline vm_size_t
-__mig_strncpy (char *__dst, const char *__src, vm_size_t __len)
-{
- return __stpncpy (__dst, __src, __len) - __dst;
-}
-__extern_inline vm_size_t
-mig_strncpy (char *__dst, const char *__src, vm_size_t __len)
-{
- return __mig_strncpy (__dst, __src, __len);
-}
-#endif
-
-
+extern void *__mig_memcpy (void *__dst, const void *__src, vm_size_t __len);
#endif /* mach/mig_support.h */
diff --git a/mach/mig_memcpy.c b/mach/mig_memcpy.c
new file mode 100644
index 0000000..df8fd5e
--- /dev/null
+++ b/mach/mig_memcpy.c
@@ -0,0 +1,26 @@
+/* memcpy stub for mig stubs in libmachuser and libhurduser.
+ Copyright (C) 2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <mach.h>
+#include <string.h>
+
+void *
+__mig_memcpy (void *dst, const void *src, vm_size_t len)
+{
+ return memcpy (dst, src, len);
+}