diff options
author | Zach van Rijn <me@zv.io> | 2023-10-30 17:40:56 -0500 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2023-11-02 21:24:01 -0500 |
commit | 4693e5edf9770c5f304fbfe96486a0de9a40e2dd (patch) | |
tree | 4ef8b23f7383dd9979574fe5a1e9e57c85372bf7 /user/virtualbox-guest-additions/VBoxClient.patch | |
parent | 1b2218612a71b019c7dc1db680c254c697c4ec6b (diff) | |
download | packages-zv/vboxga.tar.gz packages-zv/vboxga.tar.bz2 packages-zv/vboxga.tar.xz packages-zv/vboxga.zip |
user/virtualbox-guest-additions: new package.zv/vboxga
Diffstat (limited to 'user/virtualbox-guest-additions/VBoxClient.patch')
-rw-r--r-- | user/virtualbox-guest-additions/VBoxClient.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/user/virtualbox-guest-additions/VBoxClient.patch b/user/virtualbox-guest-additions/VBoxClient.patch new file mode 100644 index 000000000..29d7f550e --- /dev/null +++ b/user/virtualbox-guest-additions/VBoxClient.patch @@ -0,0 +1,41 @@ +diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +index 1687b59..f37b791 100644 +--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk ++++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +@@ -108,14 +108,6 @@ ifdef VBOX_WITH_DRAG_AND_DROP + endif + endif + +-# This forces the memcpy references in the static libraries to go to +-# __wrap_memcpy, which we can wrap around memcpy@GLIBC_2.2.5. I do not know +-# how else to do that without recompiling or implementing our own memcpy. +-ifeq ($(KBUILD_TARGET),linux) +- VBoxClient_LDFLAGS.amd64 += \ +- -Wl,--wrap=memcpy +-endif +- + ifdef VBOX_WITH_GUEST_PROPS + VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS + VBoxClient_SOURCES += \ +diff --git a/src/VBox/Additions/x11/VBoxClient/chk_stubs.c b/src/VBox/Additions/x11/VBoxClient/chk_stubs.c +index 9b5093e..cb14ada 100644 +--- a/src/VBox/Additions/x11/VBoxClient/chk_stubs.c ++++ b/src/VBox/Additions/x11/VBoxClient/chk_stubs.c +@@ -53,17 +53,3 @@ void __stack_chk_fail(void) + fprintf(stderr, "Stack check failed!\n"); + _exit(1); + } +- +-#ifdef __x86_64 +-/* Furthermore, wrap references to memcpy to force them to go to the right +- * version. We are forced to do it this way because the shared libraries +- * supc++ and gcc_eh contain references which we cannot change. */ +- +-extern void *__wrap_memcpy(void *dest, const void *src, size_t n); +- +-asm (".symver memcpy, memcpy@GLIBC_2.2.5"); +-void *__wrap_memcpy(void *dest, const void *src, size_t n) +-{ +- return memcpy(dest, src, n); +-} +-#endif |