From 55c76738a29a26890dcadd99a494f58a2a926f63 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 9 Mar 2021 18:26:50 +0100
Subject: app-emulation/virtualbox-modules: Fixed build with binutils-2.36

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 .../virtualbox-modules-6.1.18-binutils-2.36.patch  | 39 ++++++++++++++++++++++
 .../virtualbox-modules-6.1.18.ebuild               |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch

(limited to 'app-emulation')

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 000000000000..2eaeb1ea3380
--- /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 bbc7f312dbe5..17dbf76a1d40 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() {
-- 
cgit v1.2.3-65-gdbad