commit: 55c76738a29a26890dcadd99a494f58a2a926f63
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 17:26:50 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 17:27:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c76738
app-emulation/virtualbox-modules: Fixed build with binutils-2.36
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../virtualbox-modules-6.1.18-binutils-2.36.patch | 39 ++++++++++++++++++++++
.../virtualbox-modules-6.1.18.ebuild | 1 +
2 files changed, 40 insertions(+)
diff --git
a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
new file mode 100644
index 00000000000..2eaeb1ea338
--- /dev/null
+++
b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch
@@ -0,0 +1,39 @@
+--- virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c
++++ virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c
+@@ -1472,29 +1472,32 @@
+ __asm__("\
+ .section .text \n\
+ \n\
+- .p2align 2,,3 \n\
++ .p2align 4 \n\
+ .global SUPR0TracerFireProbe \n\
++ .type SUPR0TracerFireProbe, @function \n\
+ SUPR0TracerFireProbe: \n\
+ ");
+ # if defined(RT_ARCH_AMD64)
+-__asm__(" \
+- movq g_pfnSupdrvProbeFireKernel(%rip), %rax
\n\
++__asm__("\
++ movq g_pfnSupdrvProbeFireKernel(%rip), %rax \n\
+ jmp *%rax \n\
+ ");
+ # elif defined(RT_ARCH_X86)
+ __asm__("\
+- movl g_pfnSupdrvProbeFireKernel, %eax
\n\
++ movl g_pfnSupdrvProbeFireKernel, %eax \n\
+ jmp *%eax \n\
+ ");
+ # else
+ # error "Which arch is this?"
+ # endif
+ __asm__("\
++ .size SUPR0TracerFireProbe, . - SUPR0TracerFireProbe \n\
+ \n\
+ .type supdrvTracerProbeFireStub,@function \n\
+ .global supdrvTracerProbeFireStub \n\
+ supdrvTracerProbeFireStub: \n\
+ ret \n\
++ .size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub \n\
+ \n\
+ .previous \n\
+ ");
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
index bbc7f312dbe..17dbf76a1d4 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
@@ -31,6 +31,7 @@ MODULESD_VBOXNETFLT_ENABLED="no"
PATCHES=(
"${FILESDIR}/${P}-linux-5.11.patch" #762994
+ "${FILESDIR}/${P}-binutils-2.36.patch"
)
pkg_setup() {
