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 /sysdeps | |
| 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 'sysdeps')
| -rw-r--r-- | sysdeps/mach/include/mach/mig_support.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/mach/include/mach/mig_support.h b/sysdeps/mach/include/mach/mig_support.h index b027237692..1888d481d2 100644 --- a/sysdeps/mach/include/mach/mig_support.h +++ b/sysdeps/mach/include/mach/mig_support.h @@ -4,5 +4,17 @@ libc_hidden_proto (__mig_get_reply_port) libc_hidden_proto (__mig_dealloc_reply_port) libc_hidden_proto (__mig_init) + +#ifdef _LIBC +# include <libc-symbols.h> + +# if defined USE_MULTIARCH && (IS_IN (libmachuser) || IS_IN (libhurduser)) +/* Avoid directly calling ifunc-enabled memcpy or strpcpy, + because they would introduce a relocation loop between lib*user and + libc.so. */ +# define memcpy(dest, src, n) __mig_memcpy(dest, src, n) +# endif +#endif + #endif #endif |