diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-11-13 15:56:51 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-11-14 00:52:52 +0100 |
| commit | 56010b73e81e2cb1082e418699f98353598fe671 (patch) | |
| tree | e6e4b6e7a05b77e9de56b6c15b2d4997d5ad76eb /mach/mach | |
| parent | a24f414ba11a7acdf3c5ccec3fb327fc72166556 (diff) | |
| download | glibc-56010b73e81e2cb1082e418699f98353598fe671.tar.gz glibc-56010b73e81e2cb1082e418699f98353598fe671.tar.xz glibc-56010b73e81e2cb1082e418699f98353598fe671.zip | |
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/mach')
| -rw-r--r-- | mach/mach/mig_support.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h index a5b74bfcc8..cca0716b87 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 */ |