Skip to contentSkip to conversation

Patch review July 24th

PATCH New Armin Kuster 1 participant 16 messages Jul 25, 2021 Arm STM32

lore
Share & tools
lore
#0 lore raw

cover Patch review July 24th

please have comments back by Tuesday.

The following changes since commit 10082fce3b6ddeaaae4df95f7f002356942b7577:

postgresql: update to 12.7 (2021-07-17 07:42:33 -0700)

are available in the Git repository at:

git://git.openembedded.org/meta-openembedded-contrib stable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nut

Armin Kuster (2):
mariadb: update to 10.4.20
hiawatha: fix url.

Bruce Ashfield (1):
vboxguestdrivers: fix build against kernel v5.10+

Gianfranco (5):
vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
vboxguestdrivers: Add patch proposed upstream to fix a build failure

    on i386

vboxguestdrivers: upgrade 6.1.18 -> 6.1.20
vboxguestdrivers: upgrade 6.1.20 -> 6.1.22
vboxguestdrivers: add a fix for build failure with kernel 5.13

Gianfranco Costamagna (3):
vboxguestdrivers: upgrade 6.1.6 -> 6.1.12
vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8
compatibility patch, now part of upstream codebase
vboxguestdrivers: upgrade 6.1.14 -> 6.1.16

Hongxu Jia (1):
vboxguestdrivers: fix failed to compile with kernel 5.8.0

Jate Sujjavanich (1):
ufw: backport patches, update RRECOMMENDS, python3 support, tests

Khem Raj (2):
vboxguestdrivers: Fix build with kernel 5.8
vboxguestdrivers: Add __divmoddi4 builtin support

 .../0006-check-requirements-get-error.patch   |    36 +
 ...se-conntrack-instead-of-state-module.patch | 14903 ++++++++++++++++
 ...8-support-.-setup.py-build-LP-819600.patch |    93 +
 ...st-runtime-tests-to-use-daytime-port.patch |  2895 +++
 ...IPT_MODULES-and-update-documentation.patch |   106 +
 ...nts--simplify-and-support-python-3.8.patch |    33 +
 ...tect-openembedded-python-interpreter.patch |    33 +
 ...setup-only-make-one-reference-to-env.patch |    14 +-
 .../recipes-connectivity/ufw/ufw_0.33.bb      |    49 +-
 ...e_10.4.17.bb => mariadb-native_10.4.20.bb} |     0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |     4 +-
 ...{mariadb_10.4.17.bb => mariadb_10.4.20.bb} |     0
 .../40-linux-5.13-support.patch               |   276 +
 .../vboxguestdrivers/add__divmoddi4.patch     |    36 +
 ...rs_6.1.6.bb => vboxguestdrivers_6.1.22.bb} |     9 +-
 .../recipes-httpd/hiawatha/hiawatha_10.10.bb  |     2 +-
 16 files changed, 18476 insertions(+), 13 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0006-check-requirements-get-error.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0007-use-conntrack-instead-of-state-module.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0009-adjust-runtime-tests-to-use-daytime-port.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0010-empty-out-IPT_MODULES-and-update-documentation.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0011-tests-check-requirements--simplify-and-support-python-3.8.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/Add-code-to-detect-openembedded-python-interpreter.patch
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.4.17.bb => mariadb-native_10.4.20.bb} (100%)
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.4.17.bb => mariadb_10.4.20.bb} (100%)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.6.bb => vboxguestdrivers_6.1.22.bb} (90%)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/15 vboxguestdrivers: upgrade 6.1.6 -> 6.1.12

From: Gianfranco Costamagna <[email protected]>

(cherry picked from commit 21bc66202e18a7b214869e3654b8547ea0ea9cbd)
[Stable branch]
---
 .../{vboxguestdrivers_6.1.6.bb => vboxguestdrivers_6.1.12.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.6.bb => vboxguestdrivers_6.1.12.bb} (95%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb +2 -2
similarity index 95%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb
index 89b1ee11e2..dfa15da2db 100644
@@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
 "
-SRC_URI[md5sum] = "fe6328d22dfb20ea372daa4b58b12374"
-SRC_URI[sha256sum] = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f"
+SRC_URI[md5sum] = "3c351f7fd6376e0bb3c8489505a9450c"
+SRC_URI[sha256sum] = "05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362"
 
 S = "${WORKDIR}/vbox_module"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/15 vboxguestdrivers: fix failed to compile with kernel 5.8.0

In reply to Armin Kuster

From: Hongxu Jia <[email protected]>

Backport patches from upstream [1] to fix the issue

It also requires to apply a patch on 5.8 kernel [2]

[1] https://www.virtualbox.org/ticket/19644
[2] https://www.virtualbox.org/raw-attachment/ticket/19644/local_patches

(cherry picked from commit 9c10ed4baa95648b7735757121e3af8b0aeb8e06)
---
 .../0001-fixes_for_mm_struct.patch            | 176 ++++++++++++++++++
 .../0002-fixes_for_module_memory.patch        |  65 +++++++
 ...03-fixes_for_changes_in_cpu_tlbstate.patch |  39 ++++
 .../vboxguestdrivers/kernel-5.8-4.patch       |  19 ++
 .../vboxguestdrivers_6.1.12.bb                |   7 +-
 5 files changed, 305 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch new file +176 -0
new file mode 100644
index 0000000000..1ad5ce51bf
@@ -0,0 +1,176 @@
+From 98070c936931879d2b8e22939724b5a0689721d0 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Tue, 18 Aug 2020 17:48:29 +0800
+Subject: [PATCH 1/3] fixes_for_mm_struct
+
+Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ .../Runtime/r0drv/linux/memobj-r0drv-linux.c  | 74 +++++++++++++++++--
+ 1 file changed, 67 insertions(+), 7 deletions(-)
+
+diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+index 37389bcc..cdc7e8e6 100644
+--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -222,9 +222,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+         ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+         down_write(&pTask->mm->mmap_sem);
++#else
++        down_write(&pTask->mm->mmap_lock);
++#endif
+         ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+         up_write(&pTask->mm->mmap_sem);
++#else
++        up_write(&pTask->mm->mmap_lock);
++#endif
+ #endif
+     }
+     else
+@@ -232,9 +240,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+         ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+         down_write(&pTask->mm->mmap_sem);
++#else
++        down_write(&pTask->mm->mmap_lock);
++#endif
+         ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+         up_write(&pTask->mm->mmap_sem);
++#else
++        up_write(&pTask->mm->mmap_lock);
++#endif
+ #endif
+         if (    !(ulAddr & ~PAGE_MASK)
+             &&  (ulAddr & (uAlignment - 1)))
+@@ -269,13 +285,29 @@ static void rtR0MemObjLinuxDoMunmap(void *pv, size_t cb, struct task_struct *pTa
+     Assert(pTask == current); RT_NOREF_PV(pTask);
+     vm_munmap((unsigned long)pv, cb);
+ #elif defined(USE_RHEL4_MUNMAP)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+     down_write(&pTask->mm->mmap_sem);
++#else
++    down_write(&pTask->mm->mmap_lock);
++#endif
+     do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+     up_write(&pTask->mm->mmap_sem);
+ #else
++    up_write(&pTask->mm->mmap_lock);
++#endif
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+     down_write(&pTask->mm->mmap_sem);
++#else
++    down_write(&pTask->mm->mmap_lock);
++#endif
+     do_munmap(pTask->mm, (unsigned long)pv, cb);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+     up_write(&pTask->mm->mmap_sem);
++#else
++    up_write(&pTask->mm->mmap_lock);
++#endif
+ #endif
+ }
+ 
+@@ -593,7 +625,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
+                 size_t              iPage;
+                 Assert(pTask);
+                 if (pTask && pTask->mm)
+-                    down_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++		    down_read(&pTask->mm->mmap_sem);
++#else
++		    down_read(&pTask->mm->mmap_lock);
++#endif
+ 
+                 iPage = pMemLnx->cPages;
+                 while (iPage-- > 0)
+@@ -608,7 +644,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
+                 }
+ 
+                 if (pTask && pTask->mm)
+-                    up_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++		    up_read(&pTask->mm->mmap_sem);
++#else
++		    up_read(&pTask->mm->mmap_lock);
++#endif
+             }
+             /* else: kernel memory - nothing to do here. */
+             break;
+@@ -1076,7 +1116,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
+     papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
+     if (papVMAs)
+     {
+-        down_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++	down_read(&pTask->mm->mmap_sem);
++#else
++	down_read(&pTask->mm->mmap_lock);
++#endif
+ 
+         /*
+          * Get user pages.
+@@ -1162,7 +1206,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
+                 papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
+             }
+ 
+-            up_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++	    up_read(&pTask->mm->mmap_sem);
++#else
++	    up_read(&pTask->mm->mmap_lock);
++#endif
+ 
+             RTMemFree(papVMAs);
+ 
+@@ -1189,7 +1237,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
+ #endif
+         }
+ 
+-        up_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++	up_read(&pTask->mm->mmap_sem);
++#else
++	up_read(&pTask->mm->mmap_lock);
++#endif
+ 
+         RTMemFree(papVMAs);
+         rc = VERR_LOCK_FAILED;
+@@ -1604,7 +1656,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
+             const size_t    cPages    = (offSub + cbSub) >> PAGE_SHIFT;
+             size_t          iPage;
+ 
+-            down_write(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++	    down_write(&pTask->mm->mmap_sem);
++#else
++	    down_write(&pTask->mm->mmap_lock);
++#endif
+ 
+             rc = VINF_SUCCESS;
+             if (pMemLnxToMap->cPages)
+@@ -1721,7 +1777,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
+             }
+ #endif /* CONFIG_NUMA_BALANCING */
+ 
+-            up_write(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++	    up_write(&pTask->mm->mmap_sem);
++#else
++	    up_write(&pTask->mm->mmap_lock);
++#endif
+ 
+             if (RT_SUCCESS(rc))
+             {
+-- 
+2.18.2
+
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch new file +65 -0

65 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch new file +39 -0
new file mode 100644
index 0000000000..6a3e63f63d
@@ -0,0 +1,39 @@
+From 6089974a81b1b44e1d2dfa5af1fdc110dfee40c1 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Tue, 18 Aug 2020 17:51:24 +0800
+Subject: [PATCH 3/3] fixes_for_changes_in_cpu_tlbstate
+
+Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+index c7d0d99a..2e7aa6e1 100644
+--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
++++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+@@ -757,12 +757,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC);
+ RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+     RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4);
++#else
++    RTCCUINTREG uOld = __read_cr4();
++#endif
+     RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
+     if (uNew != uOld)
+     {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+         this_cpu_write(cpu_tlbstate.cr4, uNew);
+         __write_cr4(uNew);
++#endif
++        ASMSetCR4(uNew);
+     }
+ #else
+     RTCCUINTREG uOld = ASMGetCR4();
+-- 
+2.18.2
+
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch new file +19 -0
new file mode 100644
index 0000000000..cb4148fc79
@@ -0,0 +1,19 @@
+Description: Fix kernel 5.8 forbidding use of vermagic.h header file
+Author: Gianfranco Costamagna <[email protected]>
+Origin: https://www.virtualbox.org/ticket/19644
+Bug-Ubuntu: https://launchpad.net/bugs/1884652
+Last-Update: 2020-08-10
+
+--- virtualbox-6.1.12-dfsg.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
++++ virtualbox-6.1.12-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+@@ -53,7 +53,9 @@
+ #include <linux/seq_file.h>
+ #include <linux/vfs.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62)
+-# include <linux/vermagic.h>
++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++#  include <linux/vermagic.h>
++# endif
+ #endif
+ #include <VBox/err.h>
+ #include <iprt/path.h>
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb +6 -1
index dfa15da2db..e57df58d6c 100644
@@ -12,12 +12,17 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
+    file://0001-fixes_for_mm_struct.patch \
+    file://0002-fixes_for_module_memory.patch \
+    file://0003-fixes_for_changes_in_cpu_tlbstate.patch \
+    file://kernel-5.8-4.patch \
     file://Makefile.utils \
 "
 SRC_URI[md5sum] = "3c351f7fd6376e0bb3c8489505a9450c"
 SRC_URI[sha256sum] = "05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362"
 
-S = "${WORKDIR}/vbox_module"
+S ?= "${WORKDIR}/vbox_module"
+S_task-patch = "${WORKDIR}/${VBOX_NAME}"
 
 export BUILD_TARGET_ARCH="${ARCH}"
 export BUILD_TARGET_ARCH_x86-64="amd64"
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/15 vboxguestdrivers: Fix build with kernel 5.8

In reply to Armin Kuster

From: Khem Raj <[email protected]>

Remove patches which are already covered in this new patch

Fixes
step1b: ERROR: modpost: "__get_vm_area_caller" [/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.12-r0/vboxguestdrivers-6.1.12/vboxguest/vboxguest.ko] undefined!
step1b: ERROR: modpost: "map_kernel_range" [/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.12-r0/vboxguestdrivers-6.1.12/vboxguest/vboxguest.ko] undefined!

(cherry picked from commit 5efb06176add13c4b8287c9972651dcac94adf79)
---
 .../0001-fixes_for_mm_struct.patch            |  176 -
 .../0002-fixes_for_module_memory.patch        |   65 -
 ...03-fixes_for_changes_in_cpu_tlbstate.patch |   39 -
 .../vboxguestdrivers/021-linux-5-8.patch      | 5046 +++++++++++++++++
 .../vboxguestdrivers/kernel-5.8-4.patch       |   19 -
 .../vboxguestdrivers_6.1.12.bb                |    5 +-
 6 files changed, 5047 insertions(+), 303 deletions(-)
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch deleted +0 -176
deleted file mode 100644
index 1ad5ce51bf..0000000000
@@ -1,176 +0,0 @@
-From 98070c936931879d2b8e22939724b5a0689721d0 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 18 Aug 2020 17:48:29 +0800
-Subject: [PATCH 1/3] fixes_for_mm_struct
-
-Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- .../Runtime/r0drv/linux/memobj-r0drv-linux.c  | 74 +++++++++++++++++--
- 1 file changed, 67 insertions(+), 7 deletions(-)
-
-diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-index 37389bcc..cdc7e8e6 100644
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -222,9 +222,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-         ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
- #else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-         down_write(&pTask->mm->mmap_sem);
-+#else
-+        down_write(&pTask->mm->mmap_lock);
-+#endif
-         ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-         up_write(&pTask->mm->mmap_sem);
-+#else
-+        up_write(&pTask->mm->mmap_lock);
-+#endif
- #endif
-     }
-     else
-@@ -232,9 +240,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-         ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
- #else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-         down_write(&pTask->mm->mmap_sem);
-+#else
-+        down_write(&pTask->mm->mmap_lock);
-+#endif
-         ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-         up_write(&pTask->mm->mmap_sem);
-+#else
-+        up_write(&pTask->mm->mmap_lock);
-+#endif
- #endif
-         if (    !(ulAddr & ~PAGE_MASK)
-             &&  (ulAddr & (uAlignment - 1)))
-@@ -269,13 +285,29 @@ static void rtR0MemObjLinuxDoMunmap(void *pv, size_t cb, struct task_struct *pTa
-     Assert(pTask == current); RT_NOREF_PV(pTask);
-     vm_munmap((unsigned long)pv, cb);
- #elif defined(USE_RHEL4_MUNMAP)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     down_write(&pTask->mm->mmap_sem);
-+#else
-+    down_write(&pTask->mm->mmap_lock);
-+#endif
-     do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     up_write(&pTask->mm->mmap_sem);
- #else
-+    up_write(&pTask->mm->mmap_lock);
-+#endif
-+#else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     down_write(&pTask->mm->mmap_sem);
-+#else
-+    down_write(&pTask->mm->mmap_lock);
-+#endif
-     do_munmap(pTask->mm, (unsigned long)pv, cb);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     up_write(&pTask->mm->mmap_sem);
-+#else
-+    up_write(&pTask->mm->mmap_lock);
-+#endif
- #endif
- }
- 
-@@ -593,7 +625,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-                 size_t              iPage;
-                 Assert(pTask);
-                 if (pTask && pTask->mm)
--                    down_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+		    down_read(&pTask->mm->mmap_sem);
-+#else
-+		    down_read(&pTask->mm->mmap_lock);
-+#endif
- 
-                 iPage = pMemLnx->cPages;
-                 while (iPage-- > 0)
-@@ -608,7 +644,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-                 }
- 
-                 if (pTask && pTask->mm)
--                    up_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+		    up_read(&pTask->mm->mmap_sem);
-+#else
-+		    up_read(&pTask->mm->mmap_lock);
-+#endif
-             }
-             /* else: kernel memory - nothing to do here. */
-             break;
-@@ -1076,7 +1116,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
-     papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
-     if (papVMAs)
-     {
--        down_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+	down_read(&pTask->mm->mmap_sem);
-+#else
-+	down_read(&pTask->mm->mmap_lock);
-+#endif
- 
-         /*
-          * Get user pages.
-@@ -1162,7 +1206,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
-                 papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
-             }
- 
--            up_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+	    up_read(&pTask->mm->mmap_sem);
-+#else
-+	    up_read(&pTask->mm->mmap_lock);
-+#endif
- 
-             RTMemFree(papVMAs);
- 
-@@ -1189,7 +1237,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
- #endif
-         }
- 
--        up_read(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+	up_read(&pTask->mm->mmap_sem);
-+#else
-+	up_read(&pTask->mm->mmap_lock);
-+#endif
- 
-         RTMemFree(papVMAs);
-         rc = VERR_LOCK_FAILED;
-@@ -1604,7 +1656,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
-             const size_t    cPages    = (offSub + cbSub) >> PAGE_SHIFT;
-             size_t          iPage;
- 
--            down_write(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+	    down_write(&pTask->mm->mmap_sem);
-+#else
-+	    down_write(&pTask->mm->mmap_lock);
-+#endif
- 
-             rc = VINF_SUCCESS;
-             if (pMemLnxToMap->cPages)
-@@ -1721,7 +1777,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
-             }
- #endif /* CONFIG_NUMA_BALANCING */
- 
--            up_write(&pTask->mm->mmap_sem);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-+	    up_write(&pTask->mm->mmap_sem);
-+#else
-+	    up_write(&pTask->mm->mmap_lock);
-+#endif
- 
-             if (RT_SUCCESS(rc))
-             {
--- 
-2.18.2
-
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch deleted +0 -65

65 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch deleted +0 -39
deleted file mode 100644
index 6a3e63f63d..0000000000
@@ -1,39 +0,0 @@
-From 6089974a81b1b44e1d2dfa5af1fdc110dfee40c1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Tue, 18 Aug 2020 17:51:24 +0800
-Subject: [PATCH 3/3] fixes_for_changes_in_cpu_tlbstate
-
-Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-index c7d0d99a..2e7aa6e1 100644
---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -757,12 +757,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC);
- RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4);
-+#else
-+    RTCCUINTREG uOld = __read_cr4();
-+#endif
-     RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
-     if (uNew != uOld)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-         this_cpu_write(cpu_tlbstate.cr4, uNew);
-         __write_cr4(uNew);
-+#endif
-+        ASMSetCR4(uNew);
-     }
- #else
-     RTCCUINTREG uOld = ASMGetCR4();
--- 
-2.18.2
-
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch new file +5046 -0

2,720 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch deleted +0 -19
deleted file mode 100644
index cb4148fc79..0000000000

Lines of this file are not shown. View the raw message.

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb +1 -4
index e57df58d6c..6c036d403c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#4 lore raw

PATCH 4/15 vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase

In reply to Armin Kuster

From: Gianfranco Costamagna <[email protected]>

(cherry picked from commit 1cd14bf12472970d75df3172a2b9b0dff71da655)
[Stable branch]
---
 .../vboxguestdrivers/021-linux-5-8.patch      | 5046 -----------------
 ...s_6.1.12.bb => vboxguestdrivers_6.1.14.bb} |    5 +-
 2 files changed, 2 insertions(+), 5049 deletions(-)
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.12.bb => vboxguestdrivers_6.1.14.bb} (94%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch deleted +0 -5046
deleted file mode 100644
index 9d45750608..0000000000
@@ -1,5046 +0,0 @@
-fix Linux 5.8
-
-This is a squashed patch with following upstream revisions:
-
-  r85208
-  r85430
-  r85431
-  r85432
-  r85447 # context required adjustment
-  r85453
-  r85460
-  r85461 # context required adjustment
-  r85500
-  r85501
-  r85503
-  r85504
-  r85505
-  r85506
-  r85507 # context required adjustment
-  r85509
-  r85510
-  r85511
-  r85514
-  r85516
-  r85517
-  r85518
-  r85525
-  r85526
-  r85527
-  r85533
-  r85534
-  r85540
-  r85541
-  r85545
-  r85546
-  r85552
-  r85555
-  r85556
-  r85590
-
-Thanks a lot to loqs for his hard work on FS#67488!
-
---- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-@@ -31,6 +31,12 @@
- #define LOG_GROUP RTLOGGROUP_TIME
- #include "the-linux-kernel.h"
- #include "internal/iprt.h"
-+/* Make sure we have the setting functions we need for RTTimeNow: */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
-+# define RTTIME_INCL_TIMEVAL
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
-+# define RTTIME_INCL_TIMESPEC
-+#endif
- #include <iprt/time.h>
- #include <iprt/asm.h>
- 
-@@ -181,22 +187,19 @@ RT_EXPORT_SYMBOL(RTTimeSystemMilliTS);
- RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
- {
-     IPRT_LINUX_SAVE_EFL_AC();
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
--/* On Linux 4.20, time.h includes time64.h and we have to use 64-bit times. */
--# ifdef _LINUX_TIME64_H
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
-     struct timespec64 Ts;
--    ktime_get_real_ts64(&Ts);
--# else
--    struct timespec Ts;
--    ktime_get_real_ts(&Ts);
--# endif
-+    ktime_get_real_ts64(&Ts);   /* ktime_get_real_ts64 was added as a macro in 3.17, function since 4.18. */
-     IPRT_LINUX_RESTORE_EFL_AC();
--# ifdef _LINUX_TIME64_H
-     return RTTimeSpecSetTimespec64(pTime, &Ts);
--# else
-+
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
-+    struct timespec Ts;
-+    ktime_get_real_ts(&Ts);     /* ktime_get_real_ts was removed in Linux 4.20. */
-+    IPRT_LINUX_RESTORE_EFL_AC();
-     return RTTimeSpecSetTimespec(pTime, &Ts);
--# endif
--#else   /* < 2.6.16 */
-+
-+#else /* < 2.6.16 */
-     struct timeval Tv;
-     do_gettimeofday(&Tv);
-     IPRT_LINUX_RESTORE_EFL_AC();
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -52,6 +52,14 @@
- # define PAGE_READONLY_EXEC PAGE_READONLY
- #endif
- 
-+/** @def IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
-+ * Whether we use alloc_vm_area (3.2+) for executable memory.
-+ * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
-+ * better W^R compliance (fExecutable flag). */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || defined(DOXYGEN_RUNNING)
-+# define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
-+#endif
-+
- /*
-  * 2.6.29+ kernels don't work with remap_pfn_range() anymore because
-  * track_pfn_vma_new() is apparently not defined for non-RAM pages.
-@@ -72,12 +80,27 @@
- # define gfp_t  unsigned
- #endif
- 
-+/*
-+ * Wrappers around mmap_lock/mmap_sem difference.
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+# define LNX_MM_DOWN_READ(a_pMm)    down_read(&(a_pMm)->mmap_lock)
-+# define LNX_MM_UP_READ(a_pMm)        up_read(&(a_pMm)->mmap_lock)
-+# define LNX_MM_DOWN_WRITE(a_pMm)   down_write(&(a_pMm)->mmap_lock)
-+# define LNX_MM_UP_WRITE(a_pMm)       up_write(&(a_pMm)->mmap_lock)
-+#else
-+# define LNX_MM_DOWN_READ(a_pMm)    down_read(&(a_pMm)->mmap_sem)
-+# define LNX_MM_UP_READ(a_pMm)        up_read(&(a_pMm)->mmap_sem)
-+# define LNX_MM_DOWN_WRITE(a_pMm)   down_write(&(a_pMm)->mmap_sem)
-+# define LNX_MM_UP_WRITE(a_pMm)       up_write(&(a_pMm)->mmap_sem)
-+#endif
-+
- 
- /*********************************************************************************************************************************
- *   Structures and Typedefs                                                                                                      *
- *********************************************************************************************************************************/
- /**
-- * The Darwin version of the memory object structure.
-+ * The Linux version of the memory object structure.
-  */
- typedef struct RTR0MEMOBJLNX
- {
-@@ -90,11 +113,20 @@ typedef struct RTR0MEMOBJLNX
-     bool                fExecutable;
-     /** Set if we've vmap'ed the memory into ring-0. */
-     bool                fMappedToRing0;
-+#ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
-+    /** Return from alloc_vm_area() that we now need to use for executable
-+     *  memory. */
-+    struct vm_struct   *pArea;
-+    /** PTE array that goes along with pArea (must be freed). */
-+    pte_t             **papPtesForArea;
-+#endif
-     /** The pages in the apPages array. */
-     size_t              cPages;
-     /** Array of struct page pointers. (variable size) */
-     struct page        *apPages[1];
--} RTR0MEMOBJLNX, *PRTR0MEMOBJLNX;
-+} RTR0MEMOBJLNX;
-+/** Pointer to the linux memory object. */
-+typedef RTR0MEMOBJLNX *PRTR0MEMOBJLNX;
- 
- 
- static void rtR0MemObjLinuxFreePages(PRTR0MEMOBJLNX pMemLnx);
-@@ -182,7 +214,7 @@ static pgprot_t rtR0MemObjLinuxConvertPr
-  * Worker for rtR0MemObjNativeReserveUser and rtR0MemObjNativerMapUser that creates
-  * an empty user space mapping.
-  *
-- * We acquire the mmap_sem of the task!
-+ * We acquire the mmap_sem/mmap_lock of the task!
-  *
-  * @returns Pointer to the mapping.
-  *          (void *)-1 on failure.
-@@ -222,9 +254,9 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-         ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
- #else
--        down_write(&pTask->mm->mmap_sem);
-+        LNX_MM_DOWN_WRITE(pTask->mm);
-         ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
--        up_write(&pTask->mm->mmap_sem);
-+        LNX_MM_UP_WRITE(pTask->mm);
- #endif
-     }
-     else
-@@ -232,9 +264,9 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-         ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
- #else
--        down_write(&pTask->mm->mmap_sem);
-+        LNX_MM_DOWN_WRITE(pTask->mm);
-         ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
--        up_write(&pTask->mm->mmap_sem);
-+        LNX_MM_UP_WRITE(pTask->mm);
- #endif
-         if (    !(ulAddr & ~PAGE_MASK)
-             &&  (ulAddr & (uAlignment - 1)))
-@@ -257,7 +289,7 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P
-  * Worker that destroys a user space mapping.
-  * Undoes what rtR0MemObjLinuxDoMmap did.
-  *
-- * We acquire the mmap_sem of the task!
-+ * We acquire the mmap_sem/mmap_lock of the task!
-  *
-  * @param   pv          The ring-3 mapping.
-  * @param   cb          The size of the mapping.
-@@ -269,13 +301,13 @@ static void rtR0MemObjLinuxDoMunmap(void
-     Assert(pTask == current); RT_NOREF_PV(pTask);
-     vm_munmap((unsigned long)pv, cb);
- #elif defined(USE_RHEL4_MUNMAP)
--    down_write(&pTask->mm->mmap_sem);
-+    LNX_MM_DOWN_WRITE(pTask->mm);
-     do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */
--    up_write(&pTask->mm->mmap_sem);
-+    LNX_MM_UP_WRITE(pTask->mm);
- #else
--    down_write(&pTask->mm->mmap_sem);
-+    LNX_MM_DOWN_WRITE(pTask->mm);
-     do_munmap(pTask->mm, (unsigned long)pv, cb);
--    up_write(&pTask->mm->mmap_sem);
-+    LNX_MM_UP_WRITE(pTask->mm);
- #endif
- }
- 
-@@ -520,15 +552,49 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO
-             pgprot_val(fPg) |= _PAGE_NX;
- # endif
- 
-+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
-+        if (fExecutable)
-+        {
-+            pte_t **papPtes = (pte_t **)kmalloc_array(pMemLnx->cPages, sizeof(papPtes[0]), GFP_KERNEL);
-+            if (papPtes)
-+            {
-+                pMemLnx->pArea = alloc_vm_area(pMemLnx->Core.cb, papPtes); /* Note! pArea->nr_pages is not set. */
-+                if (pMemLnx->pArea)
-+                {
-+                    size_t i;
-+                    Assert(pMemLnx->pArea->size >= pMemLnx->Core.cb);   /* Note! includes guard page. */
-+                    Assert(pMemLnx->pArea->addr);
-+#  ifdef _PAGE_NX
-+                    pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */
-+#  endif
-+                    pMemLnx->papPtesForArea = papPtes;
-+                    for (i = 0; i < pMemLnx->cPages; i++)
-+                        *papPtes[i] = mk_pte(pMemLnx->apPages[i], fPg);
-+                    pMemLnx->Core.pv = pMemLnx->pArea->addr;
-+                    pMemLnx->fMappedToRing0 = true;
-+                }
-+                else
-+                {
-+                    kfree(papPtes);
-+                    rc = VERR_MAP_FAILED;
-+                }
-+            }
-+            else
-+                rc = VERR_MAP_FAILED;
-+        }
-+        else
-+# endif
-+        {
- # ifdef VM_MAP
--        pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
-+            pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
- # else
--        pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_ALLOC, fPg);
-+            pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_ALLOC, fPg);
- # endif
--        if (pMemLnx->Core.pv)
--            pMemLnx->fMappedToRing0 = true;
--        else
--            rc = VERR_MAP_FAILED;
-+            if (pMemLnx->Core.pv)
-+                pMemLnx->fMappedToRing0 = true;
-+            else
-+                rc = VERR_MAP_FAILED;
-+        }
- #else   /* < 2.4.22 */
-         rc = VERR_NOT_SUPPORTED;
- #endif
-@@ -554,6 +620,22 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO
- static void rtR0MemObjLinuxVUnmap(PRTR0MEMOBJLNX pMemLnx)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22)
-+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
-+    if (pMemLnx->pArea)
-+    {
-+#  if 0
-+        pte_t **papPtes = pMemLnx->papPtesForArea;
-+        size_t  i;
-+        for (i = 0; i < pMemLnx->cPages; i++)
-+            *papPtes[i] = 0;
-+#  endif
-+        free_vm_area(pMemLnx->pArea);
-+        kfree(pMemLnx->papPtesForArea);
-+        pMemLnx->pArea = NULL;
-+        pMemLnx->papPtesForArea = NULL;
-+    }
-+    else
-+# endif
-     if (pMemLnx->fMappedToRing0)
-     {
-         Assert(pMemLnx->Core.pv);
-@@ -593,7 +675,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
-                 size_t              iPage;
-                 Assert(pTask);
-                 if (pTask && pTask->mm)
--                    down_read(&pTask->mm->mmap_sem);
-+                    LNX_MM_DOWN_READ(pTask->mm);
- 
-                 iPage = pMemLnx->cPages;
-                 while (iPage-- > 0)
-@@ -608,7 +690,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
-                 }
- 
-                 if (pTask && pTask->mm)
--                    up_read(&pTask->mm->mmap_sem);
-+                    LNX_MM_UP_READ(pTask->mm);
-             }
-             /* else: kernel memory - nothing to do here. */
-             break;
-@@ -1076,7 +1158,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
-     papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
-     if (papVMAs)
-     {
--        down_read(&pTask->mm->mmap_sem);
-+        LNX_MM_DOWN_READ(pTask->mm);
- 
-         /*
-          * Get user pages.
-@@ -1162,7 +1244,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
-                 papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
-             }
- 
--            up_read(&pTask->mm->mmap_sem);
-+            LNX_MM_UP_READ(pTask->mm);
- 
-             RTMemFree(papVMAs);
- 
-@@ -1189,7 +1271,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
- #endif
-         }
- 
--        up_read(&pTask->mm->mmap_sem);
-+        LNX_MM_UP_READ(pTask->mm);
- 
-         RTMemFree(papVMAs);
-         rc = VERR_LOCK_FAILED;
-@@ -1422,6 +1504,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKerne
-              * Use vmap - 2.4.22 and later.
-              */
-             pgprot_t fPg = rtR0MemObjLinuxConvertProt(fProt, true /* kernel */);
-+            /** @todo We don't really care too much for EXEC here... 5.8 always adds NX. */
-             Assert(((offSub + cbSub) >> PAGE_SHIFT) <= pMemLnxToMap->cPages);
- # ifdef VM_MAP
-             pMemLnx->Core.pv = vmap(&pMemLnxToMap->apPages[offSub >> PAGE_SHIFT], cbSub >> PAGE_SHIFT, VM_MAP, fPg);
-@@ -1604,7 +1687,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
-             const size_t    cPages    = (offSub + cbSub) >> PAGE_SHIFT;
-             size_t          iPage;
- 
--            down_write(&pTask->mm->mmap_sem);
-+            LNX_MM_DOWN_WRITE(pTask->mm);
- 
-             rc = VINF_SUCCESS;
-             if (pMemLnxToMap->cPages)
-@@ -1721,7 +1804,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
-             }
- #endif /* CONFIG_NUMA_BALANCING */
- 
--            up_write(&pTask->mm->mmap_sem);
-+            LNX_MM_UP_WRITE(pTask->mm);
- 
-             if (RT_SUCCESS(rc))
-             {
-@@ -1753,6 +1836,29 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(
- 
- DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINTERNAL pMem, size_t offSub, size_t cbSub, uint32_t fProt)
- {
-+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
-+    /*
-+     * Currently only supported when we've got addresses PTEs from the kernel.
-+     */
-+    PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
-+    if (pMemLnx->pArea && pMemLnx->papPtesForArea)
-+    {
-+        pgprot_t const  fPg     = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
-+        size_t const    cPages  = (offSub + cbSub) >> PAGE_SHIFT;
-+        pte_t         **papPtes = pMemLnx->papPtesForArea;
-+        size_t          i;
-+
-+        for (i = offSub >> PAGE_SHIFT; i < cPages; i++)
-+        {
-+            set_pte(papPtes[i], mk_pte(pMemLnx->apPages[i], fPg));
-+        }
-+        preempt_disable();
-+        __flush_tlb_all();
-+        preempt_enable();
-+        return VINF_SUCCESS;
-+    }
-+# endif
-+
-     NOREF(pMem);
-     NOREF(offSub);
-     NOREF(cbSub);
---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -144,9 +144,9 @@ static int force_async_tsc = 0;
-  * Memory for the executable memory heap (in IPRT).
-  */
- # ifdef DEBUG
--#  define EXEC_MEMORY_SIZE   8388608    /* 8 MB */
-+#  define EXEC_MEMORY_SIZE   10485760   /* 10 MB */
- # else
--#  define EXEC_MEMORY_SIZE   2097152    /* 2 MB */
-+#  define EXEC_MEMORY_SIZE   8388608    /* 8 MB */
- # endif
- extern uint8_t g_abExecMemory[EXEC_MEMORY_SIZE];
- # ifndef VBOX_WITH_TEXT_MODMEM_HACK
-@@ -756,20 +756,25 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC);
- 
- RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
--    RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4);
--    RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+    RTCCUINTREG const uOld = __read_cr4();
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+    RTCCUINTREG const uOld = this_cpu_read(cpu_tlbstate.cr4);
-+#else
-+    RTCCUINTREG const uOld = ASMGetCR4();
-+#endif
-+    RTCCUINTREG const uNew = (uOld & fAndMask) | fOrMask;
-     if (uNew != uOld)
-     {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+        ASMSetCR4(uNew);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-         this_cpu_write(cpu_tlbstate.cr4, uNew);
-         __write_cr4(uNew);
--    }
- #else
--    RTCCUINTREG uOld = ASMGetCR4();
--    RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
--    if (uNew != uOld)
-         ASMSetCR4(uNew);
- #endif
-+    }
-     return uOld;
- }
- 
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-@@ -52,7 +52,7 @@
- #endif
- #include <linux/seq_file.h>
- #include <linux/vfs.h>
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
- # include <linux/vermagic.h>
- #endif
- #include <VBox/err.h>
---- a/Config.kmk
-+++ b/Config.kmk
-@@ -4462,15 +4462,20 @@ endif # pe
- 
- ifeq ($(VBOX_LDR_FMT),elf)
- TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
--TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
--TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
--TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
--TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
-+TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
-+	$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
-+	$(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
-+TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
-+	$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
-+	$(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
-+	-fno-rtti $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK)
-++TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
-++TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
- TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -ffreestanding
-  if $(VBOX_GCC_VERSION_CC) < 30400
-   TEMPLATE_VBoxR0_DEFS             += RT_WITHOUT_PRAGMA_ONCE
-  endif
--ifeq ($(KBUILD_TARGET),solaris)
-+ ifeq ($(KBUILD_TARGET),solaris)
-  TEMPLATE_VBoxR0_LDFLAGS            = -r
-  TEMPLATE_VBoxR0_LDFLAGS.solaris    = -u _init -u _info
-  TEMPLATE_VBoxR0_LIBS.solaris       = \
-@@ -4481,19 +4486,32 @@ ifeq ($(KBUILD_TARGET),solaris)
-  endif
-  # Solaris driver signing.
-  TEMPLATE_VBoxR0_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
--else
-+ else
-  TEMPLATE_VBoxR0_LDFLAGS            = -nostdlib -Bsymbolic -g
-  ## @todo WTF doesn't the globals work? Debug info is supposed to be split everywhere. GRR
-  TEMPLATE_VBoxR0_LD_DEBUG           = split
--endif
--ifn1of ($(KBUILD_TARGET),solaris freebsd)
-+ endif
-+ if1of ($(KBUILD_TARGET), linux)
-+VBOX_WITH_VBOXR0_AS_DLL = 1
-+TEMPLATE_VBoxR0_DLLSUFF             = .r0
-+TEMPLATE_VBoxR0_CFLAGS             += -fPIC
-+TEMPLATE_VBoxR0_CXXFLAGS           += -fPIC
-+TEMPLATE_VBoxR0_LDFLAGS            +=
-+TEMPLATE_VBoxR0_DTRACE_HDR_FLAGS   += --pic
-+TEMPLATE_VBoxR0_DTRACE_OBJ_FLAGS   += --pic
-+ else
-+TEMPLATE_VBoxR0_CFLAGS.amd64       += -mcmodel=kernel
-+TEMPLATE_VBoxR0_CXXFLAGS.amd64     += -mcmodel=kernel
-+ endif
-+ ifn1of ($(KBUILD_TARGET),solaris freebsd)
-  TEMPLATE_VBoxR0_LIBS               = \
- 	$(VBOX_GCC_LIBGCC) # intrinsics
--endif
--if1of ($(KBUILD_TARGET),linux)
-- TEMPLATE_VBoxR0_POST_CMDS          =  $(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi)
--endif
--endif
-+ endif
-+ if1of ($(KBUILD_TARGET),linux)
-+ TEMPLATE_VBoxR0_POST_CMDS         += $(NLTAB)\
-+ 	$(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi)
-+ endif
-+endif # elf
- 
- ifeq ($(VBOX_LDR_FMT),macho)
- TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
---- a/tools/bin/gen-slickedit-workspace.sh
-+++ b/tools/bin/gen-slickedit-workspace.sh
-@@ -496,11 +496,13 @@ my_generate_usercpp_h()
-     #
-     # Probe the slickedit user config, picking the most recent version.
-     #
-+    MY_VSLICK_DB_OLD=
-     if test -z "${MY_SLICK_CONFIG}"; then
-         if test -d "${HOME}/Library/Application Support/SlickEdit"; then
-             MY_SLICKDIR_="${HOME}/Library/Application Support/SlickEdit"
-             MY_USERCPP_H="unxcpp.h"
-             MY_VSLICK_DB="vslick.sta" # was .stu earlier, 24 is using .sta.
-+            MY_VSLICK_DB_OLD="vslick.stu"
-         elif test -d "${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"; then
-             MY_SLICKDIR_="${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"
-             MY_USERCPP_H="usercpp.h"
-@@ -508,7 +510,8 @@ my_generate_usercpp_h()
-         else
-             MY_SLICKDIR_="${HOME}/.slickedit"
-             MY_USERCPP_H="unxcpp.h"
--            MY_VSLICK_DB="vslick.stu"
-+            MY_VSLICK_DB="vslick.sta"
-+            MY_VSLICK_DB_OLD="vslick.stu"
-         fi
-     else
-         MY_SLICKDIR_="${MY_SLICK_CONFIG}"
-@@ -517,7 +520,8 @@ my_generate_usercpp_h()
-             MY_VSLICK_DB="vslick.sta"
-         else
-             MY_USERCPP_H="unxcpp.h"
--            MY_VSLICK_DB="vslick.stu"
-+            MY_VSLICK_DB="vslick.sta"
-+            MY_VSLICK_DB_OLD="vslick.stu"
-         fi
-         # MacOS: Implement me!
-     fi
-@@ -526,7 +530,9 @@ my_generate_usercpp_h()
-     MY_VER="0.0.0"
-     for subdir in "${MY_SLICKDIR_}/"*;
-     do
--        if test -f "${subdir}/${MY_USERCPP_H}"  -o  -f "${subdir}/${MY_VSLICK_DB}"; then
-+        if test    -f "${subdir}/${MY_USERCPP_H}"  \
-+                -o -f "${subdir}/${MY_VSLICK_DB}" \
-+                -o '(' -n "${MY_VSLICK_DB_OLD}" -a -f "${subdir}/${MY_VSLICK_DB_OLD}" ')'; then
-             MY_CUR_VER_NUM=0
-             MY_CUR_VER=`echo "${subdir}" | ${MY_SED} -e 's,^.*/,,g'`
- 
-@@ -561,6 +567,7 @@ my_generate_usercpp_h()
-         echo "Found SlickEdit v${MY_VER} preprocessor file: ${MY_USERCPP_H_FULL}"
-     else
-         echo "Failed to locate SlickEdit preprocessor file. You need to manually merge ${MY_USERCPP_H}."
-+        echo "dbg: MY_SLICKDIR=${MY_SLICKDIR}  MY_USERCPP_H_FULL=${MY_USERCPP_H_FULL}"
-         MY_USERCPP_H_FULL=""
-     fi
- 
-@@ -717,6 +724,10 @@ EOF
- #define RTASN1TYPE_STANDARD_PROTOTYPES_NO_GET_CORE(a_TypeNm, a_DeclMacro, a_ImplExtNm) int  a_ImplExtNm##_Init(P##a_TypeNm pThis, PCRTASN1ALLOCATORVTABLE pAllocator); int  a_ImplExtNm##_Clone(P##a_TypeNm pThis, PC##a_TypeNm) pSrc, PCRTASN1ALLOCATORVTABLE pAllocator); void a_ImplExtNm##_Delete(P##a_TypeNm pThis); int  a_ImplExtNm##_Enum(P##a_TypeNm pThis, PFNRTASN1ENUMCALLBACK pfnCallback, uint32_t uDepth, void *pvUser); int  a_ImplExtNm##_Compare(PC##a_TypeNm) pLeft, PC##a_TypeNm pRight); int  a_ImplExtNm##_DecodeAsn1(PRTASN1CURSOR pCursor, uint32_t fFlags, P##a_TypeNm pThis, const char *pszErrorTag); int  a_ImplExtNm##_CheckSanity(PC##a_TypeNm pThis, uint32_t fFlags, PRTERRINFO pErrInfo, const char *pszErrorTag)
- #define RTASN1TYPE_STANDARD_PROTOTYPES(a_TypeNm, a_DeclMacro, a_ImplExtNm, a_Asn1CoreNm) inline PRTASN1CORE a_ImplExtNm##_GetAsn1Core(PC##a_TypeNm pThis) { return (PRTASN1CORE)&pThis->a_Asn1CoreNm; } inline bool a_ImplExtNm##_IsPresent(PC##a_TypeNm pThis) { return pThis && RTASN1CORE_IS_PRESENT(&pThis->a_Asn1CoreNm); } RTASN1TYPE_STANDARD_PROTOTYPES_NO_GET_CORE(a_TypeNm, a_DeclMacro, a_ImplExtNm)
- 
-+#define RTLDRELF_NAME(name)             rtldrELF64##name
-+#define RTLDRELF_SUFF(name)             name##64
-+#define RTLDRELF_MID(pre,suff)          pre##64##suff
-+
- #define BS3_DECL(type)                  type
- #define BS3_DECL_CALLBACK(type)         type
- #define TMPL_NM(name)                   name##_mmm
---- a/include/iprt/asmdefs.mac
-+++ b/include/iprt/asmdefs.mac
-@@ -841,18 +841,18 @@ size NAME(%1 %+ _EndProc)   0
- ; is defined and RT_WITHOUT_NOCRT_WRAPPERS isn't.
- ;
- %macro RT_NOCRT_BEGINPROC 1
--%ifdef RT_WITH_NOCRT_ALIASES
--BEGINPROC RT_NOCRT(%1)
--%ifdef ASM_FORMAT_ELF
-+ %ifdef RT_WITH_NOCRT_ALIASES
-+BEGINPROC_EXPORTED RT_NOCRT(%1)
-+  %ifdef ASM_FORMAT_ELF
- global NAME(%1)
- weak NAME(%1)
- NAME(%1):
--%else
-+  %else
- GLOBALNAME %1
--%endif
--%else  ; !RT_WITH_NOCRT_ALIASES
--BEGINPROC RT_NOCRT(%1)
--%endif ; !RT_WITH_NOCRT_ALIASES
-+  %endif
-+ %else  ; !RT_WITH_NOCRT_ALIASES
-+BEGINPROC_EXPORTED RT_NOCRT(%1)
-+ %endif ; !RT_WITH_NOCRT_ALIASES
- %endmacro ; RT_NOCRT_BEGINPROC
- 
- %ifdef RT_WITH_NOCRT_ALIASES
---- a/src/VBox/Runtime/testcase/tstLdr-4.cpp
-+++ b/src/VBox/Runtime/testcase/tstLdr-4.cpp
-@@ -35,9 +35,9 @@
- #include <iprt/assert.h>
- #include <iprt/param.h>
- #include <iprt/path.h>
--#include <iprt/initterm.h>
- #include <iprt/err.h>
- #include <iprt/string.h>
-+#include <iprt/test.h>
- 
- #include <VBox/sup.h>
- 
-@@ -45,8 +45,9 @@
- /*********************************************************************************************************************************
- *   Global Variables                                                                                                             *
- *********************************************************************************************************************************/
--static SUPGLOBALINFOPAGE g_MyGip = { SUPGLOBALINFOPAGE_MAGIC, SUPGLOBALINFOPAGE_VERSION, SUPGIPMODE_INVARIANT_TSC, 42 };
--static PSUPGLOBALINFOPAGE g_pMyGip = &g_MyGip;
-+static RTTEST               g_hTest;
-+static SUPGLOBALINFOPAGE    g_MyGip = { SUPGLOBALINFOPAGE_MAGIC, SUPGLOBALINFOPAGE_VERSION, SUPGIPMODE_INVARIANT_TSC, 42 };
-+static PSUPGLOBALINFOPAGE   g_pMyGip = &g_MyGip;
- 
- extern "C" DECLEXPORT(int) DisasmTest1(void);
- 
-@@ -58,6 +59,60 @@ static DECLCALLBACK(int) testEnumSegment
-              "     link=%RTptr LB %RTptr align=%RTptr fProt=%#x offFile=%RTfoff\n"
-              , *piSeg, pSeg->RVA, pSeg->cbMapped, pSeg->pszName,
-              pSeg->LinkAddress, pSeg->cb, pSeg->Alignment, pSeg->fProt, pSeg->offFile);
-+
-+    if (pSeg->RVA != NIL_RTLDRADDR)
-+    {
-+        RTTESTI_CHECK(pSeg->cbMapped != NIL_RTLDRADDR);
-+        RTTESTI_CHECK(pSeg->cbMapped >= pSeg->cb);
-+    }
-+    else
-+    {
-+        RTTESTI_CHECK(pSeg->cbMapped == NIL_RTLDRADDR);
-+    }
-+
-+    /*
-+     * Do some address conversion tests:
-+     */
-+    if (pSeg->cbMapped != NIL_RTLDRADDR)
-+    {
-+        /* RTLdrRvaToSegOffset: */
-+        uint32_t    iSegConv   = ~(uint32_t)42;
-+        RTLDRADDR   offSegConv = ~(RTLDRADDR)22;
-+        int rc = RTLdrRvaToSegOffset(hLdrMod, pSeg->RVA, &iSegConv, &offSegConv);
-+        if (RT_FAILURE(rc))
-+            RTTestIFailed("RTLdrRvaToSegOffset failed on Seg #%u / RVA %#RTptr: %Rrc", *piSeg, pSeg->RVA, rc);
-+        else if (iSegConv != *piSeg || offSegConv != 0)
-+                RTTestIFailed("RTLdrRvaToSegOffset on Seg #%u / RVA %#RTptr returned: iSegConv=%#x offSegConv=%RTptr, expected %#x and 0",
-+                              *piSeg, pSeg->RVA, iSegConv, offSegConv, *piSeg);
-+
-+        /* RTLdrSegOffsetToRva: */
-+        RTLDRADDR uRvaConv = ~(RTLDRADDR)22;
-+        rc = RTLdrSegOffsetToRva(hLdrMod, *piSeg, 0, &uRvaConv);
-+        if (RT_FAILURE(rc))
-+            RTTestIFailed("RTLdrSegOffsetToRva failed on Seg #%u / off 0: %Rrc", *piSeg, rc);
-+        else if (uRvaConv != pSeg->RVA)
-+            RTTestIFailed("RTLdrSegOffsetToRva on Seg #%u / off 0 returned: %RTptr, expected %RTptr", *piSeg, uRvaConv, pSeg->RVA);
-+
-+        /* RTLdrLinkAddressToRva: */
-+        uRvaConv = ~(RTLDRADDR)22;
-+        rc = RTLdrLinkAddressToRva(hLdrMod, pSeg->LinkAddress, &uRvaConv);
-+        if (RT_FAILURE(rc))
-+            RTTestIFailed("RTLdrLinkAddressToRva failed on Seg #%u / %RTptr: %Rrc", *piSeg, pSeg->LinkAddress, rc);
-+        else if (uRvaConv != pSeg->RVA)
-+            RTTestIFailed("RTLdrLinkAddressToRva on Seg #%u / %RTptr returned: %RTptr, expected %RTptr",
-+                          *piSeg, pSeg->LinkAddress, uRvaConv, pSeg->RVA);
-+
-+        /* RTLdrLinkAddressToSegOffset: */
-+        iSegConv   = ~(uint32_t)42;
-+        offSegConv = ~(RTLDRADDR)22;
-+        rc = RTLdrLinkAddressToSegOffset(hLdrMod, pSeg->LinkAddress, &iSegConv, &offSegConv);
-+        if (RT_FAILURE(rc))
-+            RTTestIFailed("RTLdrLinkAddressToSegOffset failed on Seg #%u / %#RTptr: %Rrc", *piSeg, pSeg->LinkAddress, rc);
-+        else if (iSegConv != *piSeg || offSegConv != 0)
-+                RTTestIFailed("RTLdrLinkAddressToSegOffset on Seg #%u / %#RTptr returned: iSegConv=%#x offSegConv=%RTptr, expected %#x and 0",
-+                              *piSeg, pSeg->LinkAddress, iSegConv, offSegConv, *piSeg);
-+    }
-+
-     *piSeg += 1;
-     RT_NOREF(hLdrMod);
-     return VINF_SUCCESS;
-@@ -125,12 +180,12 @@ static DECLCALLBACK(int) testGetImport(R
-  * regions the for compare usage. The third is loaded into one
-  * and then relocated between the two and other locations a few times.
-  *
-- * @returns number of errors.
-  * @param   pszFilename     The file to load the mess with.
-  */
--static int testLdrOne(const char *pszFilename)
-+static void testLdrOne(const char *pszFilename)
- {
--    int             cErrors = 0;
-+    RTTestSub(g_hTest, RTPathFilename(pszFilename));
-+
-     size_t          cbImage = 0;
-     struct Load
-     {
-@@ -155,9 +210,8 @@ static int testLdrOne(const char *pszFil
-         rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
-         if (RT_FAILURE(rc))
-         {
--            RTPrintf("tstLdr-4: Failed to open '%s'/%d, rc=%Rrc. aborting test.\n", pszFilename, i, rc);
-+            RTTestIFailed("tstLdr-4: Failed to open '%s'/%d, rc=%Rrc. aborting test.", pszFilename, i, rc);
-             Assert(aLoads[i].hLdrMod == NIL_RTLDRMOD);
--            cErrors++;
-             break;
-         }
- 
-@@ -165,8 +219,7 @@ static int testLdrOne(const char *pszFil
-         size_t cb = RTLdrSize(aLoads[i].hLdrMod);
-         if (cbImage && cb != cbImage)
-         {
--            RTPrintf("tstLdr-4: Size mismatch '%s'/%d. aborting test.\n", pszFilename, i);
--            cErrors++;
-+            RTTestIFailed("tstLdr-4: Size mismatch '%s'/%d. aborting test.", pszFilename, i);
-             break;
-         }
-         aLoads[i].cbBits = cbImage = cb;
-@@ -175,8 +228,7 @@ static int testLdrOne(const char *pszFil
-         aLoads[i].pvBits = RTMemExecAlloc(cb);
-         if (!aLoads[i].pvBits)
-         {
--            RTPrintf("tstLdr-4: Out of memory '%s'/%d cbImage=%d. aborting test.\n", pszFilename, i, cbImage);
--            cErrors++;
-+            RTTestIFailed("Out of memory '%s'/%d cbImage=%d. aborting test.", pszFilename, i, cbImage);
-             break;
-         }
- 
-@@ -184,8 +236,7 @@ static int testLdrOne(const char *pszFil
-         rc = RTLdrGetBits(aLoads[i].hLdrMod, aLoads[i].pvBits, (uintptr_t)aLoads[i].pvBits, testGetImport, NULL);
-         if (RT_FAILURE(rc))
-         {
--            RTPrintf("tstLdr-4: Failed to get bits for '%s'/%d, rc=%Rrc. aborting test\n", pszFilename, i, rc);
--            cErrors++;
-+            RTTestIFailed("Failed to get bits for '%s'/%d, rc=%Rrc. aborting test", pszFilename, i, rc);
-             break;
-         }
-     }
-@@ -193,7 +244,7 @@ static int testLdrOne(const char *pszFil
-     /*
-      * Execute the code.
-      */
--    if (!cErrors)
-+    if (!RTTestSubErrorCount(g_hTest))
-     {
-         for (i = 0; i < RT_ELEMENTS(aLoads); i += 1)
-         {
-@@ -209,22 +260,18 @@ static int testLdrOne(const char *pszFil
-                                       UINT32_MAX, "_DisasmTest1", &Value);
-             if (RT_FAILURE(rc))
-             {
--                RTPrintf("tstLdr-4: Failed to get symbol \"DisasmTest1\" from load #%d: %Rrc\n", i, rc);
--                cErrors++;
-+                RTTestIFailed("Failed to get symbol \"DisasmTest1\" from load #%d: %Rrc", i, rc);
-                 break;
-             }
-             DECLCALLBACKPTR(int, pfnDisasmTest1)(void) = (DECLCALLBACKPTR(int, RT_NOTHING)(void))(uintptr_t)Value; /* eeeh. */
--            RTPrintf("tstLdr-4: pfnDisasmTest1=%p / add-symbol-file %s %#x\n", pfnDisasmTest1, pszFilename, aLoads[i].pvBits);
-+            RTPrintf("tstLdr-4: pfnDisasmTest1=%p / add-symbol-file %s %#p\n", pfnDisasmTest1, pszFilename, aLoads[i].pvBits);
-             uint32_t iSeg = 0;
-             RTLdrEnumSegments(aLoads[i].hLdrMod, testEnumSegment, &iSeg);
- 
-             /* call the test function. */
-             rc = pfnDisasmTest1();
-             if (rc)
--            {
--                RTPrintf("tstLdr-4: load #%d Test1 -> %#x\n", i, rc);
--                cErrors++;
--            }
-+                RTTestIFailed("load #%d Test1 -> %#x", i, rc);
- 
-             /* While we're here, check a couple of RTLdrQueryProp calls too */
-             void *pvBits = aLoads[i].pvBits;
-@@ -255,56 +302,42 @@ static int testLdrOne(const char *pszFil
-         {
-             rc = RTLdrClose(aLoads[i].hLdrMod);
-             if (RT_FAILURE(rc))
--            {
--                RTPrintf("tstLdr-4: Failed to close '%s' i=%d, rc=%Rrc.\n", pszFilename, i, rc);
--                cErrors++;
--            }
-+                RTTestIFailed("Failed to close '%s' i=%d, rc=%Rrc.", pszFilename, i, rc);
-         }
-     }
- 
--    return cErrors;
- }
- 
- 
- 
--int main(int argc, char **argv)
-+int main()
- {
--    int cErrors = 0;
--    RTR3InitExe(argc, &argv, 0);
-+    RTEXITCODE rcExit = RTTestInitAndCreate("tstLdr-4", &g_hTest);
-+    if (rcExit != RTEXITCODE_SUCCESS)
-+        return rcExit;
- 
-     /*
-      * Sanity check.
-      */
-     int rc = DisasmTest1();
--    if (rc)
-+    if (rc == 0)
-     {
--        RTPrintf("tstLdr-4: FATAL ERROR - DisasmTest1 is buggy: rc=%#x\n", rc);
--        return 1;
--    }
-+        /*
-+         * Execute the test.
-+         */
-+        char szPath[RTPATH_MAX];
-+        rc = RTPathExecDir(szPath, sizeof(szPath) - sizeof("/tstLdrObjR0.r0"));
-+        if (RT_SUCCESS(rc))
-+        {
-+            strcat(szPath, "/tstLdrObjR0.r0");
- 
--    /*
--     * Execute the test.
--     */
--    char szPath[RTPATH_MAX];
--    rc = RTPathExecDir(szPath, sizeof(szPath) - sizeof("/tstLdrObjR0.r0"));
--    if (RT_SUCCESS(rc))
--    {
--        strcat(szPath, "/tstLdrObjR0.r0");
--        RTPrintf("tstLdr-4: TESTING '%s'...\n", szPath);
--        cErrors += testLdrOne(szPath);
-+            testLdrOne(szPath);
-+        }
-+        else
-+            RTTestIFailed("RTPathExecDir -> %Rrc", rc);
-     }
-     else
--    {
--        RTPrintf("tstLdr-4: RTPathExecDir -> %Rrc\n", rc);
--        cErrors++;
--    }
-+        RTTestIFailed("FATAL ERROR - DisasmTest1 is buggy: rc=%#x", rc);
- 
--    /*
--     * Test result summary.
--     */
--    if (!cErrors)
--        RTPrintf("tstLdr-4: SUCCESS\n");
--    else
--        RTPrintf("tstLdr-4: FAILURE - %d errors\n", cErrors);
--    return !!cErrors;
-+    return RTTestSummaryAndDestroy(g_hTest);
- }
---- a/include/iprt/formats/elf-common.h
-+++ b/include/iprt/formats/elf-common.h
-@@ -198,6 +198,12 @@ typedef struct {
- #define PT_LOPROC       0x70000000      /* First processor-specific type. */
- #define PT_HIPROC       0x7fffffff      /* Last processor-specific type. */
- 
-+#define PT_GNU_EH_FRAME 0x6474e550 /**< GNU/Linux -> .eh_frame_hdr */
-+#define PT_GNU_STACK    0x6474e551 /**< GNU/Linux -> stack prot (RWX or RW) */
-+#define PT_GNU_RELRO    0x6474e552 /**< GNU/Linux -> make RO after relocations */
-+#define PT_GNU_PROPERTY 0x6474e553 /**< GNU/Linux -> .note.gnu.property */
-+
-+
- /* Values for p_flags. */
- #define PF_X            0x1     /* Executable. */
- #define PF_W            0x2     /* Writable. */
---- a/src/VBox/Runtime/common/ldr/ldrELF.cpp
-+++ b/src/VBox/Runtime/common/ldr/ldrELF.cpp
-@@ -51,9 +51,11 @@
- *   Defined Constants And Macros                                                                                                 *
- *********************************************************************************************************************************/
- /** Finds an ELF symbol table string. */
--#define ELF_STR(pHdrs, iStr) ((pHdrs)->pStr + (iStr))
-+#define ELF_STR(pHdrs, iStr)        ((pHdrs)->Rel.pStr + (iStr))
-+/** Finds an ELF symbol table string. */
-+#define ELF_DYN_STR(pHdrs, iStr)    ((pHdrs)->Dyn.pStr + (iStr))
- /** Finds an ELF section header string. */
--#define ELF_SH_STR(pHdrs, iStr) ((pHdrs)->pShStr + (iStr))
-+#define ELF_SH_STR(pHdrs, iStr)     ((pHdrs)->pShStr + (iStr))
- 
- 
- 
-@@ -62,6 +64,7 @@
- *********************************************************************************************************************************/
- #ifdef LOG_ENABLED
- static const char *rtldrElfGetShdrType(uint32_t iType);
-+static const char *rtldrElfGetPhdrType(uint32_t iType);
- #endif
- 
- 
-@@ -81,6 +84,7 @@ static const char *rtldrElfGetShdrType(u
- 
- 
- #ifdef LOG_ENABLED
-+
- /**
-  * Gets the section type.
-  *
-@@ -91,23 +95,51 @@ static const char *rtldrElfGetShdrType(u
- {
-     switch (iType)
-     {
--        case SHT_NULL:          return "SHT_NULL";
--        case SHT_PROGBITS:      return "SHT_PROGBITS";
--        case SHT_SYMTAB:        return "SHT_SYMTAB";
--        case SHT_STRTAB:        return "SHT_STRTAB";
--        case SHT_RELA:          return "SHT_RELA";
--        case SHT_HASH:          return "SHT_HASH";
--        case SHT_DYNAMIC:       return "SHT_DYNAMIC";
--        case SHT_NOTE:          return "SHT_NOTE";
--        case SHT_NOBITS:        return "SHT_NOBITS";
--        case SHT_REL:           return "SHT_REL";
--        case SHT_SHLIB:         return "SHT_SHLIB";
--        case SHT_DYNSYM:        return "SHT_DYNSYM";
-+        RT_CASE_RET_STR(SHT_NULL);
-+        RT_CASE_RET_STR(SHT_PROGBITS);
-+        RT_CASE_RET_STR(SHT_SYMTAB);
-+        RT_CASE_RET_STR(SHT_STRTAB);
-+        RT_CASE_RET_STR(SHT_RELA);
-+        RT_CASE_RET_STR(SHT_HASH);
-+        RT_CASE_RET_STR(SHT_DYNAMIC);
-+        RT_CASE_RET_STR(SHT_NOTE);
-+        RT_CASE_RET_STR(SHT_NOBITS);
-+        RT_CASE_RET_STR(SHT_REL);
-+        RT_CASE_RET_STR(SHT_SHLIB);
-+        RT_CASE_RET_STR(SHT_DYNSYM);
-         default:
-             return "";
-     }
- }
--#endif
-+
-+/**
-+ * Gets the program header type.
-+ *
-+ * @returns Pointer to read only string.
-+ * @param   iType       The section type index.
-+ */
-+static const char *rtldrElfGetPhdrType(uint32_t iType)
-+{
-+    switch (iType)
-+    {
-+        RT_CASE_RET_STR(PT_NULL);
-+        RT_CASE_RET_STR(PT_LOAD);
-+        RT_CASE_RET_STR(PT_DYNAMIC);
-+        RT_CASE_RET_STR(PT_INTERP);
-+        RT_CASE_RET_STR(PT_NOTE);
-+        RT_CASE_RET_STR(PT_SHLIB);
-+        RT_CASE_RET_STR(PT_PHDR);
-+        RT_CASE_RET_STR(PT_TLS);
-+        RT_CASE_RET_STR(PT_GNU_EH_FRAME);
-+        RT_CASE_RET_STR(PT_GNU_STACK);
-+        RT_CASE_RET_STR(PT_GNU_RELRO);
-+        RT_CASE_RET_STR(PT_GNU_PROPERTY);
-+        default:
-+            return "";
-+    }
-+}
-+
-+#endif /* LOG_ENABLED*/
- 
- 
- /**
-@@ -124,8 +156,6 @@ DECLHIDDEN(int) rtldrELFOpen(PRTLDRREADE
- {
-     const char *pszLogName = pReader->pfnLogName(pReader); NOREF(pszLogName);
- 
--    RT_NOREF_PV(pErrInfo); /** @todo implement */
--
-     /*
-      * Read the ident to decide if this is 32-bit or 64-bit
-      * and worth dealing with.
-@@ -134,6 +164,7 @@ DECLHIDDEN(int) rtldrELFOpen(PRTLDRREADE
-     int rc = pReader->pfnRead(pReader, &e_ident, sizeof(e_ident), 0);
-     if (RT_FAILURE(rc))
-         return rc;
-+
-     if (    e_ident[EI_MAG0] != ELFMAG0
-         ||  e_ident[EI_MAG1] != ELFMAG1
-         ||  e_ident[EI_MAG2] != ELFMAG2
-@@ -141,19 +172,17 @@ DECLHIDDEN(int) rtldrELFOpen(PRTLDRREADE
-         ||  (   e_ident[EI_CLASS] != ELFCLASS32
-              && e_ident[EI_CLASS] != ELFCLASS64)
-        )
--    {
--        Log(("RTLdrELF: %s: Unsupported/invalid ident %.*Rhxs\n", pszLogName, sizeof(e_ident), e_ident));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: Unsupported/invalid ident %.*Rhxs", pszLogName, sizeof(e_ident), e_ident);
-+
-     if (e_ident[EI_DATA] != ELFDATA2LSB)
--    {
--        Log(("RTLdrELF: %s: ELF endian %x is unsupported\n", pszLogName, e_ident[EI_DATA]));
--        return VERR_LDRELF_ODD_ENDIAN;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_ODD_ENDIAN,
-+                                   "%s: ELF endian %x is unsupported", pszLogName, e_ident[EI_DATA]);
-+
-     if (e_ident[EI_CLASS] == ELFCLASS32)
--        rc = rtldrELF32Open(pReader, fFlags, enmArch, phLdrMod);
-+        rc = rtldrELF32Open(pReader, fFlags, enmArch, phLdrMod, pErrInfo);
-     else
--        rc = rtldrELF64Open(pReader, fFlags, enmArch, phLdrMod);
-+        rc = rtldrELF64Open(pReader, fFlags, enmArch, phLdrMod, pErrInfo);
-     return rc;
- }
- 
---- a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h
-+++ b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h
-@@ -29,31 +29,37 @@
- *   Defined Constants And Macros                                               *
- *******************************************************************************/
- #if ELF_MODE == 32
--#define RTLDRELF_NAME(name) rtldrELF32##name
--#define RTLDRELF_SUFF(name) name##32
--#define RTLDRELF_MID(pre,suff) pre##32##suff
--#define FMT_ELF_ADDR    "%08RX32"
--#define FMT_ELF_HALF    "%04RX16"
--#define FMT_ELF_OFF     "%08RX32"
--#define FMT_ELF_SIZE    "%08RX32"
--#define FMT_ELF_SWORD   "%RI32"
--#define FMT_ELF_WORD    "%08RX32"
--#define FMT_ELF_XWORD   "%08RX32"
--#define FMT_ELF_SXWORD  "%RI32"
-+# define RTLDRELF_NAME(name)    rtldrELF32##name
-+# define RTLDRELF_SUFF(name)    name##32
-+# define RTLDRELF_MID(pre,suff) pre##32##suff
-+# define FMT_ELF_ADDR           "%08RX32"
-+# define FMT_ELF_ADDR7          "%07RX32"
-+# define FMT_ELF_HALF           "%04RX16"
-+# define FMT_ELF_OFF            "%08RX32"
-+# define FMT_ELF_SIZE           "%08RX32"
-+# define FMT_ELF_SWORD          "%RI32"
-+# define FMT_ELF_WORD           "%08RX32"
-+# define FMT_ELF_XWORD          "%08RX32"
-+# define FMT_ELF_SXWORD         "%RI32"
-+# define Elf_Xword              Elf32_Word
-+# define Elf_Sxword             Elf32_Sword
- 
- #elif ELF_MODE == 64
--#define RTLDRELF_NAME(name) rtldrELF64##name
--#define RTLDRELF_SUFF(name) name##64
--#define RTLDRELF_MID(pre,suff) pre##64##suff
--#define FMT_ELF_ADDR    "%016RX64"
--#define FMT_ELF_HALF    "%04RX16"
--#define FMT_ELF_SHALF   "%RI16"
--#define FMT_ELF_OFF     "%016RX64"
--#define FMT_ELF_SIZE    "%016RX64"
--#define FMT_ELF_SWORD   "%RI32"
--#define FMT_ELF_WORD    "%08RX32"
--#define FMT_ELF_XWORD   "%016RX64"
--#define FMT_ELF_SXWORD  "%RI64"
-+# define RTLDRELF_NAME(name)    rtldrELF64##name
-+# define RTLDRELF_SUFF(name)    name##64
-+# define RTLDRELF_MID(pre,suff) pre##64##suff
-+# define FMT_ELF_ADDR           "%016RX64"
-+# define FMT_ELF_ADDR7          "%08RX64"
-+# define FMT_ELF_HALF           "%04RX16"
-+# define FMT_ELF_SHALF          "%RI16"
-+# define FMT_ELF_OFF            "%016RX64"
-+# define FMT_ELF_SIZE           "%016RX64"
-+# define FMT_ELF_SWORD          "%RI32"
-+# define FMT_ELF_WORD           "%08RX32"
-+# define FMT_ELF_XWORD          "%016RX64"
-+# define FMT_ELF_SXWORD         "%RI64"
-+# define Elf_Xword              Elf64_Xword
-+# define Elf_Sxword             Elf64_Sxword
- #endif
- 
- #define Elf_Ehdr            RTLDRELF_MID(Elf,_Ehdr)
-@@ -74,6 +80,9 @@
- #define RTLDRMODELF         RTLDRELF_MID(RTLDRMODELF,RT_NOTHING)
- #define PRTLDRMODELF        RTLDRELF_MID(PRTLDRMODELF,RT_NOTHING)
- 
-+#define RTLDRMODELFSHX      RTLDRELF_MID(RTLDRMODELFSHX,RT_NOTHING)
-+#define PRTLDRMODELFSHX     RTLDRELF_MID(PRTLDRMODELFSHX,RT_NOTHING)
-+
- #define ELF_R_SYM(info)     RTLDRELF_MID(ELF,_R_SYM)(info)
- #define ELF_R_TYPE(info)    RTLDRELF_MID(ELF,_R_TYPE)(info)
- #define ELF_R_INFO(sym, type) RTLDRELF_MID(ELF,_R_INFO)(sym, type)
-@@ -86,6 +95,20 @@
- *   Structures and Typedefs                                                    *
- *******************************************************************************/
- /**
-+ * Extra section info.
-+ */
-+typedef struct RTLDRMODELFSHX
-+{
-+    /** The corresponding program header. */
-+    uint16_t        idxPhdr;
-+    /** The corresponding dynamic section entry (address). */
-+    uint16_t        idxDt;
-+    /** The DT tag. */
-+    uint32_t        uDtTag;
-+} RTLDRMODELFSHX;
-+typedef RTLDRMODELFSHX *PRTLDRMODELFSHX;
-+
-+/**
-  * The ELF loader structure.
-  */
- typedef struct RTLDRMODELF
-@@ -105,36 +128,82 @@ typedef struct RTLDRMODELF
-     /** Unmodified section headers (allocated after paShdrs, so no need to free).
-      * Not valid if the image is DONE. */
-     Elf_Shdr const         *paOrgShdrs;
-+    /** Runs parallel to paShdrs and is part of the same allocation. */
-+    PRTLDRMODELFSHX         paShdrExtras;
-+    /** Base section number, either 1 or zero depending on whether we've
-+     *  re-used the NULL entry for .elf.headers in ET_EXEC/ET_DYN. */
-+    unsigned                iFirstSect;
-+    /** Set if the SHF_ALLOC section headers are in order of sh_addr. */
-+    bool                    fShdrInOrder;
-     /** The size of the loaded image. */
-     size_t                  cbImage;
- 
-     /** The image base address if it's an EXEC or DYN image. */
-     Elf_Addr                LinkAddress;
- 
--    /** The symbol section index. */
--    unsigned                iSymSh;
--    /** Number of symbols in the table. */
--    unsigned                cSyms;
--    /** Pointer to symbol table within RTLDRMODELF::pvBits. */
--    const Elf_Sym          *paSyms;
--
--    /** The string section index. */
--    unsigned                iStrSh;
--    /** Size of the string table. */
--    unsigned                cbStr;
--    /** Pointer to string table within RTLDRMODELF::pvBits. */
--    const char             *pStr;
-+    struct
-+    {
-+        /** The symbol section index. */
-+        unsigned            iSymSh;
-+        /** Number of symbols in the table. */
-+        unsigned            cSyms;
-+        /** Pointer to symbol table within RTLDRMODELF::pvBits. */
-+        const Elf_Sym      *paSyms;
-+
-+        /** The string section index. */
-+        unsigned            iStrSh;
-+        /** Size of the string table. */
-+        unsigned            cbStr;
-+        /** Pointer to string table within RTLDRMODELF::pvBits. */
-+        const char         *pStr;
-+    } Rel /**< Regular symbols and strings. */
-+    , Dyn /**< Dynamic symbols and strings. */;
- 
--    /** Size of the section header string table. */
--    unsigned                cbShStr;
-     /** Pointer to section header string table within RTLDRMODELF::pvBits. */
-     const char             *pShStr;
-+    /** Size of the section header string table. */
-+    unsigned                cbShStr;
- 
-     /** The '.eh_frame' section index.  Zero if not searched for, ~0U if not found. */
-     unsigned                iShEhFrame;
-     /** The '.eh_frame_hdr' section index.  Zero if not searched for, ~0U if not found. */
-     unsigned                iShEhFrameHdr;
--} RTLDRMODELF, *PRTLDRMODELF;
-+
-+    /** The '.dynamic' / SHT_DYNAMIC section index.  ~0U if not present. */
-+    unsigned                iShDynamic;
-+    /** Number of entries in paDynamic. */
-+    unsigned                cDynamic;
-+    /** The dynamic section (NULL for ET_REL). */
-+    Elf_Dyn                *paDynamic;
-+    /** Program headers (NULL for ET_REL). */
-+    Elf_Phdr               *paPhdrs;
-+
-+    /** Info extracted from PT_DYNAMIC and the program headers. */
-+    struct
-+    {
-+        /** DT_RELA/DT_REL. */
-+        Elf_Addr            uPtrRelocs;
-+        /** DT_RELASZ/DT_RELSZ. */
-+        Elf_Xword           cbRelocs;
-+        /** Non-zero if we've seen DT_RELAENT/DT_RELENT. */
-+        unsigned            cbRelocEntry;
-+        /** DT_RELA or DT_REL. */
-+        unsigned            uRelocType;
-+        /** The index of the section header matching DT_RELA/DT_REL. */
-+        unsigned            idxShRelocs;
-+
-+        /** DT_JMPREL. */
-+        Elf_Addr            uPtrJmpRelocs;
-+        /** DT_PLTRELSZ. */
-+        Elf_Xword           cbJmpRelocs;
-+        /** DT_RELA or DT_REL (if we've seen DT_PLTREL). */
-+        unsigned            uJmpRelocType;
-+        /** The index of the section header matching DT_JMPREL. */
-+        unsigned            idxShJmpRelocs;
-+    } DynInfo;
-+} RTLDRMODELF;
-+/** Pointer to an ELF module instance. */
-+typedef RTLDRMODELF *PRTLDRMODELF;
- 
- 
- /**
-@@ -154,11 +223,15 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR
-     if (RT_SUCCESS(rc))
-     {
-         const uint8_t *pu8 = (const uint8_t *)pModElf->pvBits;
--        if (pModElf->iSymSh != ~0U)
--            pModElf->paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->iSymSh].sh_offset);
--        if (pModElf->iStrSh != ~0U)
--            pModElf->pStr   =    (const char *)(pu8 + pModElf->paShdrs[pModElf->iStrSh].sh_offset);
--        pModElf->pShStr     =    (const char *)(pu8 + pModElf->paShdrs[pModElf->Ehdr.e_shstrndx].sh_offset);
-+        if (pModElf->Rel.iSymSh != ~0U)
-+            pModElf->Rel.paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->Rel.iSymSh].sh_offset);
-+        if (pModElf->Rel.iStrSh != ~0U)
-+            pModElf->Rel.pStr   =    (const char *)(pu8 + pModElf->paShdrs[pModElf->Rel.iStrSh].sh_offset);
-+        if (pModElf->Dyn.iSymSh != ~0U)
-+            pModElf->Dyn.paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->Dyn.iSymSh].sh_offset);
-+        if (pModElf->Dyn.iStrSh != ~0U)
-+            pModElf->Dyn.pStr   =    (const char *)(pu8 + pModElf->paShdrs[pModElf->Dyn.iStrSh].sh_offset);
-+        pModElf->pShStr         =    (const char *)(pu8 + pModElf->paShdrs[pModElf->Ehdr.e_shstrndx].sh_offset);
- 
-         /*
-          * Verify that the ends of the string tables have a zero terminator
-@@ -167,8 +240,12 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR
-          * sh_offset and sh_size were verfied in RTLDRELF_NAME(ValidateSectionHeader)() already so they
-          * are safe to use.
-          */
--        AssertMsgStmt(   pModElf->iStrSh == ~0U
--                      || pModElf->pStr[pModElf->paShdrs[pModElf->iStrSh].sh_size - 1] == '\0',
-+        AssertMsgStmt(   pModElf->Rel.iStrSh == ~0U
-+                      || pModElf->Rel.pStr[pModElf->paShdrs[pModElf->Rel.iStrSh].sh_size - 1] == '\0',
-+                      ("The string table is not zero terminated!\n"),
-+                      rc = VERR_LDRELF_UNTERMINATED_STRING_TAB);
-+        AssertMsgStmt(   pModElf->Dyn.iStrSh == ~0U
-+                      || pModElf->Dyn.pStr[pModElf->paShdrs[pModElf->Dyn.iStrSh].sh_size - 1] == '\0',
-                       ("The string table is not zero terminated!\n"),
-                       rc = VERR_LDRELF_UNTERMINATED_STRING_TAB);
-         AssertMsgStmt(pModElf->pShStr[pModElf->paShdrs[pModElf->Ehdr.e_shstrndx].sh_size - 1] == '\0',
-@@ -180,10 +257,12 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR
-             /* Unmap. */
-             int rc2 = pModElf->Core.pReader->pfnUnmap(pModElf->Core.pReader, pModElf->pvBits);
-             AssertRC(rc2);
--            pModElf->pvBits = NULL;
--            pModElf->paSyms = NULL;
--            pModElf->pStr   = NULL;
--            pModElf->pShStr = NULL;
-+            pModElf->pvBits     = NULL;
-+            pModElf->Rel.paSyms = NULL;
-+            pModElf->Rel.pStr   = NULL;
-+            pModElf->Dyn.paSyms = NULL;
-+            pModElf->Dyn.pStr   = NULL;
-+            pModElf->pShStr     = NULL;
-         }
-     }
-     return rc;
-@@ -200,6 +279,101 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR
-  *
-  */
- 
-+/**
-+ * Get the symbol and symbol value.
-+ *
-+ * @returns iprt status code.
-+ * @param   pModElf         The ELF loader module instance data.
-+ * @param   BaseAddr        The base address which the module is being fixedup to.
-+ * @param   pfnGetImport    The callback function to use to resolve imports (aka unresolved externals).
-+ * @param   pvUser          User argument to pass to the callback.
-+ * @param   iSym            The symbol to get.
-+ * @param   ppSym           Where to store the symbol pointer on success. (read only)
-+ * @param   pSymValue       Where to store the symbol value on success.
-+ */
-+static int RTLDRELF_NAME(SymbolExecDyn)(PRTLDRMODELF pModElf, Elf_Addr BaseAddr, PFNRTLDRIMPORT pfnGetImport, void *pvUser,
-+                                        Elf_Size iSym, const Elf_Sym **ppSym, Elf_Addr *pSymValue)
-+{
-+    /*
-+     * Validate and find the symbol.
-+     */
-+    AssertMsgReturn(iSym < pModElf->Dyn.cSyms, ("iSym=%d is an invalid symbol index!\n", iSym), VERR_LDRELF_INVALID_SYMBOL_INDEX);
-+    const Elf_Sym *pSym = &pModElf->Dyn.paSyms[iSym];
-+    *ppSym = pSym;
-+
-+    AssertMsgReturn(pSym->st_name < pModElf->Dyn.cbStr,
-+                    ("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->Dyn.cbStr),
-+                    VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET);
-+    const char * const pszName = pModElf->Dyn.pStr + pSym->st_name;
-+
-+    /*
-+     * Determine the symbol value.
-+     *
-+     * Symbols needs different treatment depending on which section their are in.
-+     * Undefined and absolute symbols goes into special non-existing sections.
-+     */
-+    switch (pSym->st_shndx)
-+    {
-+        /*
-+         * Undefined symbol, needs resolving.
-+         *
-+         * Since ELF has no generic concept of importing from specific module (the OS/2 ELF format
-+         * has but that's an OS extension and only applies to programs and dlls), we'll have to ask
-+         * the resolver callback to do a global search.
-+         */
-+        case SHN_UNDEF:
-+        {
-+            /* Try to resolve the symbol. */
-+            RTUINTPTR Value;
-+            int rc = pfnGetImport(&pModElf->Core, "", pszName, ~0U, &Value, pvUser);
-+            AssertMsgRCReturn(rc, ("Failed to resolve '%s' (iSym=" FMT_ELF_SIZE " rc=%Rrc\n", pszName, iSym, rc), rc);
-+
-+            *pSymValue = (Elf_Addr)Value;
-+            AssertMsgReturn((RTUINTPTR)*pSymValue == Value,
-+                            ("Symbol value overflowed! '%s' (iSym=" FMT_ELF_SIZE "\n", pszName, iSym), VERR_SYMBOL_VALUE_TOO_BIG);
-+
-+            Log2(("rtldrELF: #%-3d - UNDEF " FMT_ELF_ADDR " '%s'\n", iSym, *pSymValue, pszName));
-+            break;
-+        }
-+
-+        /*
-+         * Absolute symbols needs no fixing since they are, well, absolute.
-+         */
-+        case SHN_ABS:
-+            *pSymValue = pSym->st_value;
-+            Log2(("rtldrELF: #%-3d - ABS   " FMT_ELF_ADDR " '%s'\n", iSym, *pSymValue, pszName));
-+            break;
-+
-+        /*
-+         * All other symbols are addressed relative the image base in DYN and EXEC binaries.
-+         */
-+        default:
-+            AssertMsgReturn(pSym->st_shndx < pModElf->Ehdr.e_shnum,
-+                            ("iSym=%d st_shndx=%d e_shnum=%d pszName=%s\n", iSym, pSym->st_shndx, pModElf->Ehdr.e_shnum, pszName),
-+                            VERR_BAD_EXE_FORMAT);
-+            *pSymValue = pSym->st_value + BaseAddr;
-+            Log2(("rtldrELF: #%-3d - %5d " FMT_ELF_ADDR " '%s'\n", iSym, pSym->st_shndx, *pSymValue, pszName));
-+            break;
-+    }
-+
-+    return VINF_SUCCESS;
-+}
-+
-+
-+#if   ELF_MODE == 32
-+/** Helper for RelocateSectionExecDyn. */
-+DECLINLINE(const Elf_Shdr *) RTLDRELF_NAME(RvaToSectionHeader)(PRTLDRMODELF pModElf, Elf_Addr uRva)
-+{
-+    const Elf_Shdr * const pShdrFirst = pModElf->paShdrs;
-+    const Elf_Shdr *pShdr = pShdrFirst + pModElf->Ehdr.e_shnum;
-+    while (--pShdr != pShdrFirst)
-+        if (uRva - pShdr->sh_addr /*rva*/ < pShdr->sh_size)
-+            return pShdr;
-+    AssertFailed();
-+    return pShdr;
-+}
-+#endif
-+
- 
- /**
-  * Applies the fixups for a section in an executable image.
-@@ -230,84 +404,106 @@ static int RTLDRELF_NAME(RelocateSection
-      * Iterate the relocations.
-      * The relocations are stored in an array of Elf32_Rel records and covers the entire relocation section.
-      */
-+#if   ELF_MODE == 32
-+    const Elf_Shdr   *pShdr    = pModElf->paShdrs;
-     const Elf_Addr    offDelta = BaseAddr - pModElf->LinkAddress;
-+#endif
-     const Elf_Reloc  *paRels   = (const Elf_Reloc *)pvRelocs;
--    const unsigned    iRelMax   = (unsigned)(cbRelocs / sizeof(paRels[0]));
-+    const unsigned    iRelMax  = (unsigned)(cbRelocs / sizeof(paRels[0]));
-     AssertMsgReturn(iRelMax == cbRelocs / sizeof(paRels[0]), (FMT_ELF_SIZE "\n", cbRelocs / sizeof(paRels[0])),
-                     VERR_IMAGE_TOO_BIG);
-     for (unsigned iRel = 0; iRel < iRelMax; iRel++)
-     {
-         /*
--         * Skip R_XXX_NONE entries early to avoid confusion in the symbol
--         * getter code.
-+         * Apply fixups not taking a symbol (will 'continue' rather than 'break').
-          */
-+        AssertMsgReturn(paRels[iRel].r_offset < cbSec, (FMT_ELF_ADDR " " FMT_ELF_SIZE "\n", paRels[iRel].r_offset, cbSec),
-+                        VERR_LDRELF_INVALID_RELOCATION_OFFSET);
- #if   ELF_MODE == 32
--        if (ELF_R_TYPE(paRels[iRel].r_info) == R_386_NONE)
--            continue;
--#elif ELF_MODE == 64
--        if (ELF_R_TYPE(paRels[iRel].r_info) == R_X86_64_NONE)
--            continue;
-+        if (paRels[iRel].r_offset - pShdr->sh_addr /*rva*/ >= pShdr->sh_size)
-+            pShdr = RTLDRELF_NAME(RvaToSectionHeader)(pModElf, paRels[iRel].r_offset);
-+        static const Elf_Addr s_uZero = 0;
-+        const Elf_Addr *pAddrR = RT_LIKELY(pShdr->sh_type != SHT_NOBITS)                     /* Where to read the addend. */
-+                               ? (const Elf_Addr *)(pu8SecBaseR + paRels[iRel].r_offset - pShdr->sh_addr /*rva*/
-+                                                    + pShdr->sh_offset)
-+                               : &s_uZero;
- #endif
--
--        /*
--         * Validate and find the symbol, resolve undefined ones.
--         */
--        Elf_Size iSym = ELF_R_SYM(paRels[iRel].r_info);
--        if (iSym >= pModElf->cSyms)
--        {
--            AssertMsgFailed(("iSym=%d is an invalid symbol index!\n", iSym));
--            return VERR_LDRELF_INVALID_SYMBOL_INDEX;
--        }
--        const Elf_Sym *pSym = &pModElf->paSyms[iSym];
--        if (pSym->st_name >= pModElf->cbStr)
-+        Elf_Addr       *pAddrW =       (Elf_Addr *)(pu8SecBaseW + paRels[iRel].r_offset);    /* Where to write the fixup. */
-+        switch (ELF_R_TYPE(paRels[iRel].r_info))
-         {
--            AssertMsgFailed(("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->cbStr));
--            return VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET;
--        }
-+            /*
-+             * Image relative (addend + base).
-+             */
-+#if   ELF_MODE == 32
-+            case R_386_RELATIVE:
-+            {
-+                const Elf_Addr Value = *pAddrR + BaseAddr;
-+                *(uint32_t *)pAddrW = Value;
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_RELATIVE Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value));
-+                AssertCompile(sizeof(Value) == sizeof(uint32_t));
-+                continue;
-+            }
-+#elif ELF_MODE == 64
-+            case R_X86_64_RELATIVE:
-+            {
-+                const Elf_Addr Value = paRels[iRel].r_addend + BaseAddr;
-+                *(uint64_t *)pAddrW = (uint64_t)Value;
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_RELATIVE Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value));
-+                AssertCompile(sizeof(Value) == sizeof(uint64_t));
-+                continue;
-+            }
-+#endif
- 
--        Elf_Addr SymValue = 0;
--        if (pSym->st_shndx == SHN_UNDEF)
--        {
--            /* Try to resolve the symbol. */
--            const char *pszName = ELF_STR(pModElf, pSym->st_name);
--            RTUINTPTR   ExtValue;
--            int rc = pfnGetImport(&pModElf->Core, "", pszName, ~0U, &ExtValue, pvUser);
--            AssertMsgRCReturn(rc, ("Failed to resolve '%s' rc=%Rrc\n", pszName, rc), rc);
--            SymValue = (Elf_Addr)ExtValue;
--            AssertMsgReturn((RTUINTPTR)SymValue == ExtValue, ("Symbol value overflowed! '%s'\n", pszName),
--                            VERR_SYMBOL_VALUE_TOO_BIG);
--            Log2(("rtldrELF: #%-3d - UNDEF " FMT_ELF_ADDR " '%s'\n", iSym, SymValue, pszName));
--        }
--        else
--        {
--            AssertMsgReturn(pSym->st_shndx < pModElf->Ehdr.e_shnum || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx),
--                            VERR_LDRELF_INVALID_RELOCATION_OFFSET);
--#if   ELF_MODE == 64
--            SymValue = pSym->st_value;
-+            /*
-+             * R_XXX_NONE.
-+             */
-+#if   ELF_MODE == 32
-+            case R_386_NONE:
-+#elif ELF_MODE == 64
-+            case R_X86_64_NONE:
- #endif
-+                continue;
-         }
- 
--#if   ELF_MODE == 64
--        /* Calc the value (indexes checked above; assumes SHN_UNDEF == 0). */
--        Elf_Addr Value;
--        if (pSym->st_shndx < pModElf->Ehdr.e_shnum)
--            Value = SymValue + offDelta;
--        else /* SHN_ABS: */
--            Value = SymValue + paRels[iRel].r_addend;
--#endif
-+        /*
-+         * Validate and find the symbol, resolve undefined ones.
-+         */
-+        const Elf_Sym  *pSym = NULL; /* shut up gcc */
-+        Elf_Addr        SymValue = 0; /* shut up gcc-4 */
-+        int rc = RTLDRELF_NAME(SymbolExecDyn)(pModElf, BaseAddr, pfnGetImport, pvUser, ELF_R_SYM(paRels[iRel].r_info), &pSym, &SymValue);
-+        if (RT_FAILURE(rc))
-+            return rc;
- 
-         /*
-          * Apply the fixup.
-          */
--        AssertMsgReturn(paRels[iRel].r_offset < cbSec, (FMT_ELF_ADDR " " FMT_ELF_SIZE "\n", paRels[iRel].r_offset, cbSec), VERR_LDRELF_INVALID_RELOCATION_OFFSET);
--#if   ELF_MODE == 32
--        const Elf_Addr *pAddrR = (const Elf_Addr *)(pu8SecBaseR + paRels[iRel].r_offset);    /* Where to read the addend. */
--#endif
--        Elf_Addr       *pAddrW =       (Elf_Addr *)(pu8SecBaseW + paRels[iRel].r_offset);    /* Where to write the fixup. */
-         switch (ELF_R_TYPE(paRels[iRel].r_info))
-         {
- #if   ELF_MODE == 32
-             /*
-+             * GOT/PLT.
-+             */
-+            case R_386_GLOB_DAT:
-+            {
-+                *(uint32_t *)pAddrW = (uint32_t)SymValue;
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_GLOB_DAT Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue));
-+                AssertCompile(sizeof(SymValue) == sizeof(uint32_t));
-+                break;
-+            }
-+
-+            case R_386_JMP_SLOT:
-+            {
-+                *(uint32_t *)pAddrW = (uint32_t)SymValue;
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_JMP_SLOT Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue));
-+                AssertCompile(sizeof(SymValue) == sizeof(uint32_t));
-+                break;
-+            }
-+
-+            /*
-              * Absolute addressing.
-              */
-             case R_386_32:
-@@ -322,7 +518,8 @@ static int RTLDRELF_NAME(RelocateSection
-                 else
-                     AssertFailedReturn(VERR_LDR_GENERAL_FAILURE); /** @todo SHN_COMMON */
-                 *(uint32_t *)pAddrW = Value;
--                Log4((FMT_ELF_ADDR": R_386_32   Value=" FMT_ELF_ADDR "\n", SecAddr + paRels[iRel].r_offset + BaseAddr, Value));
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_32   Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value));
-                 break;
-             }
- 
-@@ -344,20 +541,42 @@ static int RTLDRELF_NAME(RelocateSection
-                 }
-                 else
-                     AssertFailedReturn(VERR_LDR_GENERAL_FAILURE); /** @todo SHN_COMMON */
--                Log4((FMT_ELF_ADDR": R_386_PC32 Value=" FMT_ELF_ADDR "\n", SecAddr + paRels[iRel].r_offset + BaseAddr, Value));
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_PC32 Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value));
-                 break;
-             }
- 
- #elif ELF_MODE == 64
-+            /*
-+             * GOT/PLT.
-+             */
-+            case R_X86_64_GLOB_DAT:
-+            {
-+                *(uint64_t *)pAddrW = (uint64_t)SymValue;
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_GLOB_DAT Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue));
-+                AssertCompile(sizeof(SymValue) == sizeof(uint64_t));
-+                break;
-+            }
-+
-+            case R_X86_64_JMP_SLOT:
-+            {
-+                *(uint64_t *)pAddrW = (uint64_t)SymValue;
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_JMP_SLOT Value=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue));
-+                AssertCompile(sizeof(SymValue) == sizeof(uint64_t));
-+                break;
-+            }
- 
-             /*
--             * Absolute addressing
-+             * Absolute addressing.
-              */
-             case R_X86_64_64:
-             {
-+                const Elf_Addr Value = SymValue + paRels[iRel].r_addend;
-                 *(uint64_t *)pAddrW = Value;
--                Log4((FMT_ELF_ADDR": R_X86_64_64   Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
--                      SecAddr + paRels[iRel].r_offset + BaseAddr, Value, SymValue));
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_64   Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value, SymValue));
-                 break;
-             }
- 
-@@ -366,9 +585,10 @@ static int RTLDRELF_NAME(RelocateSection
-              */
-             case R_X86_64_32:
-             {
-+                const Elf_Addr Value = SymValue + paRels[iRel].r_addend;
-                 *(uint32_t *)pAddrW = (uint32_t)Value;
--                Log4((FMT_ELF_ADDR": R_X86_64_32   Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
--                      SecAddr + paRels[iRel].r_offset + BaseAddr, Value, SymValue));
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_32   Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value, SymValue));
-                 AssertMsgReturn((Elf_Addr)*(uint32_t *)pAddrW == SymValue, ("Value=" FMT_ELF_ADDR "\n", SymValue),
-                                 VERR_SYMBOL_VALUE_TOO_BIG);
-                 break;
-@@ -379,9 +599,10 @@ static int RTLDRELF_NAME(RelocateSection
-              */
-             case R_X86_64_32S:
-             {
-+                const Elf_Addr Value = SymValue + paRels[iRel].r_addend;
-                 *(int32_t *)pAddrW = (int32_t)Value;
--                Log4((FMT_ELF_ADDR": R_X86_64_32S  Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
--                      SecAddr + paRels[iRel].r_offset + BaseAddr, Value, SymValue));
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_32S  Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
-+                      SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value, SymValue));
-                 AssertMsgReturn((Elf_Addr)*(int32_t *)pAddrW == Value, ("Value=" FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG); /** @todo check the sign-extending here. */
-                 break;
-             }
-@@ -390,18 +611,17 @@ static int RTLDRELF_NAME(RelocateSection
-              * PC relative addressing.
-              */
-             case R_X86_64_PC32:
--            case R_X86_64_PLT32: /* binutils commit 451875b4f976a527395e9303224c7881b65e12ed feature/regression. */
-             {
--                const Elf_Addr SourceAddr = SecAddr + paRels[iRel].r_offset + BaseAddr; /* Where the source really is. */
--                Value -= SourceAddr;
-+                const Elf_Addr SourceAddr = SecAddr  + paRels[iRel].r_offset + BaseAddr; /* Where the source really is. */
-+                const Elf_Addr Value      = SymValue + paRels[iRel].r_addend - SourceAddr;
-                 *(int32_t *)pAddrW = (int32_t)Value;
--                Log4((FMT_ELF_ADDR": R_X86_64_PC32 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
--                      SourceAddr, Value, SymValue));
-+                Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_PC32 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n",
-+                      SourceAddr, paRels[iRel].r_offset, Value, SymValue));
-                 AssertMsgReturn((Elf_Addr)*(int32_t *)pAddrW == Value, ("Value=" FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG); /** @todo check the sign-extending here. */
-                 break;
-             }
--#endif
- 
-+#endif
-             default:
-                 AssertMsgFailed(("Unknown relocation type: %d (iRel=%d iRelMax=%d)\n",
-                                  ELF_R_TYPE(paRels[iRel].r_info), iRel, iRelMax));
-@@ -442,19 +662,13 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM
-     /*
-      * Validate and find the symbol.
-      */
--    if (iSym >= pModElf->cSyms)
--    {
--        AssertMsgFailed(("iSym=%d is an invalid symbol index!\n", iSym));
--        return VERR_LDRELF_INVALID_SYMBOL_INDEX;
--    }
--    const Elf_Sym *pSym = &pModElf->paSyms[iSym];
-+    AssertMsgReturn(iSym < pModElf->Rel.cSyms, ("iSym=%d is an invalid symbol index!\n", iSym), VERR_LDRELF_INVALID_SYMBOL_INDEX);
-+    const Elf_Sym *pSym = &pModElf->Rel.paSyms[iSym];
-     *ppSym = pSym;
- 
--    if (pSym->st_name >= pModElf->cbStr)
--    {
--        AssertMsgFailed(("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->cbStr));
--        return VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET;
--    }
-+    AssertMsgReturn(pSym->st_name < pModElf->Rel.cbStr,
-+                    ("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->Rel.cbStr),
-+                    VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET);
-     const char *pszName = ELF_STR(pModElf, pSym->st_name);
- 
-     /*
-@@ -469,7 +683,7 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM
-          * Undefined symbol, needs resolving.
-          *
-          * Since ELF has no generic concept of importing from specific module (the OS/2 ELF format
--         * has but that's a OS extension and only applies to programs and dlls), we'll have to ask
-+         * has but that's an OS extension and only applies to programs and dlls), we'll have to ask
-          * the resolver callback to do a global search.
-          */
-         case SHN_UNDEF:
-@@ -477,17 +691,12 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM
-             /* Try to resolve the symbol. */
-             RTUINTPTR Value;
-             int rc = pfnGetImport(&pModElf->Core, "", pszName, ~0U, &Value, pvUser);
--            if (RT_FAILURE(rc))
--            {
--                AssertMsgFailed(("Failed to resolve '%s' rc=%Rrc\n", pszName, rc));
--                return rc;
--            }
-+            AssertMsgRCReturn(rc, ("Failed to resolve '%s' (iSym=" FMT_ELF_SIZE " rc=%Rrc\n", pszName, iSym, rc), rc);
-             *pSymValue = (Elf_Addr)Value;
--            if ((RTUINTPTR)*pSymValue != Value)
--            {
--                AssertMsgFailed(("Symbol value overflowed! '%s'\n", pszName));
--                return VERR_SYMBOL_VALUE_TOO_BIG;
--            }
-+
-+            AssertMsgReturn((RTUINTPTR)*pSymValue == Value,
-+                            ("Symbol value overflowed! '%s' (iSym=" FMT_ELF_SIZE ")\n", pszName, iSym),
-+                            VERR_SYMBOL_VALUE_TOO_BIG);
- 
-             Log2(("rtldrELF: #%-3d - UNDEF " FMT_ELF_ADDR " '%s'\n", iSym, *pSymValue, pszName));
-             break;
-@@ -536,9 +745,9 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM
-  * @param   pvRelocs        Pointer to where we read the relocations from.
-  * @param   cbRelocs        Size of the relocations.
-  */
--static int RTLDRELF_NAME(RelocateSection)(PRTLDRMODELF pModElf, Elf_Addr BaseAddr, PFNRTLDRIMPORT pfnGetImport, void *pvUser,
--                                          const Elf_Addr SecAddr, Elf_Size cbSec, const uint8_t *pu8SecBaseR, uint8_t *pu8SecBaseW,
--                                          const void *pvRelocs, Elf_Size cbRelocs)
-+static int RTLDRELF_NAME(RelocateSectionRel)(PRTLDRMODELF pModElf, Elf_Addr BaseAddr, PFNRTLDRIMPORT pfnGetImport, void *pvUser,
-+                                             const Elf_Addr SecAddr, Elf_Size cbSec, const uint8_t *pu8SecBaseR,
-+                                             uint8_t *pu8SecBaseW, const void *pvRelocs, Elf_Size cbRelocs)
- {
- #if ELF_MODE != 32
-     NOREF(pu8SecBaseR);
-@@ -702,6 +911,18 @@ static DECLCALLBACK(int) RTLDRELF_NAME(C
-         pModElf->paShdrs = NULL;
-     }
- 
-+    if (pModElf->paPhdrs)
-+    {
-+        RTMemFree(pModElf->paPhdrs);
-+        pModElf->paPhdrs = NULL;
-+    }
-+
-+    if (pModElf->paDynamic)
-+    {
-+        RTMemFree(pModElf->paDynamic);
-+        pModElf->paDynamic = NULL;
-+    }
-+
-     if (pModElf->pvBits)
-     {
-         pModElf->Core.pReader->pfnUnmap(pModElf->Core.pReader, pModElf->pvBits);
-@@ -721,9 +942,9 @@ static DECLCALLBACK(int) RTLDRELF_NAME(D
- }
- 
- 
--/** @copydoc RTLDROPS::EnumSymbols */
--static DECLCALLBACK(int) RTLDRELF_NAME(EnumSymbols)(PRTLDRMODINTERNAL pMod, unsigned fFlags, const void *pvBits, RTUINTPTR BaseAddress,
--                                                    PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
-+/** @copydoc RTLDROPS::pfnEnumSymbols */
-+static DECLCALLBACK(int) RTLDRELF_NAME(EnumSymbols)(PRTLDRMODINTERNAL pMod, unsigned fFlags, const void *pvBits,
-+                                                    RTUINTPTR BaseAddress, PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
- {
-     PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
-     NOREF(pvBits);
-@@ -744,8 +965,20 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E
-     /*
-      * Enumerate the symbol table.
-      */
--    const Elf_Sym  *paSyms = pModElf->paSyms;
--    unsigned        cSyms  = pModElf->cSyms;
-+    const Elf_Sym  *paSyms  = pModElf->Rel.paSyms;
-+    unsigned        cSyms   = pModElf->Rel.cSyms;
-+    const char     *pszzStr = pModElf->Rel.pStr;
-+    unsigned        cbStr   = pModElf->Rel.cbStr;
-+    if (   (   !(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_ALL)
-+            && pModElf->Dyn.cSyms > 0)
-+        || cSyms == 0)
-+    {
-+        paSyms  = pModElf->Dyn.paSyms;
-+        cSyms   = pModElf->Dyn.cSyms;
-+        pszzStr = pModElf->Dyn.pStr;
-+        cbStr   = pModElf->Dyn.cbStr;
-+    }
-+
-     for (unsigned iSym = 1; iSym < cSyms; iSym++)
-     {
-         /*
-@@ -774,22 +1007,21 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E
-                 return VERR_BAD_EXE_FORMAT;
-             }
- 
--            AssertMsgReturn(paSyms[iSym].st_name < pModElf->cbStr,
-+            AssertMsgReturn(paSyms[iSym].st_name < cbStr,
-                             ("String outside string table! iSym=%d paSyms[iSym].st_name=%#x\n", iSym, paSyms[iSym].st_name),
-                             VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET);
-+            const char * const pszName = pszzStr + paSyms[iSym].st_name;
- 
--            const char *pszName = ELF_STR(pModElf, paSyms[iSym].st_name);
-             /* String termination was already checked when the string table was mapped. */
--            if (    (pszName && *pszName)
-+            if (    *pszName != '\0'
-                 &&  (   (fFlags & RTLDR_ENUM_SYMBOL_FLAGS_ALL)
--                     || ELF_ST_BIND(paSyms[iSym].st_info) == STB_GLOBAL)
--               )
-+                     || ELF_ST_BIND(paSyms[iSym].st_info) == STB_GLOBAL) )
-             {
-                 /*
-                  * Call back.
-                  */
-                 AssertMsgReturn(Value == (RTUINTPTR)Value, (FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG);
--                rc = pfnCallback(pMod, pszName, ~0U, (RTUINTPTR)Value, pvUser);
-+                rc = pfnCallback(pMod, pszName, iSym, (RTUINTPTR)Value, pvUser);
-                 if (rc)
-                     return rc;
-             }
-@@ -820,13 +1052,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(G
-     switch (pModElf->Ehdr.e_type)
-     {
-         case ET_REL:
-+        case ET_DYN:
-             break;
-         case ET_EXEC:
-             Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pModElf->Core.pReader->pfnLogName(pModElf->Core.pReader)));
-             return VERR_LDRELF_EXEC;
--        case ET_DYN:
--            Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pModElf->Core.pReader->pfnLogName(pModElf->Core.pReader)));
--            return VERR_LDRELF_DYN;
-         default: AssertFailedReturn(VERR_BAD_EXE_FORMAT);
-     }
- 
-@@ -885,13 +1115,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R
-     switch (pModElf->Ehdr.e_type)
-     {
-         case ET_REL:
-+        case ET_DYN:
-             break;
-         case ET_EXEC:
-             Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pszLogName));
-             return VERR_LDRELF_EXEC;
--        case ET_DYN:
--            Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pszLogName));
--            return VERR_LDRELF_DYN;
-         default: AssertFailedReturn(VERR_BAD_EXE_FORMAT);
-     }
- 
-@@ -910,8 +1138,9 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R
- 
-     /*
-      * Iterate the sections looking for interesting SHT_REL[A] sections.
--     * SHT_REL[A] sections have the section index of the section they contain fixups
--     * for in the sh_info member.
-+     *
-+     * In ET_REL files the SHT_REL[A] sections have the section index of
-+     * the section they contain fixups for in the sh_info member.
-      */
-     const Elf_Shdr *paShdrs = pModElf->paShdrs;
-     Log2(("rtLdrElf: %s: Fixing up image\n", pszLogName));
-@@ -928,36 +1157,37 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R
-         if (pShdrRel->sh_type != SHT_RELA)
- #endif
-             continue;
--        if (pShdrRel->sh_info >= pModElf->Ehdr.e_shnum)
--            continue;
--        const Elf_Shdr *pShdr = &paShdrs[pShdrRel->sh_info]; /* the section to fixup. */
--        if (!(pShdr->sh_flags & SHF_ALLOC))
--            continue;
--
--        /*
--         * Relocate the section.
--         */
--        Log2(("rtldrELF: %s: Relocation records for #%d [%s] (sh_info=%d sh_link=%d) found in #%d [%s] (sh_info=%d sh_link=%d)\n",
--              pszLogName, (int)pShdrRel->sh_info, ELF_SH_STR(pModElf, pShdr->sh_name), (int)pShdr->sh_info, (int)pShdr->sh_link,
--              iShdr, ELF_SH_STR(pModElf, pShdrRel->sh_name), (int)pShdrRel->sh_info, (int)pShdrRel->sh_link));
--
--        /** @todo Make RelocateSection a function pointer so we can select the one corresponding to the machine when opening the image. */
-         if (pModElf->Ehdr.e_type == ET_REL)
--            rc = RTLDRELF_NAME(RelocateSection)(pModElf, BaseAddr, pfnGetImport, pvUser,
--                                                pShdr->sh_addr,
--                                                pShdr->sh_size,
--                                                (const uint8_t *)pModElf->pvBits + pShdr->sh_offset,
--                                                (uint8_t *)pvBits + pShdr->sh_addr,
--                                                (const uint8_t *)pModElf->pvBits + pShdrRel->sh_offset,
--                                                pShdrRel->sh_size);
-+        {
-+            if (pShdrRel->sh_info >= pModElf->Ehdr.e_shnum)
-+                continue;
-+            const Elf_Shdr *pShdr = &paShdrs[pShdrRel->sh_info]; /* the section to fixup. */
-+            if (!(pShdr->sh_flags & SHF_ALLOC))
-+                continue;
-+
-+            /*
-+             * Relocate the section.
-+             */
-+            Log2(("rtldrELF: %s: Relocation records for #%d [%s] (sh_info=%d sh_link=%d) found in #%d [%s] (sh_info=%d sh_link=%d)\n",
-+                  pszLogName, (int)pShdrRel->sh_info, ELF_SH_STR(pModElf, pShdr->sh_name), (int)pShdr->sh_info, (int)pShdr->sh_link,
-+                  iShdr, ELF_SH_STR(pModElf, pShdrRel->sh_name), (int)pShdrRel->sh_info, (int)pShdrRel->sh_link));
-+
-+            rc = RTLDRELF_NAME(RelocateSectionRel)(pModElf, BaseAddr, pfnGetImport, pvUser,
-+                                                   pShdr->sh_addr,
-+                                                   pShdr->sh_size,
-+                                                   (const uint8_t *)pModElf->pvBits + pShdr->sh_offset,
-+                                                   (uint8_t *)pvBits + pShdr->sh_addr,
-+                                                   (const uint8_t *)pModElf->pvBits + pShdrRel->sh_offset,
-+                                                   pShdrRel->sh_size);
-+        }
-         else
-             rc = RTLDRELF_NAME(RelocateSectionExecDyn)(pModElf, BaseAddr, pfnGetImport, pvUser,
--                                                       pShdr->sh_addr,
--                                                       pShdr->sh_size,
--                                                       (const uint8_t *)pModElf->pvBits + pShdr->sh_offset,
--                                                       (uint8_t *)pvBits + pShdr->sh_addr,
-+                                                       0, (Elf_Size)pModElf->cbImage,
-+                                                       (const uint8_t *)pModElf->pvBits /** @todo file offset ?? */,
-+                                                       (uint8_t *)pvBits,
-                                                        (const uint8_t *)pModElf->pvBits + pShdrRel->sh_offset,
-                                                        pShdrRel->sh_size);
-+
-         if (RT_FAILURE(rc))
-             return rc;
-     }
-@@ -1016,11 +1246,20 @@ static DECLCALLBACK(int) RTLDRELF_NAME(G
-     /*
-      * Calc all kinds of pointers before we start iterating the symbol table.
-      */
--    const Elf_Sym     *paSyms = pModElf->paSyms;
--    unsigned            cSyms = pModElf->cSyms;
-+    const Elf_Sym *paSyms  = pModElf->Rel.paSyms;
-+    unsigned       cSyms   = pModElf->Rel.cSyms;
-+    const char    *pszzStr = pModElf->Rel.pStr;
-+    unsigned       cbStr   = pModElf->Rel.cbStr;
-+    if (pModElf->Dyn.cSyms > 0)
-+    {
-+        paSyms  = pModElf->Dyn.paSyms;
-+        cSyms   = pModElf->Dyn.cSyms;
-+        pszzStr = pModElf->Dyn.pStr;
-+        cbStr   = pModElf->Dyn.cbStr;
-+    }
-+
-     if (iOrdinal == UINT32_MAX)
-     {
--        const char     *pStr  = pModElf->pStr;
-         for (unsigned iSym = 1; iSym < cSyms; iSym++)
-         {
-             /* Undefined symbols are not exports, they are imports. */
-@@ -1029,18 +1268,13 @@ static DECLCALLBACK(int) RTLDRELF_NAME(G
-                      || ELF_ST_BIND(paSyms[iSym].st_info) == STB_WEAK))
-             {
-                 /* Validate the name string and try match with it. */
--                if (paSyms[iSym].st_name < pModElf->cbStr)
--                {
--                    if (!strcmp(pszSymbol, pStr + paSyms[iSym].st_name))
--                    {
--                        /* matched! */
--                        return RTLDRELF_NAME(ReturnSymbol)(pModElf, &paSyms[iSym], uBaseAddr, pValue);
--                    }
--                }
--                else
-+                AssertMsgReturn(paSyms[iSym].st_name < cbStr,
-+                                ("String outside string table! iSym=%d paSyms[iSym].st_name=%#x\n", iSym, paSyms[iSym].st_name),
-+                                VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET);
-+                if (!strcmp(pszSymbol, pszzStr + paSyms[iSym].st_name))
-                 {
--                    AssertMsgFailed(("String outside string table! iSym=%d paSyms[iSym].st_name=%#x\n", iSym, paSyms[iSym].st_name));
--                    return VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET;
-+                    /* matched! */
-+                    return RTLDRELF_NAME(ReturnSymbol)(pModElf, &paSyms[iSym], uBaseAddr, pValue);
-                 }
-             }
-         }
-@@ -1127,23 +1361,47 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E
- 
- 
- /**
-- * Helper that locates the first allocated section.
-+ * Locate the next allocated section by RVA (sh_addr).
-+ *
-+ * This is a helper for EnumSegments and SegOffsetToRva.
-  *
-  * @returns Pointer to the section header if found, NULL if none.
-- * @param   pShdr   The section header to start searching at.
-- * @param   cLeft   The number of section headers left to search. Can be 0.
-+ * @param   pModElf     The module instance.
-+ * @param   iShdrCur    The current section header.
-  */
--static const Elf_Shdr *RTLDRELF_NAME(GetFirstAllocatedSection)(const Elf_Shdr *pShdr, unsigned cLeft)
-+static const Elf_Shdr *RTLDRELF_NAME(GetNextAllocatedSection)(PRTLDRMODELF pModElf, unsigned iShdrCur)
- {
--    while (cLeft-- > 0)
-+    unsigned const          cShdrs  = pModElf->Ehdr.e_shnum;
-+    const Elf_Shdr * const  paShdrs = pModElf->paShdrs;
-+    if (pModElf->fShdrInOrder)
-+    {
-+        for (unsigned iShdr = iShdrCur + 1; iShdr < cShdrs; iShdr++)
-+            if (paShdrs[iShdr].sh_flags & SHF_ALLOC)
-+                return &paShdrs[iShdr];
-+    }
-+    else
-     {
--        if (pShdr->sh_flags & SHF_ALLOC)
--            return pShdr;
--        pShdr++;
-+        Elf_Addr const uEndCur = paShdrs[iShdrCur].sh_addr + paShdrs[iShdrCur].sh_size;
-+        Elf_Addr       offBest = ~(Elf_Addr)0;
-+        unsigned       iBest   = cShdrs;
-+        for (unsigned iShdr = pModElf->iFirstSect; iShdr < cShdrs; iShdr++)
-+            if ((paShdrs[iShdr].sh_flags & SHF_ALLOC) && iShdr != iShdrCur)
-+            {
-+                Elf_Addr const offDelta = paShdrs[iShdr].sh_addr - uEndCur;
-+                if (   offDelta < offBest
-+                    && paShdrs[iShdr].sh_addr >= uEndCur)
-+                {
-+                    offBest = offDelta;
-+                    iBest   = iShdr;
-+                }
-+            }
-+        if (iBest < cShdrs)
-+            return &paShdrs[iBest];
-     }
-     return NULL;
- }
- 
-+
- /** @copydoc RTLDROPS::pfnEnumSegments. */
- static DECLCALLBACK(int) RTLDRELF_NAME(EnumSegments)(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
- {
-@@ -1163,15 +1421,23 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E
-     Elf_Addr        uPrevMappedRva = 0;
-     const Elf_Shdr *paShdrs    = pModElf->paShdrs;
-     const Elf_Shdr *paOrgShdrs = pModElf->paOrgShdrs;
--    for (unsigned iShdr = 1; iShdr < pModElf->Ehdr.e_shnum; iShdr++)
-+    for (unsigned iShdr = pModElf->iFirstSect; iShdr < pModElf->Ehdr.e_shnum; iShdr++)
-     {
-         RTLDRSEG Seg;
--        Seg.pszName     = ELF_SH_STR(pModElf, paShdrs[iShdr].sh_name);
--        Seg.cchName     = (uint32_t)strlen(Seg.pszName);
--        if (Seg.cchName == 0)
-+        if (iShdr != 0)
-+        {
-+            Seg.pszName     = ELF_SH_STR(pModElf, paShdrs[iShdr].sh_name);
-+            Seg.cchName     = (uint32_t)strlen(Seg.pszName);
-+            if (Seg.cchName == 0)
-+            {
-+                Seg.pszName = szName;
-+                Seg.cchName = (uint32_t)RTStrPrintf(szName, sizeof(szName), "UnamedSect%02u", iShdr);
-+            }
-+        }
-+        else
-         {
--            Seg.pszName = szName;
--            Seg.cchName = (uint32_t)RTStrPrintf(szName, sizeof(szName), "UnamedSect%02u", iShdr);
-+            Seg.pszName = ".elf.headers";
-+            Seg.cchName = 12;
-         }
-         Seg.SelFlat     = 0;
-         Seg.Sel16bit    = 0;
-@@ -1187,14 +1453,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E
-         {
-             Seg.LinkAddress = paOrgShdrs[iShdr].sh_addr;
-             Seg.RVA         = paShdrs[iShdr].sh_addr;
--            const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetFirstAllocatedSection)(&paShdrs[iShdr + 1],
--                                                                             pModElf->Ehdr.e_shnum - iShdr - 1);
--            if (   pShdr2
--                && pShdr2->sh_addr >= paShdrs[iShdr].sh_addr
--                && Seg.RVA >= uPrevMappedRva)
-+            const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetNextAllocatedSection)(pModElf, iShdr);
-+            if (pShdr2)
-                 Seg.cbMapped = pShdr2->sh_addr - paShdrs[iShdr].sh_addr;
-             else
--                Seg.cbMapped = RT_MAX(paShdrs[iShdr].sh_size, paShdrs[iShdr].sh_addralign);
-+                Seg.cbMapped = pModElf->cbImage - paShdrs[iShdr].sh_addr;
-             uPrevMappedRva = Seg.RVA;
-         }
-         else
-@@ -1230,10 +1493,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(L
-     PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
- 
-     const Elf_Shdr *pShdrEnd = NULL;
--    unsigned        cLeft    = pModElf->Ehdr.e_shnum - 1;
--    const Elf_Shdr *pShdr    = &pModElf->paOrgShdrs[cLeft];
-+    unsigned        cLeft    = pModElf->Ehdr.e_shnum - pModElf->iFirstSect;
-+    const Elf_Shdr *pShdr    = &pModElf->paOrgShdrs[pModElf->Ehdr.e_shnum];
-     while (cLeft-- > 0)
-     {
-+        pShdr--;
-         if (pShdr->sh_flags & SHF_ALLOC)
-         {
-             RTLDRADDR offSeg = LinkAddress - pShdr->sh_addr;
-@@ -1246,13 +1510,12 @@ static DECLCALLBACK(int) RTLDRELF_NAME(L
-             if (offSeg == pShdr->sh_size)
-                 pShdrEnd = pShdr;
-         }
--        pShdr--;
-     }
- 
-     if (pShdrEnd)
-     {
-         *poffSeg = pShdrEnd->sh_size;
--        *piSeg   = pShdrEnd - pModElf->paOrgShdrs - 1;
-+        *piSeg   = pShdrEnd - pModElf->paOrgShdrs - pModElf->iFirstSect;
-         return VINF_SUCCESS;
-     }
- 
-@@ -1268,7 +1531,7 @@ static DECLCALLBACK(int) RTLDRELF_NAME(L
-     RTLDRADDR    offSeg;
-     int rc = RTLDRELF_NAME(LinkAddressToSegOffset)(pMod, LinkAddress, &iSeg, &offSeg);
-     if (RT_SUCCESS(rc))
--        *pRva = pModElf->paShdrs[iSeg + 1].sh_addr + offSeg;
-+        *pRva = pModElf->paShdrs[iSeg + pModElf->iFirstSect].sh_addr + offSeg;
-     return rc;
- }
- 
-@@ -1278,14 +1541,13 @@ static DECLCALLBACK(int) RTLDRELF_NAME(S
-                                                        PRTLDRADDR pRva)
- {
-     PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
--    if (iSeg >= pModElf->Ehdr.e_shnum - 1U)
-+    if (iSeg >= pModElf->Ehdr.e_shnum - pModElf->iFirstSect)
-         return VERR_LDR_INVALID_SEG_OFFSET;
- 
--    iSeg++; /* skip section 0 */
-+    iSeg += pModElf->iFirstSect; /* skip section 0 if not used */
-     if (offSeg > pModElf->paShdrs[iSeg].sh_size)
-     {
--        const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetFirstAllocatedSection)(&pModElf->paShdrs[iSeg + 1],
--                                                                         pModElf->Ehdr.e_shnum - iSeg - 1);
-+        const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetNextAllocatedSection)(pModElf, iSeg);
-         if (   !pShdr2
-             || offSeg > (pShdr2->sh_addr - pModElf->paShdrs[iSeg].sh_addr))
-             return VERR_LDR_INVALID_SEG_OFFSET;
-@@ -1303,13 +1565,13 @@ static DECLCALLBACK(int) RTLDRELF_NAME(S
- static DECLCALLBACK(int) RTLDRELF_NAME(RvaToSegOffset)(PRTLDRMODINTERNAL pMod, RTLDRADDR Rva,
-                                                        uint32_t *piSeg, PRTLDRADDR poffSeg)
- {
--    PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
--
-+    PRTLDRMODELF    pModElf  = (PRTLDRMODELF)pMod;
-     Elf_Addr        PrevAddr = 0;
--    unsigned        cLeft    = pModElf->Ehdr.e_shnum - 1;
--    const Elf_Shdr *pShdr    = &pModElf->paShdrs[cLeft];
-+    unsigned        cLeft    = pModElf->Ehdr.e_shnum - pModElf->iFirstSect;
-+    const Elf_Shdr *pShdr    = &pModElf->paShdrs[pModElf->Ehdr.e_shnum];
-     while (cLeft-- > 0)
-     {
-+        pShdr--;
-         if (pShdr->sh_flags & SHF_ALLOC)
-         {
-             Elf_Addr    cbSeg  = PrevAddr ? PrevAddr - pShdr->sh_addr : pShdr->sh_size;
-@@ -1322,7 +1584,6 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R
-             }
-             PrevAddr = pShdr->sh_addr;
-         }
--        pShdr--;
-     }
- 
-     return VERR_LDR_INVALID_RVA;
-@@ -1413,14 +1674,14 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R
-          * Apply the relocations.
-          */
-         if (pThis->Ehdr.e_type == ET_REL)
--            rc = RTLDRELF_NAME(RelocateSection)(pThis, pThis->LinkAddress,
--                                                RTLDRELF_NAME(GetImportStubCallback), NULL /*pvUser*/,
--                                                pThis->paShdrs[iDbgInfo].sh_addr,
--                                                pThis->paShdrs[iDbgInfo].sh_size,
--                                                (const uint8_t *)pvBuf,
--                                                (uint8_t *)pvBuf,
--                                                pbRelocs,
--                                                pThis->paShdrs[iRelocs].sh_size);
-+            rc = RTLDRELF_NAME(RelocateSectionRel)(pThis, pThis->LinkAddress,
-+                                                   RTLDRELF_NAME(GetImportStubCallback), NULL /*pvUser*/,
-+                                                   pThis->paShdrs[iDbgInfo].sh_addr,
-+                                                   pThis->paShdrs[iDbgInfo].sh_size,
-+                                                   (const uint8_t *)pvBuf,
-+                                                   (uint8_t *)pvBuf,
-+                                                   pbRelocs,
-+                                                   pThis->paShdrs[iRelocs].sh_size);
-         else
-             rc = RTLDRELF_NAME(RelocateSectionExecDyn)(pThis, pThis->LinkAddress,
-                                                        RTLDRELF_NAME(GetImportStubCallback), NULL /*pvUser*/,
-@@ -1562,11 +1823,13 @@ static RTLDROPS RTLDRELF_MID(s_rtldrElf,
-  *
-  * @returns iprt status code.
-  * @param   pEhdr       Pointer to the ELF header.
-- * @param   pszLogName  The log name.
-  * @param   cbRawImage  The size of the raw image.
-+ * @param   pszLogName  The log name.
-+ * @param   penmArch    Where to return the architecture.
-+ * @param   pErrInfo    Where to return extended error info. Optional.
-  */
--static int RTLDRELF_NAME(ValidateElfHeader)(const Elf_Ehdr *pEhdr, const char *pszLogName, uint64_t cbRawImage,
--                                            PRTLDRARCH penmArch)
-+static int RTLDRELF_NAME(ValidateElfHeader)(const Elf_Ehdr *pEhdr, uint64_t cbRawImage, const char *pszLogName,
-+                                            PRTLDRARCH penmArch, PRTERRINFO pErrInfo)
- {
-     Log3(("RTLdrELF:     e_ident: %.*Rhxs\n"
-           "RTLdrELF:      e_type: " FMT_ELF_HALF "\n"
-@@ -1588,48 +1851,31 @@ static int RTLDRELF_NAME(ValidateElfHead
-     if (    pEhdr->e_ident[EI_MAG0] != ELFMAG0
-         ||  pEhdr->e_ident[EI_MAG1] != ELFMAG1
-         ||  pEhdr->e_ident[EI_MAG2] != ELFMAG2
--        ||  pEhdr->e_ident[EI_MAG3] != ELFMAG3
--       )
--    {
--        Log(("RTLdrELF: %s: Invalid ELF magic (%.*Rhxs)\n", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident)); NOREF(pszLogName);
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        ||  pEhdr->e_ident[EI_MAG3] != ELFMAG3)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: Invalid ELF magic (%.*Rhxs)", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident);
-     if (pEhdr->e_ident[EI_CLASS] != RTLDRELF_SUFF(ELFCLASS))
--    {
--        Log(("RTLdrELF: %s: Invalid ELF class (%.*Rhxs)\n", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: Invalid ELF class (%.*Rhxs)", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident);
-     if (pEhdr->e_ident[EI_DATA] != ELFDATA2LSB)
--    {
--        Log(("RTLdrELF: %s: ELF endian %x is unsupported\n", pszLogName, pEhdr->e_ident[EI_DATA]));
--        return VERR_LDRELF_ODD_ENDIAN;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_ODD_ENDIAN,
-+                                   "%s: ELF endian %x is unsupported", pszLogName, pEhdr->e_ident[EI_DATA]);
-     if (pEhdr->e_version != EV_CURRENT)
--    {
--        Log(("RTLdrELF: %s: ELF version %x is unsupported\n", pszLogName, pEhdr->e_version));
--        return VERR_LDRELF_VERSION;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_VERSION,
-+                                   "%s: ELF version %x is unsupported", pszLogName, pEhdr->e_version);
- 
-     if (sizeof(Elf_Ehdr) != pEhdr->e_ehsize)
--    {
--        Log(("RTLdrELF: %s: Elf header e_ehsize is %d expected %d!\n",
--             pszLogName, pEhdr->e_ehsize, sizeof(Elf_Ehdr)));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: Elf header e_ehsize is %d expected %d!", pszLogName, pEhdr->e_ehsize, sizeof(Elf_Ehdr));
-     if (    sizeof(Elf_Phdr) != pEhdr->e_phentsize
--        &&  (    pEhdr->e_phnum != 0
--             ||  pEhdr->e_type == ET_DYN))
--    {
--        Log(("RTLdrELF: %s: Elf header e_phentsize is %d expected %d!\n",
--             pszLogName, pEhdr->e_phentsize, sizeof(Elf_Phdr)));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        &&  (   pEhdr->e_phnum != 0
-+             || pEhdr->e_type == ET_DYN
-+             || pEhdr->e_type == ET_EXEC))
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Elf header e_phentsize is %d expected %d!",
-+                                   pszLogName, pEhdr->e_phentsize, sizeof(Elf_Phdr));
-     if (sizeof(Elf_Shdr) != pEhdr->e_shentsize)
--    {
--        Log(("RTLdrELF: %s: Elf header e_shentsize is %d expected %d!\n",
--             pszLogName, pEhdr->e_shentsize, sizeof(Elf_Shdr)));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Elf header e_shentsize is %d expected %d!",
-+                                   pszLogName, pEhdr->e_shentsize, sizeof(Elf_Shdr));
- 
-     switch (pEhdr->e_type)
-     {
-@@ -1638,8 +1884,8 @@ static int RTLDRELF_NAME(ValidateElfHead
-         case ET_DYN:
-             break;
-         default:
--            Log(("RTLdrELF: %s: image type %#x is not supported!\n", pszLogName, pEhdr->e_type));
--            return VERR_BAD_EXE_FORMAT;
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: image type %#x is not supported!",
-+                                       pszLogName, pEhdr->e_type);
-     }
- 
-     switch (pEhdr->e_machine)
-@@ -1655,52 +1901,43 @@ static int RTLDRELF_NAME(ValidateElfHead
-             break;
- #endif
-         default:
--            Log(("RTLdrELF: %s: machine type %u is not supported!\n", pszLogName, pEhdr->e_machine));
--            return VERR_LDRELF_MACHINE;
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_MACHINE,
-+                                       "%s: machine type %u is not supported!", pszLogName, pEhdr->e_machine);
-     }
- 
-     if (    pEhdr->e_phoff < pEhdr->e_ehsize
-         &&  !(pEhdr->e_phoff && pEhdr->e_phnum)
-         &&  pEhdr->e_phnum)
--    {
--        Log(("RTLdrELF: %s: The program headers overlap with the ELF header! e_phoff=" FMT_ELF_OFF "\n",
--             pszLogName, pEhdr->e_phoff));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: The program headers overlap with the ELF header! e_phoff=" FMT_ELF_OFF,
-+                                   pszLogName, pEhdr->e_phoff);
-     if (    pEhdr->e_phoff + pEhdr->e_phnum * pEhdr->e_phentsize > cbRawImage
-         ||  pEhdr->e_phoff + pEhdr->e_phnum * pEhdr->e_phentsize < pEhdr->e_phoff)
--    {
--        Log(("RTLdrELF: %s: The program headers extends beyond the file! e_phoff=" FMT_ELF_OFF " e_phnum=" FMT_ELF_HALF "\n",
--             pszLogName, pEhdr->e_phoff, pEhdr->e_phnum));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: The program headers extends beyond the file! e_phoff=" FMT_ELF_OFF " e_phnum=" FMT_ELF_HALF,
-+                                   pszLogName, pEhdr->e_phoff, pEhdr->e_phnum);
- 
- 
-     if (    pEhdr->e_shoff < pEhdr->e_ehsize
-         &&  !(pEhdr->e_shoff && pEhdr->e_shnum))
--    {
--        Log(("RTLdrELF: %s: The section headers overlap with the ELF header! e_shoff=" FMT_ELF_OFF "\n",
--             pszLogName, pEhdr->e_shoff));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: The section headers overlap with the ELF header! e_shoff=" FMT_ELF_OFF,
-+                                   pszLogName, pEhdr->e_shoff);
-     if (    pEhdr->e_shoff + pEhdr->e_shnum * pEhdr->e_shentsize > cbRawImage
-         ||  pEhdr->e_shoff + pEhdr->e_shnum * pEhdr->e_shentsize < pEhdr->e_shoff)
--    {
--        Log(("RTLdrELF: %s: The section headers extends beyond the file! e_shoff=" FMT_ELF_OFF " e_shnum=" FMT_ELF_HALF "\n",
--             pszLogName, pEhdr->e_shoff, pEhdr->e_shnum));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: The section headers extends beyond the file! e_shoff=" FMT_ELF_OFF " e_shnum=" FMT_ELF_HALF,
-+                                   pszLogName, pEhdr->e_shoff, pEhdr->e_shnum);
- 
-     if (pEhdr->e_shstrndx == 0 || pEhdr->e_shstrndx > pEhdr->e_shnum)
--    {
--        Log(("RTLdrELF: %s: The section headers string table is out of bounds! e_shstrndx=" FMT_ELF_HALF " e_shnum=" FMT_ELF_HALF "\n",
--             pszLogName, pEhdr->e_shstrndx, pEhdr->e_shnum));
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: The section headers string table is out of bounds! e_shstrndx=" FMT_ELF_HALF " e_shnum=" FMT_ELF_HALF,
-+                                   pszLogName, pEhdr->e_shstrndx, pEhdr->e_shnum);
- 
-     return VINF_SUCCESS;
- }
- 
-+
- /**
-  * Gets the section header name.
-  *
-@@ -1741,10 +1978,12 @@ const char *RTLDRELF_NAME(GetSHdrName)(P
-  * @param   pModElf     Pointer to the module structure.
-  * @param   iShdr       The index of section header which should be validated.
-  *                      The section headers are found in the pModElf->paShdrs array.
-- * @param   pszLogName  The log name.
-  * @param   cbRawImage  The size of the raw image.
-+ * @param   pszLogName  The log name.
-+ * @param   pErrInfo    Where to return extended error info. Optional.
-  */
--static int RTLDRELF_NAME(ValidateSectionHeader)(PRTLDRMODELF pModElf, unsigned iShdr, const char *pszLogName, uint64_t cbRawImage)
-+static int RTLDRELF_NAME(ValidateSectionHeader)(PRTLDRMODELF pModElf, unsigned iShdr, uint64_t cbRawImage,
-+                                                const char *pszLogName, PRTERRINFO pErrInfo)
- {
-     const Elf_Shdr *pShdr = &pModElf->paShdrs[iShdr];
-     char szSectionName[80]; NOREF(szSectionName);
-@@ -1776,37 +2015,29 @@ static int RTLDRELF_NAME(ValidateSection
-             || pShdr->sh_link       != SHN_UNDEF
-             || pShdr->sh_addralign  != 0
-             || pShdr->sh_entsize    != 0 )
--        {
--            Log(("RTLdrELF: %s: Bad #0 section: %.*Rhxs\n", pszLogName, sizeof(*pShdr), pShdr ));
--            return VERR_BAD_EXE_FORMAT;
--        }
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                       "%s: Bad #0 section: %.*Rhxs", pszLogName, sizeof(*pShdr), pShdr);
-         return VINF_SUCCESS;
-     }
- 
-     if (pShdr->sh_name >= pModElf->cbShStr)
--    {
--        Log(("RTLdrELF: %s: Shdr #%d: sh_name (%d) is beyond the end of the section header string table (%d)!\n",
--             pszLogName, iShdr, pShdr->sh_name, pModElf->cbShStr)); NOREF(pszLogName);
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: Shdr #%d: sh_name (%d) is beyond the end of the section header string table (%d)!",
-+                                   pszLogName, iShdr, pShdr->sh_name, pModElf->cbShStr);
- 
-     if (pShdr->sh_link >= pModElf->Ehdr.e_shnum)
--    {
--        Log(("RTLdrELF: %s: Shdr #%d: sh_link (%d) is beyond the end of the section table (%d)!\n",
--             pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum)); NOREF(pszLogName);
--        return VERR_BAD_EXE_FORMAT;
--    }
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: Shdr #%d: sh_link (%d) is beyond the end of the section table (%d)!",
-+                                   pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum);
- 
-     switch (pShdr->sh_type)
-     {
-         /** @todo find specs and check up which sh_info fields indicates section table entries */
-         case 12301230:
-             if (pShdr->sh_info >= pModElf->Ehdr.e_shnum)
--            {
--                Log(("RTLdrELF: %s: Shdr #%d: sh_info (%d) is beyond the end of the section table (%d)!\n",
--                     pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum));
--                return VERR_BAD_EXE_FORMAT;
--            }
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: Shdr #%d: sh_info (%d) is beyond the end of the section table (%d)!",
-+                                           pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum);
-             break;
- 
-         case SHT_NULL:
-@@ -1840,18 +2071,740 @@ static int RTLDRELF_NAME(ValidateSection
-         uint64_t offEnd = pShdr->sh_offset + pShdr->sh_size;
-         if (    offEnd > cbRawImage
-             ||  offEnd < (uint64_t)pShdr->sh_offset)
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                       "%s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD " = %RX64) is beyond the end of the file (%RX64)!",
-+                                       pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size, offEnd, cbRawImage);
-+        if (pShdr->sh_offset < sizeof(Elf_Ehdr))
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                       "%s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD ") is starting in the ELF header!",
-+                                       pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size);
-+    }
-+
-+    return VINF_SUCCESS;
-+}
-+
-+
-+/**
-+ * Process the section headers.
-+ *
-+ * @returns iprt status code.
-+ * @param   pModElf     Pointer to the module structure.
-+ * @param   paShdrs     The section headers.
-+ * @param   cbRawImage  The size of the raw image.
-+ * @param   pszLogName  The log name.
-+ * @param   pErrInfo    Where to return extended error info. Optional.
-+ */
-+static int RTLDRELF_NAME(ValidateAndProcessSectionHeaders)(PRTLDRMODELF pModElf, Elf_Shdr *paShdrs, uint64_t cbRawImage,
-+                                                           const char *pszLogName, PRTERRINFO pErrInfo)
-+{
-+    Elf_Addr uNextAddr = 0;
-+    for (unsigned i = 0; i < pModElf->Ehdr.e_shnum; i++)
-+    {
-+        int rc = RTLDRELF_NAME(ValidateSectionHeader)(pModElf, i, cbRawImage, pszLogName, pErrInfo);
-+        if (RT_FAILURE(rc))
-+            return rc;
-+
-+        /*
-+         * We're looking for symbol tables.
-+         */
-+        if (paShdrs[i].sh_type == SHT_SYMTAB)
-         {
--            Log(("RTLdrELF: %s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD " = %RX64) is beyond the end of the file (%RX64)!\n",
--                 pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size, offEnd, cbRawImage));
--            return VERR_BAD_EXE_FORMAT;
-+            if (pModElf->Rel.iSymSh != ~0U)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_MULTIPLE_SYMTABS,
-+                                           "%s: Multiple symbol tabs! iSymSh=%d i=%d", pszLogName, pModElf->Rel.iSymSh, i);
-+            pModElf->Rel.iSymSh = i;
-+            pModElf->Rel.cSyms  = (unsigned)(paShdrs[i].sh_size / sizeof(Elf_Sym));
-+            AssertBreakStmt(pModElf->Rel.cSyms == paShdrs[i].sh_size / sizeof(Elf_Sym), rc = VERR_IMAGE_TOO_BIG);
-+            pModElf->Rel.iStrSh = paShdrs[i].sh_link;
-+            pModElf->Rel.cbStr  = (unsigned)paShdrs[pModElf->Rel.iStrSh].sh_size;
-+            AssertBreakStmt(pModElf->Rel.cbStr == paShdrs[pModElf->Rel.iStrSh].sh_size, rc = VERR_IMAGE_TOO_BIG);
-+        }
-+        else if (paShdrs[i].sh_type == SHT_DYNSYM)
-+        {
-+            if (pModElf->Dyn.iSymSh != ~0U)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_MULTIPLE_SYMTABS,
-+                                           "%s: Multiple dynamic symbol tabs! iSymSh=%d i=%d", pszLogName, pModElf->Dyn.iSymSh, i);
-+            if (pModElf->Ehdr.e_type != ET_DYN && pModElf->Ehdr.e_type != ET_EXEC)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: Unexpected SHT_DYNSYM (i=%d) for e_type=%d", pszLogName, i, pModElf->Ehdr.e_type);
-+            pModElf->Dyn.iSymSh = i;
-+            pModElf->Dyn.cSyms  = (unsigned)(paShdrs[i].sh_size / sizeof(Elf_Sym));
-+            AssertBreakStmt(pModElf->Dyn.cSyms == paShdrs[i].sh_size / sizeof(Elf_Sym), rc = VERR_IMAGE_TOO_BIG);
-+            pModElf->Dyn.iStrSh = paShdrs[i].sh_link;
-+            pModElf->Dyn.cbStr  = (unsigned)paShdrs[pModElf->Dyn.iStrSh].sh_size;
-+            AssertBreakStmt(pModElf->Dyn.cbStr == paShdrs[pModElf->Dyn.iStrSh].sh_size, rc = VERR_IMAGE_TOO_BIG);
-         }
--        if (pShdr->sh_offset < sizeof(Elf_Ehdr))
-+        /*
-+         * We're also look for the dynamic section.
-+         */
-+        else if (paShdrs[i].sh_type == SHT_DYNAMIC)
-+        {
-+            if (pModElf->iShDynamic != ~0U)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: Multiple dynamic sections! iShDynamic=%d i=%d",
-+                                           pszLogName, pModElf->iShDynamic, i);
-+            if (pModElf->Ehdr.e_type != ET_DYN && pModElf->Ehdr.e_type != ET_EXEC)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: Unexpected SHT_DYNAMIC (i=%d) for e_type=%d", pszLogName, i, pModElf->Ehdr.e_type);
-+            if (paShdrs[i].sh_entsize != sizeof(Elf_Dyn))
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: SHT_DYNAMIC (i=%d) sh_entsize=" FMT_ELF_XWORD ",  expected %#zx",
-+                                           pszLogName, i, paShdrs[i].sh_entsize, sizeof(Elf_Dyn));
-+            pModElf->iShDynamic = i;
-+            Elf_Xword const cDynamic = paShdrs[i].sh_size / sizeof(Elf_Dyn);
-+            if (cDynamic > _64K || cDynamic < 2)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: SHT_DYNAMIC (i=%d) sh_size=" FMT_ELF_XWORD " is out of range (2..64K)",
-+                                           pszLogName, i, paShdrs[i].sh_size);
-+            pModElf->cDynamic = (unsigned)cDynamic;
-+        }
-+
-+        /*
-+         * Special checks for the section string table.
-+         */
-+        if (i == pModElf->Ehdr.e_shstrndx)
-         {
--            Log(("RTLdrELF: %s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD ") is starting in the ELF header!\n",
--                 pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size));
--            return VERR_BAD_EXE_FORMAT;
-+            if (paShdrs[i].sh_type != SHT_STRTAB)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: Section header string table is not a SHT_STRTAB: %#x",
-+                                           pszLogName, paShdrs[i].sh_type);
-+            if (paShdrs[i].sh_size == 0)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Section header string table is empty", pszLogName);
-         }
-+
-+        /*
-+         * Kluge for the .data..percpu segment in 64-bit linux kernels.
-+         */
-+        if (paShdrs[i].sh_flags & SHF_ALLOC)
-+        {
-+            if (   paShdrs[i].sh_addr == 0
-+                && paShdrs[i].sh_addr < uNextAddr)
-+            {
-+                Elf_Addr uAddr = RT_ALIGN_T(uNextAddr, paShdrs[i].sh_addralign, Elf_Addr);
-+                Log(("RTLdrElf: Out of order section #%d; adjusting sh_addr from " FMT_ELF_ADDR " to " FMT_ELF_ADDR "\n",
-+                     i, paShdrs[i].sh_addr, uAddr));
-+                paShdrs[i].sh_addr = uAddr;
-+            }
-+            uNextAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size;
-+        }
-+    } /* for each section header */
-+
-+    return VINF_SUCCESS;
-+}
-+
-+
-+/**
-+ * Process the section headers.
-+ *
-+ * @returns iprt status code.
-+ * @param   pModElf     Pointer to the module structure.
-+ * @param   paShdrs     The section headers.
-+ * @param   cbRawImage  The size of the raw image.
-+ * @param   pszLogName  The log name.
-+ * @param   pErrInfo    Where to return extended error info. Optional.
-+ */
-+static int RTLDRELF_NAME(ValidateAndProcessDynamicInfo)(PRTLDRMODELF pModElf, uint64_t cbRawImage, uint32_t fFlags,
-+                                                        const char *pszLogName, PRTERRINFO pErrInfo)
-+{
-+    /*
-+     * Check preconditions.
-+     */
-+    AssertReturn(pModElf->Ehdr.e_type == ET_DYN || pModElf->Ehdr.e_type == ET_EXEC, VERR_INTERNAL_ERROR_2);
-+    if (pModElf->Ehdr.e_phnum <= 1 || pModElf->Ehdr.e_phnum >= _32K)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                   "%s: e_phnum=%u is out of bounds (2..32K)", pszLogName, pModElf->Ehdr.e_phnum);
-+    if (pModElf->iShDynamic == ~0U)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: no .dynamic section", pszLogName);
-+    AssertReturn(pModElf->cDynamic > 1 && pModElf->cDynamic <= _64K, VERR_INTERNAL_ERROR_3);
-+
-+    /* ASSUME that the sections are ordered by address.  That simplifies
-+       validation code further down. */
-+    AssertReturn(pModElf->Ehdr.e_shnum >= 2, VERR_INTERNAL_ERROR_4);
-+    Elf_Shdr const *paShdrs  = pModElf->paShdrs;
-+    Elf_Addr        uPrevEnd = paShdrs[1].sh_addr + paShdrs[1].sh_size;
-+    for (unsigned i = 2; i < pModElf->Ehdr.e_shnum; i++)
-+        if (paShdrs[i].sh_flags & SHF_ALLOC)
-+        {
-+            if (uPrevEnd > paShdrs[i].sh_addr)
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                           "%s: section %u is out of order: uPrevEnd=" FMT_ELF_ADDR " sh_addr=" FMT_ELF_ADDR,
-+                                           pszLogName, i, uPrevEnd, paShdrs[i].sh_addr);
-+            uPrevEnd = paShdrs[i].sh_addr + paShdrs[i].sh_size;
-+        }
-+
-+    /* Must have string and symbol tables. */
-+    if (pModElf->Dyn.iStrSh == ~0U)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: No dynamic string table section", pszLogName);
-+    if (pModElf->Dyn.iSymSh == ~0U)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: No dynamic symbol table section", pszLogName);
-+
-+    /*
-+     * Load the program headers.
-+     */
-+    size_t const cbPhdrs = sizeof(pModElf->paPhdrs[0]) * pModElf->Ehdr.e_phnum;
-+    Elf_Phdr    *paPhdrs = (Elf_Phdr *)RTMemAllocZ(cbPhdrs);
-+    pModElf->paPhdrs = paPhdrs;
-+    AssertReturn(paPhdrs, VERR_NO_MEMORY);
-+
-+    int rc = pModElf->Core.pReader->pfnRead(pModElf->Core.pReader, paPhdrs, cbPhdrs, pModElf->Ehdr.e_phoff);
-+    if (RT_FAILURE(rc))
-+        return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: pfnRead(,,%#zx, " FMT_ELF_OFF ") -> %Rrc",
-+                                   pszLogName, cbPhdrs, pModElf->Ehdr.e_phoff, rc);
-+
-+    /*
-+     * Validate them.
-+     */
-+    unsigned cbPage = _4K; /** @todo generalize architecture specific stuff using its own code template header.  */
-+    switch (pModElf->Core.enmArch)
-+    {
-+        case RTLDRARCH_AMD64:
-+        case RTLDRARCH_X86_32:
-+            break;
-+        default:
-+            AssertFailedBreak(/** @todo page size for got.plt hacks */);
-     }
-+    unsigned iLoad          = 0;
-+    unsigned iLoadShdr      = 1; /* ASSUMES ordered (checked above). */
-+    unsigned cDynamic       = 0;
-+    Elf_Addr cbImage        = 0;
-+    Elf_Addr uLinkAddress   = ~(Elf_Addr)0;
-+    for (unsigned i = 0; i < pModElf->Ehdr.e_phnum; i++)
-+    {
-+        const Elf_Phdr * const pPhdr = &paPhdrs[i];
-+        Log3(("RTLdrELF: Program Header #%d:\n"
-+              "RTLdrELF:   p_type: " FMT_ELF_WORD " (%s)\n"
-+              "RTLdrELF:  p_flags: " FMT_ELF_WORD "\n"
-+              "RTLdrELF: p_offset: " FMT_ELF_OFF "\n"
-+              "RTLdrELF:  p_vaddr: " FMT_ELF_ADDR "\n"
-+              "RTLdrELF:  p_paddr: " FMT_ELF_ADDR "\n"
-+              "RTLdrELF: p_filesz: " FMT_ELF_XWORD "\n"
-+              "RTLdrELF:  p_memsz: " FMT_ELF_XWORD "\n"
-+              "RTLdrELF:  p_align: " FMT_ELF_XWORD "\n",
-+              i,
-+              pPhdr->p_type, rtldrElfGetPhdrType(pPhdr->p_type), pPhdr->p_flags, pPhdr->p_offset,
-+              pPhdr->p_vaddr, pPhdr->p_paddr, pPhdr->p_filesz, pPhdr->p_memsz, pPhdr->p_align));
-+
-+        if (pPhdr->p_type == DT_NULL)
-+            continue;
-+
-+        if (   pPhdr->p_filesz != 0
-+            && (   pPhdr->p_offset >= cbRawImage
-+                || pPhdr->p_filesz > cbRawImage
-+                || pPhdr->p_offset + pPhdr->p_filesz > cbRawImage))
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                       "%s: Prog Hdr #%u: bogus p_offset=" FMT_ELF_OFF " & p_filesz=" FMT_ELF_XWORD " (file size %#RX64)",
-+                                       pszLogName, i, pPhdr->p_offset, pPhdr->p_filesz, cbRawImage);
-+
-+        if (pPhdr->p_flags & ~(Elf64_Word)(PF_X | PF_R | PF_W))
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Prog Hdr #%u: bogus p_flags=" FMT_ELF_WORD,
-+                                       pszLogName, i, pPhdr->p_flags);
-+
-+        if (!RT_IS_POWER_OF_TWO(pPhdr->p_align))
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Prog Hdr #%u: bogus p_align=" FMT_ELF_XWORD,
-+                                       pszLogName, i, pPhdr->p_align);
-+
-+        if (   pPhdr->p_align  > 1
-+            && pPhdr->p_memsz  > 0
-+            && pPhdr->p_filesz > 0
-+            && (pPhdr->p_offset & (pPhdr->p_align - 1)) != (pPhdr->p_vaddr & (pPhdr->p_align - 1)))
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                       "%s: Prog Hdr #%u: misaligned p_offset=" FMT_ELF_OFF " p_vaddr=" FMT_ELF_ADDR " p_align=" FMT_ELF_XWORD,
-+                                       pszLogName, i, pPhdr->p_offset, pPhdr->p_vaddr, pPhdr->p_align);
-+
-+        /* Do some type specfic checks: */
-+        switch (pPhdr->p_type)
-+        {
-+            case PT_LOAD:
-+            {
-+                if (pPhdr->p_memsz < pPhdr->p_filesz)
-+                    return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                               "%s: Prog Hdr #%u/LOAD#%u: bogus p_memsz=" FMT_ELF_XWORD " or p_filesz=" FMT_ELF_XWORD,
-+                                               pszLogName, i, iLoad, pPhdr->p_memsz, pPhdr->p_filesz);
-+                cbImage = pPhdr->p_vaddr + pPhdr->p_memsz;
-+                if (iLoad == 0)
-+                    uLinkAddress = pPhdr->p_vaddr;
-+
-+                /* Find the corresponding sections, checking their addresses and
-+                   file offsets since the rest of the code is still section based
-+                   rather than using program headers as it should... */
-+                Elf_Off         off     = pPhdr->p_offset;
-+                Elf_Addr        uAddr   = pPhdr->p_vaddr;
-+                Elf_Xword       cbMem   = pPhdr->p_memsz;
-+                Elf_Xword       cbFile  = pPhdr->p_filesz;
-+                while (cbMem > 0)
-+                {
-+                    if (iLoadShdr < pModElf->Ehdr.e_shnum)
-+                    { /* likely */ }
-+                    else if (iLoadShdr == pModElf->Ehdr.e_shnum)
-+                    {
-+                        /** @todo anything else to check here? */
-+                        iLoadShdr++;
-+                        break;
-+                    }
-+                    else
-+                        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                                   "%s: Prog Hdr #%u/LOAD#%u: Out of sections at " FMT_ELF_ADDR " LB " FMT_ELF_XWORD,
-+                                                   pszLogName, i, iLoad, uAddr, cbMem);
-+                    if (!(paShdrs[iLoadShdr].sh_flags & SHF_ALLOC))
-+                    {
-+                        if (   paShdrs[iLoadShdr].sh_type != SHT_NOBITS
-+                            && paShdrs[iLoadShdr].sh_size > 0
-+                            && off < paShdrs[iLoadShdr].sh_offset + paShdrs[iLoadShdr].sh_size
-+                            && paShdrs[iLoadShdr].sh_offset < off + cbMem)
-+                            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                                       "%s: Prog Hdr #%u/LOAD#%u: Overlaps with !SHF_ALLOC section at " FMT_ELF_OFF " LB " FMT_ELF_XWORD,
-+                                                       pszLogName, i, iLoad, paShdrs[iLoadShdr].sh_offset, paShdrs[iLoadShdr].sh_size);
-+                        pModElf->paShdrExtras[iLoadShdr].idxPhdr = UINT16_MAX;
-+                        iLoadShdr++;
-+                        continue;
-+                    }
-+
-+                    if (uAddr != paShdrs[iLoadShdr].sh_addr)
-+                    {
-+                        /* Before the first section we expect headers to be loaded, so
-+                           that the file is simply mapped from file offset zero. */
-+                        if (   iLoadShdr == 1
-+                            && iLoad     == 0
-+                            && paShdrs[1].sh_addr == paShdrs[1].sh_offset
-+                            && cbFile    >= paShdrs[1].sh_offset
-+                            && cbMem     >= paShdrs[1].sh_offset)
-+                        {
-+                            /* Modify paShdrs[0] to describe the gap. ".elf.headers" */
-+                            pModElf->iFirstSect              = 0;
-+                            pModElf->paShdrs[0].sh_name      = 0;
-+                            pModElf->paShdrs[0].sh_type      = SHT_PROGBITS;
-+                            pModElf->paShdrs[0].sh_flags     = SHF_ALLOC
-+                                                             | (pPhdr->p_flags & PF_W ? SHF_WRITE     : 0)
-+                                                             | (pPhdr->p_flags & PF_X ? SHF_EXECINSTR : 0);
-+                            pModElf->paShdrs[0].sh_addr      = uAddr;
-+                            pModElf->paShdrs[0].sh_offset    = off;
-+                            pModElf->paShdrs[0].sh_size      = paShdrs[1].sh_offset;
-+                            pModElf->paShdrs[0].sh_link      = 0;
-+                            pModElf->paShdrs[0].sh_info      = 0;
-+                            pModElf->paShdrs[0].sh_addralign = pPhdr->p_align;
-+                            pModElf->paShdrs[0].sh_entsize   = 0;
-+                            *(Elf_Shdr *)pModElf->paOrgShdrs = pModElf->paShdrs[0]; /* (necessary for segment enumeration) */
-+
-+                            uAddr  += paShdrs[1].sh_offset;
-+                            cbMem  -= paShdrs[1].sh_offset;
-+                            cbFile -= paShdrs[1].sh_offset;
-+                            off     = paShdrs[1].sh_offset;
-+                        }
-+                        /* Alignment padding?  Allow up to a page size. */
-+                        else if (   paShdrs[iLoadShdr].sh_addr > uAddr
-+                                 &&   paShdrs[iLoadShdr].sh_addr - uAddr
-+                                    < RT_MAX(paShdrs[iLoadShdr].sh_addralign, cbPage /*got.plt hack*/))
-+                        {
-+                            Elf_Xword cbAlignPadding = paShdrs[iLoadShdr].sh_addr - uAddr;
-+                            if (cbAlignPadding >= cbMem)
-+                                break;
-+                            cbMem -= cbAlignPadding;
-+                            uAddr += cbAlignPadding;
-+                            if (cbFile > cbAlignPadding)
-+                            {
-+                                off    += cbAlignPadding;
-+                                cbFile -= cbAlignPadding;
-+                            }
-+                            else
-+                            {
-+                                off   += cbFile;
-+                                cbFile = 0;
-+                            }
-+                        }
-+                    }
-+
-+                    if (   uAddr == paShdrs[iLoadShdr].sh_addr
-+                        && cbMem >= paShdrs[iLoadShdr].sh_size
-+                        && (  paShdrs[iLoadShdr].sh_type != SHT_NOBITS
-+                            ?    off    == paShdrs[iLoadShdr].sh_offset
-+                              && cbFile >= paShdrs[iLoadShdr].sh_size /* this might be too strict... */
-+                            : cbFile == 0) )
-+                    {
-+                        if (paShdrs[iLoadShdr].sh_type != SHT_NOBITS)
-+                        {
-+                            off    += paShdrs[iLoadShdr].sh_size;
-+                            cbFile -= paShdrs[iLoadShdr].sh_size;
-+                        }
-+                        uAddr += paShdrs[iLoadShdr].sh_size;
-+                        cbMem -= paShdrs[iLoadShdr].sh_size;
-+                    }
-+                    else
-+                        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                                   "%s: Prog Hdr #%u/LOAD#%u: Mismatch at " FMT_ELF_ADDR " LB " FMT_ELF_XWORD " (file " FMT_ELF_OFF " LB " FMT_ELF_XWORD ") with section #%u " FMT_ELF_ADDR " LB " FMT_ELF_XWORD " (file " FMT_ELF_OFF " sh_type=" FMT_ELF_WORD ")",
-+                                                   pszLogName, i, iLoad, uAddr, cbMem, off, cbFile,
-+                                                   iLoadShdr, paShdrs[iLoadShdr].sh_addr, paShdrs[iLoadShdr].sh_size,
-+                                                   paShdrs[iLoadShdr].sh_offset, paShdrs[iLoadShdr].sh_type);
-+
-+                    pModElf->paShdrExtras[iLoadShdr].idxPhdr = iLoad;
-+                    iLoadShdr++;
-+                } /* section loop */
-+
-+                iLoad++;
-+                break;
-+            }
-+
-+            case PT_DYNAMIC:
-+            {
-+                const Elf_Shdr *pShdr = &pModElf->paShdrs[pModElf->iShDynamic];
-+                if (pPhdr->p_offset != pShdr->sh_offset)
-+                    return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                               "%s: Prog Hdr #%u/DYNAMIC: p_offset=" FMT_ELF_OFF " expected " FMT_ELF_OFF,
-+                                               pszLogName, i, pPhdr->p_offset, pShdr->sh_offset);
-+                if (RT_MAX(pPhdr->p_memsz, pPhdr->p_filesz) != pShdr->sh_size)
-+                    return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                               "%s: Prog Hdr #%u/DYNAMIC: expected " FMT_ELF_XWORD " for RT_MAX(p_memsz=" FMT_ELF_XWORD ", p_filesz=" FMT_ELF_XWORD ")",
-+                                               pszLogName, i, pShdr->sh_size, pPhdr->p_memsz, pPhdr->p_filesz);
-+                cDynamic++;
-+                break;
-+            }
-+        }
-+    }
-+
-+    if (iLoad == 0)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: No PT_LOAD program headers", pszLogName);
-+    if (cDynamic != 1)
-+        return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: No program header for the DYNAMIC section", pszLogName);
-+
-+    cbImage -= uLinkAddress;
-+    pModElf->cbImage     = (uint64_t)cbImage;
-+    pModElf->LinkAddress = uLinkAddress;
-+    AssertReturn(pModElf->cbImage == cbImage, VERR_INTERNAL_ERROR_5);
-+    Log3(("RTLdrELF: LinkAddress=" FMT_ELF_ADDR " cbImage=" FMT_ELF_ADDR " (from PT_LOAD)\n", uLinkAddress, cbImage));
-+
-+    for (; iLoadShdr < pModElf->Ehdr.e_shnum; iLoadShdr++)
-+        if (   !(paShdrs[iLoadShdr].sh_flags & SHF_ALLOC)
-+            || paShdrs[iLoadShdr].sh_size == 0)
-+            pModElf->paShdrExtras[iLoadShdr].idxPhdr = UINT16_MAX;
-+        else
-+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                       "%s: No PT_LOAD for section #%u " FMT_ELF_ADDR " LB " FMT_ELF_XWORD " (file " FMT_ELF_OFF " sh_type=" FMT_ELF_WORD ")",
-+                                       pszLogName, iLoadShdr, paShdrs[iLoadShdr].sh_addr, paShdrs[iLoadShdr].sh_size,
-+                                       paShdrs[iLoadShdr].sh_offset, paShdrs[iLoadShdr].sh_type);
-+
-+    /*
-+     * Load and validate the dynamic table.  We have got / will get most of the
-+     * info we need from the section table, so we must make sure this matches up.
-+     */
-+    Log3(("RTLdrELF: Dynamic section - %u entries\n", pModElf->cDynamic));
-+    size_t const    cbDynamic = pModElf->cDynamic * sizeof(pModElf->paDynamic[0]);
-+    Elf_Dyn * const paDynamic = (Elf_Dyn *)RTMemAlloc(cbDynamic);
-+    AssertReturn(paDynamic, VERR_NO_MEMORY);
-+    pModElf->paDynamic = paDynamic;
-+
-+    rc = pModElf->Core.pReader->pfnRead(pModElf->Core.pReader, paDynamic, cbDynamic, paShdrs[pModElf->iShDynamic].sh_offset);
-+    if (RT_FAILURE(rc))
-+        return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: pfnRead(,,%#zx, " FMT_ELF_OFF ") -> %Rrc",
-+                                   pszLogName, cbDynamic, paShdrs[pModElf->iShDynamic].sh_offset, rc);
-+
-+    for (uint32_t i = 0; i < pModElf->cDynamic; i++)
-+    {
-+#define LOG_VALIDATE_PTR_RET(szName) do { \
-+            Log3(("RTLdrELF: DT[%u]: %16s " FMT_ELF_ADDR "\n", i, szName, paDynamic[i].d_un.d_ptr)); \
-+            if ((uint64_t)paDynamic[i].d_un.d_ptr - uLinkAddress < cbImage) { /* likely */ } \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": Invalid address " FMT_ELF_ADDR " (valid range: " FMT_ELF_ADDR " LB " FMT_ELF_ADDR ")", \
-+                                            pszLogName, i, paDynamic[i].d_un.d_ptr, uLinkAddress, cbImage); \
-+        } while (0)
-+#define LOG_VALIDATE_PTR_VAL_RET(szName, uExpected) do { \
-+            Log3(("RTLdrELF: DT[%u]: %16s " FMT_ELF_ADDR "\n", i, szName, (uint64_t)paDynamic[i].d_un.d_ptr)); \
-+            if (paDynamic[i].d_un.d_ptr == (Elf_Addr)(uExpected)) { /* likely */ } \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": " FMT_ELF_ADDR ", expected " FMT_ELF_ADDR, \
-+                                            pszLogName, i, paDynamic[i].d_un.d_ptr, (Elf_Addr)(uExpected)); \
-+        } while (0)
-+#define LOG_VALIDATE_STR_RET(szName) do { \
-+            Log3(("RTLdrELF: DT[%u]: %16s %#RX64\n", i, szName, (uint64_t)paDynamic[i].d_un.d_val)); \
-+            if ((uint64_t)paDynamic[i].d_un.d_val < pModElf->Dyn.cbStr) { /* likely */ } \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": Invalid string table offset %#RX64 (max %#x)", \
-+                                            pszLogName, i, (uint64_t)paDynamic[i].d_un.d_val, pModElf->Dyn.cbStr); \
-+        } while (0)
-+#define LOG_VALIDATE_VAL_RET(szName, uExpected) do { \
-+            Log3(("RTLdrELF: DT[%u]: %16s %#RX64\n", i, szName, (uint64_t)paDynamic[i].d_un.d_val)); \
-+            if ((uint64_t)paDynamic[i].d_un.d_val == (uint64_t)(uExpected)) { /* likely */ } \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": %#RX64, expected %#RX64", \
-+                                            pszLogName, i, (uint64_t)paDynamic[i].d_un.d_val, (uint64_t)(uExpected)); \
-+        } while (0)
-+#define SET_RELOC_TYPE_RET(a_szName, a_uType) do { \
-+            if (pModElf->DynInfo.uRelocType == 0 || pModElf->DynInfo.uRelocType == (a_uType)) \
-+                pModElf->DynInfo.uRelocType = (a_uType); \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Mixing DT_RELA and DT_REL", pszLogName, i); \
-+        } while (0)
-+#define SET_INFO_FIELD_RET(a_szName, a_Field, a_Value, a_UnsetValue, a_szFmt) do { \
-+            if ((a_Field) == (a_UnsetValue) && (a_Value) != (a_UnsetValue)) \
-+                (a_Field) = (a_Value); /* likely */ \
-+            else if ((a_Field) != (a_UnsetValue)) \
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Multiple entries (first value " a_szFmt ", second " a_szFmt ")", pszLogName, i, (a_Field), (a_Value)); \
-+            else if ((a_Value) != (a_UnsetValue)) \
-+                return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Unexpected value " a_szFmt, pszLogName, i, (a_Value)); \
-+        } while (0)
-+#define FIND_MATCHING_SECTION_RET(a_szName, a_ExtraMatchExpr, a_idxShFieldToSet) do { \
-+            unsigned iSh; \
-+            for (iSh = 1; iSh < pModElf->Ehdr.e_shnum; iSh++) \
-+                if (   paShdrs[iSh].sh_addr == paDynamic[i].d_un.d_ptr \
-+                    && (a_ExtraMatchExpr)) \
-+                { \
-+                    (a_idxShFieldToSet) = iSh; \
-+                    if (pModElf->paShdrExtras[iSh].idxDt != UINT16_MAX) \
-+                        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, \
-+                                                   "%s: DT[%u]/" a_szName ": section #%u (" FMT_ELF_ADDR ") already referenced by DT[%u]", \
-+                                                   pszLogName, i, iSh, paShdrs[iSh].sh_addr, pModElf->paShdrExtras[iSh].idxDt); \
-+                    pModElf->paShdrExtras[iSh].idxDt  = i; \
-+                    pModElf->paShdrExtras[iSh].uDtTag = (uint32_t)paDynamic[i].d_tag; \
-+                    break; \
-+                } \
-+            if (iSh < pModElf->Ehdr.e_shnum) { /* likely */ } \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": No matching section for " FMT_ELF_ADDR, pszLogName, i, paDynamic[i].d_un.d_ptr); \
-+        } while (0)
-+#define ONLY_FOR_DEBUG_OR_VALIDATION_RET(a_szName) do { \
-+            if (fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION)) { /* likely */ } \
-+            else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Not supported (" FMT_ELF_ADDR ")", pszLogName, i, paDynamic[i].d_un.d_ptr); \
-+        } while (0)
-+#define LOG_NON_VALUE_ENTRY(a_szName) Log3(("RTLdrELF: DT[%u]: %16s (%#RX64)\n", i, a_szName, (uint64_t)paDynamic[i].d_un.d_val))
-+
-+        switch (paDynamic[i].d_tag)
-+        {
-+            case DT_NULL:
-+                LOG_NON_VALUE_ENTRY("DT_NULL");
-+                for (unsigned iNull = i + 1; iNull < pModElf->cDynamic; iNull++)
-+                    if (paDynamic[i].d_tag == DT_NULL) /* Not technically a bug, but let's try being extremely strict for now */
-+                        LOG_NON_VALUE_ENTRY("DT_NULL");
-+                    else if (!(fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION)))
-+                        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT,
-+                                                   "%s: DT[%u]/DT_NULL: Dynamic section isn't zero padded (extra #%u of #%u)",
-+                                                   pszLogName, i, iNull - i, pModElf->cDynamic - i);
-+                i = pModElf->cDynamic;
-+                break;
-+            case DT_NEEDED:
-+                LOG_VALIDATE_STR_RET("DT_NEEDED");
-+                break;
-+            case DT_PLTRELSZ:
-+                Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_PLTRELSZ", (uint64_t)paDynamic[i].d_un.d_val));
-+                SET_INFO_FIELD_RET("DT_PLTRELSZ", pModElf->DynInfo.cbJmpRelocs, (Elf_Xword)paDynamic[i].d_un.d_val, 0, FMT_ELF_XWORD);
-+                break;
-+            case DT_PLTGOT:
-+                LOG_VALIDATE_PTR_RET("DT_PLTGOT");
-+                break;
-+            case DT_HASH:
-+                LOG_VALIDATE_PTR_RET("DT_HASH");
-+                break;
-+            case DT_STRTAB:
-+                LOG_VALIDATE_PTR_VAL_RET("DT_STRTAB", paShdrs[pModElf->Dyn.iStrSh].sh_addr);
-+                pModElf->paShdrExtras[pModElf->Dyn.iStrSh].idxDt  = i;
-+                pModElf->paShdrExtras[pModElf->Dyn.iSymSh].uDtTag = DT_STRTAB;
-+                break;
-+            case DT_SYMTAB:
-+                LOG_VALIDATE_PTR_VAL_RET("DT_SYMTAB", paShdrs[pModElf->Dyn.iSymSh].sh_addr);
-+                pModElf->paShdrExtras[pModElf->Dyn.iSymSh].idxDt  = i;
-+                pModElf->paShdrExtras[pModElf->Dyn.iSymSh].uDtTag = DT_SYMTAB;
-+                break;
-+            case DT_RELA:
-+                LOG_VALIDATE_PTR_RET("DT_RELA");
-+                SET_RELOC_TYPE_RET("DT_RELA", DT_RELA);
-+                SET_INFO_FIELD_RET("DT_RELA", pModElf->DynInfo.uPtrRelocs, paDynamic[i].d_un.d_ptr, ~(Elf_Addr)0, FMT_ELF_ADDR);
-+                FIND_MATCHING_SECTION_RET("DT_RELA", paShdrs[iSh].sh_type == SHT_RELA, pModElf->DynInfo.idxShRelocs);
-+                break;
-+            case DT_RELASZ:
-+                Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_RELASZ", (uint64_t)paDynamic[i].d_un.d_val));
-+                SET_RELOC_TYPE_RET("DT_RELASZ", DT_RELA);
-+                SET_INFO_FIELD_RET("DT_RELASZ", pModElf->DynInfo.cbRelocs, (Elf_Xword)paDynamic[i].d_un.d_val, 0, FMT_ELF_XWORD);
-+                break;
-+            case DT_RELAENT:
-+                LOG_VALIDATE_VAL_RET("DT_RELAENT", sizeof(Elf_Rela));
-+                SET_RELOC_TYPE_RET("DT_RELAENT", DT_RELA);
-+                SET_INFO_FIELD_RET("DT_RELAENT", pModElf->DynInfo.cbRelocEntry, (unsigned)sizeof(Elf_Rela), 0, "%u");
-+                break;
-+            case DT_STRSZ:
-+                LOG_VALIDATE_VAL_RET("DT_STRSZ", pModElf->Dyn.cbStr);
-+                break;
-+            case DT_SYMENT:
-+                LOG_VALIDATE_VAL_RET("DT_SYMENT", sizeof(Elf_Sym));
-+                break;
-+            case DT_INIT:
-+                LOG_VALIDATE_PTR_RET("DT_INIT");
-+                ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_INIT");
-+                break;
-+            case DT_FINI:
-+                LOG_VALIDATE_PTR_RET("DT_FINI");
-+                ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_FINI");
-+                break;
-+            case DT_SONAME:
-+                LOG_VALIDATE_STR_RET("DT_SONAME");
-+                break;
-+            case DT_RPATH:
-+                LOG_VALIDATE_STR_RET("DT_RPATH");
-+                break;
-+            case DT_SYMBOLIC:
-+                LOG_NON_VALUE_ENTRY("DT_SYMBOLIC");
-+                break;
-+            case DT_REL:
-+                LOG_VALIDATE_PTR_RET("DT_REL");
-+                SET_RELOC_TYPE_RET("DT_REL", DT_REL);
-+                SET_INFO_FIELD_RET("DT_REL", pModElf->DynInfo.uPtrRelocs, paDynamic[i].d_un.d_ptr, ~(Elf_Addr)0, FMT_ELF_ADDR);
-+                FIND_MATCHING_SECTION_RET("DT_REL", paShdrs[iSh].sh_type == SHT_REL, pModElf->DynInfo.idxShRelocs);
-+                break;
-+            case DT_RELSZ:
-+                Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_RELSZ", (uint64_t)paDynamic[i].d_un.d_val));
-+                SET_RELOC_TYPE_RET("DT_RELSZ", DT_REL);
-+                SET_INFO_FIELD_RET("DT_RELSZ", pModElf->DynInfo.cbRelocs, (Elf_Xword)paDynamic[i].d_un.d_val, 0, FMT_ELF_XWORD);
-+                break;
-+            case DT_RELENT:
-+                LOG_VALIDATE_VAL_RET("DT_RELENT", sizeof(Elf_Rel));
-+                SET_RELOC_TYPE_RET("DT_RELENT", DT_REL);
-+                SET_INFO_FIELD_RET("DT_RELENT", pModElf->DynInfo.cbRelocEntry, (unsigned)sizeof(Elf_Rel), 0, "%u");
-+                break;
-+            case DT_PLTREL:
-+                if (paDynamic[i].d_un.d_val != DT_RELA && paDynamic[i].d_un.d_val != DT_REL)
-+                    return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/DT_PLTREL: Invalid value %#RX64",
-+                                               pszLogName, i, (uint64_t)paDynamic[i].d_un.d_val);
-+                Log3(("RTLdrELF: DT[%u]: %16s DT_REL%s\n", i, "DT_PLTREL", paDynamic[i].d_un.d_val == DT_RELA ? "A" : ""));
-+                SET_INFO_FIELD_RET("DT_PLTREL", pModElf->DynInfo.uJmpRelocType, (unsigned)paDynamic[i].d_un.d_val, 0, "%u");
-+                break;
-+            case DT_DEBUG:
-+                LOG_VALIDATE_PTR_RET("DT_DEBUG");
-+                break;
-+            case DT_TEXTREL:
-+                LOG_NON_VALUE_ENTRY("DT_TEXTREL");
-+                break;
-+            case DT_JMPREL:
-+                LOG_VALIDATE_PTR_RET("DT_JMPREL");
-+                SET_INFO_FIELD_RET("DT_JMPREL", pModElf->DynInfo.uPtrJmpRelocs, paDynamic[i].d_un.d_ptr, ~(Elf_Addr)0, FMT_ELF_ADDR);
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb +2 -3
similarity index 94%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb
index 6c036d403c..35dc4953bb 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#5 lore raw

PATCH 5/15 vboxguestdrivers: upgrade 6.1.14 -> 6.1.16

In reply to Armin Kuster

From: Gianfranco Costamagna <[email protected]>

(cherry picked from commit 7839164921ddb340a1bff322a1274c6022cb8565)
---
 ...{vboxguestdrivers_6.1.14.bb => vboxguestdrivers_6.1.16.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.14.bb => vboxguestdrivers_6.1.16.bb} (95%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb +2 -2
similarity index 95%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb
index 35dc4953bb..9282f663b4 100644
@@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
 "
-SRC_URI[md5sum] = "6e4313df24fd00b0dc0437c3746b940d"
-SRC_URI[sha256sum] = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0"
+SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe"
+SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"
 
 S ?= "${WORKDIR}/vbox_module"
 S_task-patch = "${WORKDIR}/${VBOX_NAME}"
Signature · 1 line
2.25.1
#6 lore raw

PATCH 6/15 vboxguestdrivers: fix build against kernel v5.10+

In reply to Armin Kuster

From: Bruce Ashfield <[email protected]>

We need to adjust the vboxguest drivers to build against kernels 5.10+.

These are backports from the virtual box SVN repository and can be dropped in future uprevs.

(cherry picked from commit 22eaac640f80df44108a5565127181c94645a032)
---
 ...-linux-drm-Adjustment-for-Linux-5.10.patch | 321 ++++++++++++++++++
 ...0drv-linux.c-Changes-to-support-the-.patch | 119 +++++++
 ...justment-for-linux-5.10-TASK_SIZE_MA.patch |  46 +++
 .../vboxguestdrivers_6.1.16.bb                |   3 +
 4 files changed, 489 insertions(+)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch new file +321 -0
new file mode 100644
index 0000000000..a444901f8c
@@ -0,0 +1,321 @@
+From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Tue, 15 Dec 2020 22:29:56 +0000
+Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
+
+Upstream-Status: Backport
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@87092 cfe28804-0f27-0410-a406-dd0f0b0b656f
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+
+---
+ src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
+ src/VBox/Additions/linux/drm/vbox_fb.c  |  2 +-
+ .../src/VBox/Additions/linux/drm/vbox_mode.c  |  2 +-
+ src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +++++++++++++++++--
+ 4 files changed, 99 insertions(+), 14 deletions(-)
+
+diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h
+index 8c85371749..7937f2f2d2 100644
+--- a/src/VBox/Additions/linux/drm/vbox_drv.h
++++ b/src/VBox/Additions/linux/drm/vbox_drv.h
+@@ -175,6 +175,9 @@
+ #include <drm/ttm/ttm_placement.h>
+ #include <drm/ttm/ttm_memory.h>
+ #include <drm/ttm/ttm_module.h>
++#if RTLNX_VER_MIN(5,10,0)
++# include <drm/ttm/ttm_resource.h>
++#endif
+ 
+ #include "vboxvideo_guest.h"
+ #include "vboxvideo_vbe.h"
+@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
+ int vbox_gem_create(struct drm_device *dev,
+ 		    u32 size, bool iskernel, struct drm_gem_object **obj);
+ 
+-int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
++#define VBOX_MEM_TYPE_VRAM   0x1
++#define VBOX_MEM_TYPE_SYSTEM 0x2
++
++int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
+ int vbox_bo_unpin(struct vbox_bo *bo);
+ 
+ static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
+@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo)
+ 	ttm_bo_unreserve(&bo->bo);
+ }
+ 
+-void vbox_ttm_placement(struct vbox_bo *bo, int domain);
++void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
+ int vbox_bo_push_sysram(struct vbox_bo *bo);
+ int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
+ 
+diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
+index adead98d3d..7182d9da1a 100644
+--- a/src/VBox/Additions/linux/drm/vbox_fb.c
++++ b/src/VBox/Additions/linux/drm/vbox_fb.c
+@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
++	ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL);
+ 	if (ret) {
+ 		vbox_bo_unreserve(bo);
+ 		return ret;
+diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
+index ce7d135cb6..5557db5ef8 100644
+--- a/src/VBox/Additions/linux/drm/vbox_mode.c
++++ b/src/VBox/Additions/linux/drm/vbox_mode.c
+@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc,
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);
++	ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr);
+ 	vbox_bo_unreserve(bo);
+ 	if (ret)
+ 		return ret;
+diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c
+index bf87aabc05..5eac926a42 100644
+--- a/src/VBox/Additions/linux/drm/vbox_ttm.c
++++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
+@@ -41,6 +41,7 @@
+ #define PLACEMENT_FLAGS(placement) ((placement).flags)
+ #endif
+ 
++
+ static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
+ {
+ 	return container_of(bd, struct vbox_private, ttm.bdev);
+@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struct ttm_buffer_object *bo)
+ 	return false;
+ }
+ 
++#if RTLNX_VER_MAX(5,10,0)
+ static int
+ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
+ 		      struct ttm_mem_type_manager *man)
+@@ -148,6 +150,7 @@ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
+ 
+ 	return 0;
+ }
++#endif
+ 
+ static void
+ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
+@@ -157,7 +160,7 @@ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
+ 	if (!vbox_ttm_bo_is_vbox_bo(bo))
+ 		return;
+ 
+-	vbox_ttm_placement(vboxbo, TTM_PL_FLAG_SYSTEM);
++	vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_SYSTEM);
+ 	*pl = vboxbo->placement;
+ }
+ 
+@@ -167,11 +170,12 @@ static int vbox_bo_verify_access(struct ttm_buffer_object *bo,
+ 	return 0;
+ }
+ 
++#if RTLNX_VER_MAX(5,10,0)
+ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
+ 				   struct ttm_mem_reg *mem)
+ {
+-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+ 	struct vbox_private *vbox = vbox_bdev(bdev);
++	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+ 
+ 	mem->bus.addr = NULL;
+ 	mem->bus.offset = 0;
+@@ -194,12 +198,53 @@ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
+ 	}
+ 	return 0;
+ }
++#else
++static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
++				   struct ttm_resource *mem)
++{
++	struct vbox_private *vbox = vbox_bdev(bdev);
++	mem->bus.addr = NULL;
++	mem->bus.offset = 0;
++	mem->size = mem->num_pages << PAGE_SHIFT;
++	mem->start = 0;
++	mem->bus.is_iomem = false;
++	switch (mem->mem_type) {
++	case TTM_PL_SYSTEM:
++		/* system memory */
++		return 0;
++	case TTM_PL_VRAM:
++		mem->bus.offset = mem->start << PAGE_SHIFT;
++		mem->start = pci_resource_start(vbox->dev->pdev, 0);
++		mem->bus.is_iomem = true;
++		break;
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++#endif
+ 
++
++
++#if RTLNX_VER_MIN(5,10,0)
++static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
++				 struct ttm_resource *mem)
++{
++}
++#else
+ static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
+ 				 struct ttm_mem_reg *mem)
+ {
+ }
++#endif
+ 
++#if RTLNX_VER_MIN(5,10,0)
++static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt)
++{
++	ttm_tt_fini(tt);
++	kfree(tt);
++}
++#else
+ static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
+ {
+ 	ttm_tt_fini(tt);
+@@ -209,6 +254,7 @@ static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
+ static struct ttm_backend_func vbox_tt_backend_func = {
+ 	.destroy = &vbox_ttm_backend_destroy,
+ };
++#endif
+ 
+ #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
+ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
+@@ -226,7 +272,9 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo,
+ 	if (!tt)
+ 		return NULL;
+ 
++#if RTLNX_VER_MAX(5,10,0)
+ 	tt->func = &vbox_tt_backend_func;
++#endif
+ #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
+ 	if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
+ #else
+@@ -261,11 +309,16 @@ static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm)
+ 
+ static struct ttm_bo_driver vbox_bo_driver = {
+ 	.ttm_tt_create = vbox_ttm_tt_create,
++#if RTLNX_VER_MIN(5,10,0)
++	.ttm_tt_destroy = vbox_ttm_tt_destroy,
++#endif
+ #if RTLNX_VER_MAX(4,17,0)
+ 	.ttm_tt_populate = vbox_ttm_tt_populate,
+ 	.ttm_tt_unpopulate = vbox_ttm_tt_unpopulate,
+ #endif
++#if RTLNX_VER_MAX(5,10,0)
+ 	.init_mem_type = vbox_bo_init_mem_type,
++#endif
+ #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
+ 	.eviction_valuable = ttm_bo_eviction_valuable,
+ #endif
+@@ -318,8 +371,13 @@ int vbox_mm_init(struct vbox_private *vbox)
+ #endif
+ 	}
+ 
++#if RTLNX_VER_MIN(5,10,0)
++	ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false,
++			     vbox->available_vram_size >> PAGE_SHIFT);
++#else
+ 	ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM,
+ 			     vbox->available_vram_size >> PAGE_SHIFT);
++#endif
+ 	if (ret) {
+ 		DRM_ERROR("Failed ttm VRAM init: %d\n", ret);
+ 		goto err_device_release;
+@@ -359,7 +417,7 @@ void vbox_mm_fini(struct vbox_private *vbox)
+ #endif
+ }
+ 
+-void vbox_ttm_placement(struct vbox_bo *bo, int domain)
++void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type)
+ {
+ 	u32 c = 0;
+ #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
+@@ -372,15 +430,36 @@ void vbox_ttm_placement(struct vbox_bo *bo, int domain)
+ 	bo->placement.placement = bo->placements;
+ 	bo->placement.busy_placement = bo->placements;
+ 
+-	if (domain & TTM_PL_FLAG_VRAM)
++	if (mem_type & VBOX_MEM_TYPE_VRAM) {
++#if RTLNX_VER_MIN(5,10,0)
++		bo->placements[c].mem_type = TTM_PL_VRAM;
++		PLACEMENT_FLAGS(bo->placements[c++]) =
++		    TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
++#else
+ 		PLACEMENT_FLAGS(bo->placements[c++]) =
+ 		    TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
+-	if (domain & TTM_PL_FLAG_SYSTEM)
++#endif
++	}
++	if (mem_type & VBOX_MEM_TYPE_SYSTEM) {
++#if RTLNX_VER_MIN(5,10,0)
++		bo->placements[c].mem_type = TTM_PL_SYSTEM;
++		PLACEMENT_FLAGS(bo->placements[c++]) =
++		    TTM_PL_MASK_CACHING;
++#else
+ 		PLACEMENT_FLAGS(bo->placements[c++]) =
+ 		    TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+-	if (!c)
++#endif
++	}
++	if (!c) {
++#if RTLNX_VER_MIN(5,10,0)
++		bo->placements[c].mem_type = TTM_PL_SYSTEM;
++		PLACEMENT_FLAGS(bo->placements[c++]) =
++		    TTM_PL_MASK_CACHING;
++#else
+ 		PLACEMENT_FLAGS(bo->placements[c++]) =
+ 		    TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
++#endif
++	}
+ 
+ 	bo->placement.num_placement = c;
+ 	bo->placement.num_busy_placement = c;
+@@ -414,7 +493,7 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
+ 	vboxbo->bo.bdev->dev_mapping = dev->dev_mapping;
+ #endif
+ 
+-	vbox_ttm_placement(vboxbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
++	vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM);
+ 
+ 	acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size,
+ 				       sizeof(struct vbox_bo));
+@@ -452,7 +531,7 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
+ #endif
+ }
+ 
+-int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
++int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
+ {
+ #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
+ 	struct ttm_operation_ctx ctx = { false, false };
+@@ -467,7 +546,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
+ 		return 0;
+ 	}
+ 
+-	vbox_ttm_placement(bo, pl_flag);
++	vbox_ttm_placement(bo, mem_type);
+ 
+ 	for (i = 0; i < bo->placement.num_placement; i++)
+ 		PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
+@@ -540,7 +619,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
+ 	if (bo->kmap.virtual)
+ 		ttm_bo_kunmap(&bo->kmap);
+ 
+-	vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);
++	vbox_ttm_placement(bo, VBOX_MEM_TYPE_SYSTEM);
+ 
+ 	for (i = 0; i < bo->placement.num_placement; i++)
+ 		PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
+-- 
+2.19.1
+
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch new file +119 -0

119 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch new file +46 -0

46 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb +3 -0
index 9282f663b4..ff639c09f0 100644
@@ -13,6 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
+    file://0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch \
+    file://0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch \
+    file://0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch \
 "
 SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe"
 SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"
Signature · 1 line
2.25.1
#7 lore raw

PATCH 7/15 vboxguestdrivers: upgrade 6.1.16 -> 6.1.18

In reply to Armin Kuster

From: Gianfranco <[email protected]>

Drop kernel 5.10 build fixes patches, now part of upstream codebase

(cherry picked from commit f8f2331158b33436bd53142e0e1b4b94f78b37e6)
---
 ...-linux-drm-Adjustment-for-Linux-5.10.patch | 321 ------------------
 ...0drv-linux.c-Changes-to-support-the-.patch | 119 -------
 ...justment-for-linux-5.10-TASK_SIZE_MA.patch |  46 ---
 ...s_6.1.16.bb => vboxguestdrivers_6.1.18.bb} |   7 +-
 4 files changed, 2 insertions(+), 491 deletions(-)
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.16.bb => vboxguestdrivers_6.1.18.bb} (88%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch deleted +0 -321
deleted file mode 100644
index a444901f8c..0000000000
@@ -1,321 +0,0 @@
-From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Tue, 15 Dec 2020 22:29:56 +0000
-Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87092 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield <[email protected]>
-
----
- src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
- src/VBox/Additions/linux/drm/vbox_fb.c  |  2 +-
- .../src/VBox/Additions/linux/drm/vbox_mode.c  |  2 +-
- src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +++++++++++++++++--
- 4 files changed, 99 insertions(+), 14 deletions(-)
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h
-index 8c85371749..7937f2f2d2 100644
---- a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -175,6 +175,9 @@
- #include <drm/ttm/ttm_placement.h>
- #include <drm/ttm/ttm_memory.h>
- #include <drm/ttm/ttm_module.h>
-+#if RTLNX_VER_MIN(5,10,0)
-+# include <drm/ttm/ttm_resource.h>
-+#endif
- 
- #include "vboxvideo_guest.h"
- #include "vboxvideo_vbe.h"
-@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
- int vbox_gem_create(struct drm_device *dev,
- 		    u32 size, bool iskernel, struct drm_gem_object **obj);
- 
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
-+#define VBOX_MEM_TYPE_VRAM   0x1
-+#define VBOX_MEM_TYPE_SYSTEM 0x2
-+
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
- int vbox_bo_unpin(struct vbox_bo *bo);
- 
- static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
-@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo)
- 	ttm_bo_unreserve(&bo->bo);
- }
- 
--void vbox_ttm_placement(struct vbox_bo *bo, int domain);
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
- int vbox_bo_push_sysram(struct vbox_bo *bo);
- int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
- 
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
-index adead98d3d..7182d9da1a 100644
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- 	if (ret)
- 		return ret;
- 
--	ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-+	ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL);
- 	if (ret) {
- 		vbox_bo_unreserve(bo);
- 		return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
-index ce7d135cb6..5557db5ef8 100644
---- a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc,
- 	if (ret)
- 		return ret;
- 
--	ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);
-+	ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr);
- 	vbox_bo_unreserve(bo);
- 	if (ret)
- 		return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bf87aabc05..5eac926a42 100644
---- a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -41,6 +41,7 @@
- #define PLACEMENT_FLAGS(placement) ((placement).flags)
- #endif
- 
-+
- static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
- {
- 	return container_of(bd, struct vbox_private, ttm.bdev);
-@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struct ttm_buffer_object *bo)
- 	return false;
- }
- 
-+#if RTLNX_VER_MAX(5,10,0)
- static int
- vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
- 		      struct ttm_mem_type_manager *man)
-@@ -148,6 +150,7 @@ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
- 
- 	return 0;
- }
-+#endif
- 
- static void
- vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
-@@ -157,7 +160,7 @@ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
- 	if (!vbox_ttm_bo_is_vbox_bo(bo))
- 		return;
- 
--	vbox_ttm_placement(vboxbo, TTM_PL_FLAG_SYSTEM);
-+	vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_SYSTEM);
- 	*pl = vboxbo->placement;
- }
- 
-@@ -167,11 +170,12 @@ static int vbox_bo_verify_access(struct ttm_buffer_object *bo,
- 	return 0;
- }
- 
-+#if RTLNX_VER_MAX(5,10,0)
- static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
- 				   struct ttm_mem_reg *mem)
- {
--	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- 	struct vbox_private *vbox = vbox_bdev(bdev);
-+	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- 
- 	mem->bus.addr = NULL;
- 	mem->bus.offset = 0;
-@@ -194,12 +198,53 @@ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
- 	}
- 	return 0;
- }
-+#else
-+static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
-+				   struct ttm_resource *mem)
-+{
-+	struct vbox_private *vbox = vbox_bdev(bdev);
-+	mem->bus.addr = NULL;
-+	mem->bus.offset = 0;
-+	mem->size = mem->num_pages << PAGE_SHIFT;
-+	mem->start = 0;
-+	mem->bus.is_iomem = false;
-+	switch (mem->mem_type) {
-+	case TTM_PL_SYSTEM:
-+		/* system memory */
-+		return 0;
-+	case TTM_PL_VRAM:
-+		mem->bus.offset = mem->start << PAGE_SHIFT;
-+		mem->start = pci_resource_start(vbox->dev->pdev, 0);
-+		mem->bus.is_iomem = true;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+#endif
- 
-+
-+
-+#if RTLNX_VER_MIN(5,10,0)
-+static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
-+				 struct ttm_resource *mem)
-+{
-+}
-+#else
- static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
- 				 struct ttm_mem_reg *mem)
- {
- }
-+#endif
- 
-+#if RTLNX_VER_MIN(5,10,0)
-+static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt)
-+{
-+	ttm_tt_fini(tt);
-+	kfree(tt);
-+}
-+#else
- static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
- {
- 	ttm_tt_fini(tt);
-@@ -209,6 +254,7 @@ static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
- static struct ttm_backend_func vbox_tt_backend_func = {
- 	.destroy = &vbox_ttm_backend_destroy,
- };
-+#endif
- 
- #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
- static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
-@@ -226,7 +272,9 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo,
- 	if (!tt)
- 		return NULL;
- 
-+#if RTLNX_VER_MAX(5,10,0)
- 	tt->func = &vbox_tt_backend_func;
-+#endif
- #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
- 	if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
- #else
-@@ -261,11 +309,16 @@ static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm)
- 
- static struct ttm_bo_driver vbox_bo_driver = {
- 	.ttm_tt_create = vbox_ttm_tt_create,
-+#if RTLNX_VER_MIN(5,10,0)
-+	.ttm_tt_destroy = vbox_ttm_tt_destroy,
-+#endif
- #if RTLNX_VER_MAX(4,17,0)
- 	.ttm_tt_populate = vbox_ttm_tt_populate,
- 	.ttm_tt_unpopulate = vbox_ttm_tt_unpopulate,
- #endif
-+#if RTLNX_VER_MAX(5,10,0)
- 	.init_mem_type = vbox_bo_init_mem_type,
-+#endif
- #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
- 	.eviction_valuable = ttm_bo_eviction_valuable,
- #endif
-@@ -318,8 +371,13 @@ int vbox_mm_init(struct vbox_private *vbox)
- #endif
- 	}
- 
-+#if RTLNX_VER_MIN(5,10,0)
-+	ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false,
-+			     vbox->available_vram_size >> PAGE_SHIFT);
-+#else
- 	ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM,
- 			     vbox->available_vram_size >> PAGE_SHIFT);
-+#endif
- 	if (ret) {
- 		DRM_ERROR("Failed ttm VRAM init: %d\n", ret);
- 		goto err_device_release;
-@@ -359,7 +417,7 @@ void vbox_mm_fini(struct vbox_private *vbox)
- #endif
- }
- 
--void vbox_ttm_placement(struct vbox_bo *bo, int domain)
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type)
- {
- 	u32 c = 0;
- #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
-@@ -372,15 +430,36 @@ void vbox_ttm_placement(struct vbox_bo *bo, int domain)
- 	bo->placement.placement = bo->placements;
- 	bo->placement.busy_placement = bo->placements;
- 
--	if (domain & TTM_PL_FLAG_VRAM)
-+	if (mem_type & VBOX_MEM_TYPE_VRAM) {
-+#if RTLNX_VER_MIN(5,10,0)
-+		bo->placements[c].mem_type = TTM_PL_VRAM;
-+		PLACEMENT_FLAGS(bo->placements[c++]) =
-+		    TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
-+#else
- 		PLACEMENT_FLAGS(bo->placements[c++]) =
- 		    TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
--	if (domain & TTM_PL_FLAG_SYSTEM)
-+#endif
-+	}
-+	if (mem_type & VBOX_MEM_TYPE_SYSTEM) {
-+#if RTLNX_VER_MIN(5,10,0)
-+		bo->placements[c].mem_type = TTM_PL_SYSTEM;
-+		PLACEMENT_FLAGS(bo->placements[c++]) =
-+		    TTM_PL_MASK_CACHING;
-+#else
- 		PLACEMENT_FLAGS(bo->placements[c++]) =
- 		    TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
--	if (!c)
-+#endif
-+	}
-+	if (!c) {
-+#if RTLNX_VER_MIN(5,10,0)
-+		bo->placements[c].mem_type = TTM_PL_SYSTEM;
-+		PLACEMENT_FLAGS(bo->placements[c++]) =
-+		    TTM_PL_MASK_CACHING;
-+#else
- 		PLACEMENT_FLAGS(bo->placements[c++]) =
- 		    TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-+#endif
-+	}
- 
- 	bo->placement.num_placement = c;
- 	bo->placement.num_busy_placement = c;
-@@ -414,7 +493,7 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
- 	vboxbo->bo.bdev->dev_mapping = dev->dev_mapping;
- #endif
- 
--	vbox_ttm_placement(vboxbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
-+	vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM);
- 
- 	acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size,
- 				       sizeof(struct vbox_bo));
-@@ -452,7 +531,7 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
- #endif
- }
- 
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
- {
- #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
- 	struct ttm_operation_ctx ctx = { false, false };
-@@ -467,7 +546,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
- 		return 0;
- 	}
- 
--	vbox_ttm_placement(bo, pl_flag);
-+	vbox_ttm_placement(bo, mem_type);
- 
- 	for (i = 0; i < bo->placement.num_placement; i++)
- 		PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
-@@ -540,7 +619,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
- 	if (bo->kmap.virtual)
- 		ttm_bo_kunmap(&bo->kmap);
- 
--	vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);
-+	vbox_ttm_placement(bo, VBOX_MEM_TYPE_SYSTEM);
- 
- 	for (i = 0; i < bo->placement.num_placement; i++)
- 		PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
--- 
-2.19.1
-
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch deleted +0 -119

119 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch deleted +0 -46

46 lines not on this page · raw message

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb +2 -5
similarity index 88%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
index ff639c09f0..ea6a082f60 100644
@@ -13,12 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
-    file://0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch \
-    file://0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch \
-    file://0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch \
 "
-SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe"
-SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"
+SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
+SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
 
 S ?= "${WORKDIR}/vbox_module"
 S_task-patch = "${WORKDIR}/${VBOX_NAME}"
Signature · 1 line
2.25.1
#8 lore raw

PATCH 8/15 vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386

In reply to Armin Kuster

From: Gianfranco <[email protected]>

(cherry picked from commit 09eb0ad187fb14ac1bb83a5a8d1ac4e9e9fdb305)
---
 .../vboxguestdrivers/kernel-5.10.patch        | 23 +++++++++++++++++++
 .../vboxguestdrivers_6.1.18.bb                |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch new file +23 -0
new file mode 100644
index 0000000000..a6b0a04545
@@ -0,0 +1,23 @@
+Origin: https://www.mail-archive.com/[email protected]/msg461494.html
+From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jan=20R=C4=99korajski?= <[email protected]>
+Date: Thu, 24 Dec 2020 23:03:55 +0100
+Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it
+
+---
+ kernel-5.10.patch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel-5.10.patch b/kernel-5.10.patch
+index b28d6e0..729235d 100644
+--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
+  * @param   uAddr               The address to apply the new protection to.
+  * @param   pvUser              The opaque user data.
+  */
+-static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
+ {
+     PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
+     PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb +1 -0
index ea6a082f60..d620e9893f 100644
@@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
+    file://kernel-5.10.patch \
 "
 SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
 SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
Signature · 1 line
2.25.1
#9 lore raw

PATCH 9/15 vboxguestdrivers: Add __divmoddi4 builtin support

In reply to Armin Kuster

From: Khem Raj <[email protected]>

gcc 11 needs it on i686

(cherry picked from commit 57f7692e8ef707535ffa1683aa711de442736ec1)
---
 .../vboxguestdrivers/add__divmoddi4.patch     | 36 +++++++++++++++++++
 .../vboxguestdrivers_6.1.18.bb                |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch new file +36 -0
new file mode 100644
index 0000000000..8dd30a20ef
@@ -0,0 +1,36 @@
+add __divmoddi4 builtin
+
+GCC 11 will generate it in code
+
+void foo(unsigned char *u8Second, unsigned int *u32Nanosecond, long long timeSpec)
+{
+    long long i64Div;
+    int i32Div;
+    int i32Rem;
+    i64Div = timeSpec;
+    i32Rem = (int)(i64Div % 1000000000);
+    i64Div /= 1000000000;
+    *u32Nanosecond = i32Rem;
+    i32Rem = (int)(i64Div % 60);
+    *u8Second = i32Rem;
+}
+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+
+--- a/src/VBox/Runtime/common/math/gcc/divdi3.c
++++ b/src/VBox/Runtime/common/math/gcc/divdi3.c
+@@ -68,3 +68,12 @@ __divdi3(a, b)
+ 		uq = - uq;
+ 	return uq;
+ }
++
++quad_t
++__divmoddi4(quad_t a, quad_t b, quad_t* rem)
++{
++	quad_t d = __divdi3(a,b);
++	*rem = a - (d*b);
++	return d;
++}
++
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb +1 -0
index d620e9893f..1def1a3115 100644
@@ -14,6 +14,7 @@ VBOX_NAME = "VirtualBox-${PV}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
     file://kernel-5.10.patch \
+    file://add__divmoddi4.patch \
 "
 SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
 SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
Signature · 1 line
2.25.1
#10 lore raw

PATCH 10/15 vboxguestdrivers: upgrade 6.1.18 -> 6.1.20

In reply to Armin Kuster

From: Gianfranco <[email protected]>

Drop all patches, now part of upstream codebase

(cherry picked from commit 37537bda8c4775ce1c390d1a9a5b2f5fab89bfc7)
[Stable branch]
(cherry picked from commit 703daeb65f49c60636e835ad53fc354ca641ab3f)
---
 .../vboxguestdrivers/kernel-5.10.patch        | 23 -------------------
 ...s_6.1.18.bb => vboxguestdrivers_6.1.20.bb} |  5 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.18.bb => vboxguestdrivers_6.1.20.bb} (94%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch deleted +0 -23
deleted file mode 100644
index a6b0a04545..0000000000
@@ -1,23 +0,0 @@
-Origin: https://www.mail-archive.com/[email protected]/msg461494.html
-From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jan=20R=C4=99korajski?= <[email protected]>
-Date: Thu, 24 Dec 2020 23:03:55 +0100
-Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it
-
----
- kernel-5.10.patch | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel-5.10.patch b/kernel-5.10.patch
-index b28d6e0..729235d 100644
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
-  * @param   uAddr               The address to apply the new protection to.
-  * @param   pvUser              The opaque user data.
-  */
--static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
-+static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
- {
-     PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
-     PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb +2 -3
similarity index 94%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
index 1def1a3115..9df2e3960e 100644
@@ -13,11 +13,10 @@ VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
-    file://kernel-5.10.patch \
     file://add__divmoddi4.patch \
 "
-SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
-SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
+SRC_URI[md5sum] = "f2fe05e72c37d40afb36b9fb3aa38b78"
+SRC_URI[sha256sum] = "e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7"
 
 S ?= "${WORKDIR}/vbox_module"
 S_task-patch = "${WORKDIR}/${VBOX_NAME}"
Signature · 1 line
2.25.1
#11 lore raw

PATCH 11/15 vboxguestdrivers: upgrade 6.1.20 -> 6.1.22

In reply to Armin Kuster

From: Gianfranco <[email protected]>

(cherry picked from commit 319490178b999a74a82d092320de5d9d2e5c67bd)
[Stable branch]
(cherry picked from commit 97a5a4b40c143f71c8bff403c51a061a0d5e8b6f)
---
 ...{vboxguestdrivers_6.1.20.bb => vboxguestdrivers_6.1.22.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.20.bb => vboxguestdrivers_6.1.22.bb} (95%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb +2 -2
similarity index 95%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.20.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb
index 9df2e3960e..a074d0a558 100644
@@ -15,8 +15,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
     file://Makefile.utils \
     file://add__divmoddi4.patch \
 "
-SRC_URI[md5sum] = "f2fe05e72c37d40afb36b9fb3aa38b78"
-SRC_URI[sha256sum] = "e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7"
+SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80"
+SRC_URI[sha256sum] = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49"
 
 S ?= "${WORKDIR}/vbox_module"
 S_task-patch = "${WORKDIR}/${VBOX_NAME}"
Signature · 1 line
2.25.1
#12 lore raw

PATCH 12/15 vboxguestdrivers: add a fix for build failure with kernel 5.13

In reply to Armin Kuster

From: Gianfranco <[email protected]>

Its already upstream and also used in Debian and Ubuntu

(cherry picked from commit d0f2d7c954b9f3befd9470d97de581fe5b1fb2a8)
(cherry picked from commit 2e15d7eb66624c1755e8670f8c5448e3a9be0a21)
---
 .../40-linux-5.13-support.patch               | 276 ++++++++++++++++++
 .../vboxguestdrivers_6.1.22.bb                |   1 +
 2 files changed, 277 insertions(+)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch new file +276 -0
new file mode 100644
index 0000000000..e95e240492
@@ -0,0 +1,276 @@
+Subject: Fix build errors with linux 5.13
+Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk
+Bug: https://bugs.launchpad.net/bugs/1929193
+
+diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
+--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h	2021-04-28 16:24:47.000000000 +0000
++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h	2021-06-23 10:08:44.431714404 +0000
+@@ -46,20 +41,20 @@
+  * Evaluates to true if the linux kernel version is equal or higher to the
+  * one specfied. */
+ #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \
+-    (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
++	(LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
+ 
+ /** @def RTLNX_VER_MAX
+  * Evaluates to true if the linux kernel version is less to the one specfied
+  * (exclusive). */
+ #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \
+-    (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
++	(LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
+ 
+ /** @def RTLNX_VER_RANGE
+  * Evaluates to true if the linux kernel version is equal or higher to the given
+  * minimum version and less (but not equal) to the maximum version (exclusive). */
+ #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin,  a_MajorMax, a_MinorMax, a_PatchMax) \
+-    (   LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \
+-     && LINUX_VERSION_CODE <  KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) )
++	(   LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \
++	 && LINUX_VERSION_CODE <  KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) )
+ 
+ 
+ /** @def RTLNX_RHEL_MIN
+@@ -70,7 +65,7 @@
+  */
+ #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+ # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \
+-     ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor)))
++	 ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor)))
+ #else
+ # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0)
+ #endif
+@@ -83,7 +78,7 @@
+  */
+ #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+ # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \
+-     ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor)))
++	 ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor)))
+ #else
+ # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
+ #endif
+@@ -95,7 +90,7 @@
+  */
+ #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+ # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin,  a_iMajorMax, a_iMinorMax) \
+-     (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax))
++	 (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax))
+ #else
+ # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin,  a_iMajorMax, a_iMinorMax)  (0)
+ #endif
+@@ -173,7 +168,9 @@
+ #include <drm/ttm/ttm_bo_api.h>
+ #include <drm/ttm/ttm_bo_driver.h>
+ #include <drm/ttm/ttm_placement.h>
++#if RTLNX_VER_MAX(5,13,0)
+ #include <drm/ttm/ttm_memory.h>
++#endif
+ #if RTLNX_VER_MAX(5,12,0)
+ # include <drm/ttm/ttm_module.h>
+ #endif
+@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st
+ 				 VBVA_ADAPTER_INFORMATION_SIZE)
+ #define GUEST_HEAP_SIZE   VBVA_ADAPTER_INFORMATION_SIZE
+ #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \
+-				sizeof(HGSMIHOSTFLAGS))
++				sizeof(struct hgsmi_host_flags))
+ #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE
+ 
+ /** How frequently we refresh if the guest is not providing dirty rectangles. */
+@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st
+ static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size,
+ 				 gfp_t flags)
+ {
+-    return devm_kzalloc(dev, n * size, flags);
++	return devm_kzalloc(dev, n * size, flags);
+ }
+ #endif
+ 
+@@ -244,7 +241,7 @@ struct vbox_private {
+ 	u8 __iomem *guest_heap;
+ 	u8 __iomem *vbva_buffers;
+ 	struct gen_pool *guest_pool;
+-	struct VBVABUFFERCONTEXT *vbva_info;
++	struct vbva_buf_context *vbva_info;
+ 	bool any_pitch;
+ 	u32 num_crtcs;
+ 	/** Amount of available VRAM, including space used for buffers. */
+@@ -252,7 +249,7 @@ struct vbox_private {
+ 	/** Amount of available VRAM, not including space used for buffers. */
+ 	u32 available_vram_size;
+ 	/** Array of structures for receiving mode hints. */
+-	VBVAMODEHINT *last_mode_hints;
++	struct vbva_modehint *last_mode_hints;
+ 
+ 	struct vbox_fbdev *fbdev;
+ 
+@@ -263,7 +260,11 @@ struct vbox_private {
+ 		struct drm_global_reference mem_global_ref;
+ 		struct ttm_bo_global_ref bo_global_ref;
+ #endif
++#if RTLNX_VER_MIN(5,13,0) 
++		struct ttm_device bdev; 
++#else
+ 		struct ttm_bo_device bdev;
++#endif
+ 		bool mm_initialised;
+ 	} ttm;
+ 
+diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c
+--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c	2021-04-28 16:24:47.000000000 +0000
++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c	2021-06-23 10:08:07.164057918 +0000
+@@ -48,7 +43,11 @@
+ #endif
+ 
+ 
++#if RTLNX_VER_MIN(5,13,0)
++static inline struct vbox_private *vbox_bdev(struct ttm_device *bd)
++#else
+ static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
++#endif
+ {
+ 	return container_of(bd, struct vbox_private, ttm.bdev);
+ }
+@@ -188,7 +187,7 @@ static int vbox_ttm_io_mem_reserve(struc
+ 	mem->bus.size = mem->num_pages << PAGE_SHIFT;
+ 	mem->bus.base = 0;
+ 	mem->bus.is_iomem = false;
+-	if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
++	 if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
+ 		return -EINVAL;
+ 	switch (mem->mem_type) {
+ 	case TTM_PL_SYSTEM:
+@@ -205,8 +204,13 @@ static int vbox_ttm_io_mem_reserve(struc
+ 	return 0;
+ }
+ #else
++# if RTLNX_VER_MAX(5,13,0)
+ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
+ 				   struct ttm_resource *mem)
++# else /* > 5.13.0 */
++static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev,
++				   struct ttm_resource *mem)
++# endif /* > 5.13.0 */
+ {
+ 	struct vbox_private *vbox = vbox_bdev(bdev);
+ 	mem->bus.addr = NULL;
+@@ -241,7 +245,12 @@ static int vbox_ttm_io_mem_reserve(struc
+ 
+ 
+ 
+-#if RTLNX_VER_MIN(5,10,0)
++#if RTLNX_VER_MIN(5,13,0)
++static void vbox_ttm_io_mem_free(struct ttm_device *bdev,
++				 struct ttm_resource *mem)
++{
++}
++#elif RTLNX_VER_MIN(5,10,0)
+ static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
+ 				 struct ttm_resource *mem)
+ {
+@@ -253,7 +262,13 @@ static void vbox_ttm_io_mem_free(struct
+ }
+ #endif
+ 
+-#if RTLNX_VER_MIN(5,10,0)
++#if RTLNX_VER_MIN(5,13,0)
++static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt)
++{
++	ttm_tt_fini(tt);
++	kfree(tt);
++}
++#elif RTLNX_VER_MIN(5,10,0)
+ static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt)
+ {
+ 	ttm_tt_fini(tt);
+@@ -333,7 +348,11 @@ static int vbox_bo_move(struct ttm_buffe
+ }
+ #endif
+ 
++#if RTLNX_VER_MIN(5,13,0)
++static struct ttm_device_funcs vbox_bo_driver = {
++#else /* < 5.13.0 */
+ static struct ttm_bo_driver vbox_bo_driver = {
++#endif /* < 5.13.0 */
+ 	.ttm_tt_create = vbox_ttm_tt_create,
+ #if RTLNX_VER_MIN(5,10,0)
+ 	.ttm_tt_destroy = vbox_ttm_tt_destroy,
+@@ -370,14 +389,22 @@ int vbox_mm_init(struct vbox_private *vb
+ {
+ 	int ret;
+ 	struct drm_device *dev = vbox->dev;
++#if RTLNX_VER_MIN(5,13,0)
++	struct ttm_device *bdev = &vbox->ttm.bdev;
++#else
+ 	struct ttm_bo_device *bdev = &vbox->ttm.bdev;
++#endif
+ 
+ #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
+ 	ret = vbox_ttm_global_init(vbox);
+ 	if (ret)
+ 		return ret;
+ #endif
++#if RTLNX_VER_MIN(5,13,0)
++	ret = ttm_device_init(&vbox->ttm.bdev,
++#else
+ 	ret = ttm_bo_device_init(&vbox->ttm.bdev,
++#endif
+ #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
+ 				 vbox->ttm.bo_global_ref.ref.object,
+ #endif
+@@ -429,7 +456,11 @@ int vbox_mm_init(struct vbox_private *vb
+ 	return 0;
+ 
+ err_device_release:
++#if RTLNX_VER_MIN(5,13,0)
++	ttm_device_fini(&vbox->ttm.bdev);
++#else
+ 	ttm_bo_device_release(&vbox->ttm.bdev);
++#endif
+ #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
+ err_ttm_global_release:
+ 	vbox_ttm_global_release(vbox);
+@@ -446,7 +477,11 @@ void vbox_mm_fini(struct vbox_private *v
+ #else
+ 	arch_phys_wc_del(vbox->fb_mtrr);
+ #endif
++#if RTLNX_VER_MIN(5,13,0)
++        ttm_device_fini(&vbox->ttm.bdev);
++#else
+ 	ttm_bo_device_release(&vbox->ttm.bdev);
++#endif
+ #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
+ 	vbox_ttm_global_release(vbox);
+ #endif
+@@ -528,7 +563,9 @@ int vbox_bo_create(struct drm_device *de
+ {
+ 	struct vbox_private *vbox = dev->dev_private;
+ 	struct vbox_bo *vboxbo;
++#if RTLNX_VER_MAX(5,13,0)
+ 	size_t acc_size;
++#endif
+ 	int ret;
+ 
+ 	vboxbo = kzalloc(sizeof(*vboxbo), GFP_KERNEL);
+@@ -551,16 +588,20 @@ int vbox_bo_create(struct drm_device *de
+ 
+ 	vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM);
+ 
++#if RTLNX_VER_MAX(5,13,0)
+ 	acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size,
+ 				       sizeof(struct vbox_bo));
++#endif
+ 
+ 	ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
+ 			  ttm_bo_type_device, &vboxbo->placement,
+ #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
+ 			  align >> PAGE_SHIFT, false, NULL, acc_size,
+-#else
++#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */
+ 			  align >> PAGE_SHIFT, false, acc_size,
+-#endif
++#else /* > 5.13.0 */
++			  align >> PAGE_SHIFT, false,
++#endif /* > 5.13.0 */
+ #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
+ 			  NULL, NULL, vbox_bo_ttm_destroy);
+ #else
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb +1 -0
index a074d0a558..19b8f8f46e 100644
@@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
+    file://40-linux-5.13-support.patch \
     file://add__divmoddi4.patch \
 "
 SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80"
Signature · 1 line
2.25.1
#13 lore raw

PATCH 13/15 mariadb: update to 10.4.20

In reply to Armin Kuster

From: Armin Kuster <[email protected]>

Source: mariadb.org
MR: 109670, 110757, 110768
Type: Security Fix
Disposition: Backport from mariadb
ChangeID: 82a82ba3623ff39ca17443d0117d36bcee73e612 Description:

LTS version

https://mariadb.com/kb/en/mariadb-10420-release-notes/
CVE-2021-2166: MariaDB 10.4.19
CVE-2021-2154: MariaDB 10.4.19
CVE-2021-27928: MariaDB 10.4.18

---
 .../{mariadb-native_10.4.17.bb => mariadb-native_10.4.20.bb}  | 0
 meta-oe/recipes-dbs/mysql/mariadb.inc                         | 4 ++--
 .../mysql/{mariadb_10.4.17.bb => mariadb_10.4.20.bb}          | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.4.17.bb => mariadb-native_10.4.20.bb} (100%)
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.4.17.bb => mariadb_10.4.20.bb} (100%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.4.20.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.4.17.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.4.17.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.4.20.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +2 -2
index 9f7203c40d..0fb0c95ec3 100644
@@ -19,8 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
            file://clang_version_header_conflict.patch \
            file://fix-arm-atomic.patch \
           "
-SRC_URI[md5sum] = "e8193b9cd008b6d7f177f5a5c44c7a9f"
-SRC_URI[sha256sum] = "a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e"
+SRC_URI[md5sum] = "c3bc7a3eca3b0bbae5748f7b22a55c0c"
+SRC_URI[sha256sum] = "87d5e29ee1f18de153266ec658138607703ed2a05b3ffb1f89091d33f4abf545"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
meta-oe/recipes-dbs/mysql/mariadb_10.4.20.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.4.17.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.4.17.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.4.20.bb
Signature · 1 line
2.25.1
#14 lore raw

PATCH 14/15 hiawatha: fix url.

In reply to Armin Kuster

files moved under a new dir structure.

ERROR: hiawatha-10.10-r0 do_fetch: Fetcher failure for URL: 'http://hiawatha-webserver.org/files/hiawatha-10.10.tar.gz'. Unable to fetch URL from any source.

---
 meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb +1 -1
index ed3df19390..2503f53166 100644
@@ -6,7 +6,7 @@ DEPENDS = "libxml2 libxslt virtual/crypt"
 
 SECTION = "net"
 
-SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \
+SRC_URI = "http://hiawatha-webserver.org/files/hiawatha-10/${BP}.tar.gz \
            file://hiawatha-init \
            file://hiawatha.service "
 
Signature · 1 line
2.25.1
#15 lore raw

PATCH 15/15 ufw: backport patches, update RRECOMMENDS, python3 support, tests

In reply to Armin Kuster

From: Jate Sujjavanich <[email protected]>

Backport patches:
using conntrack instead of state eliminating warning support setup.py build (python 3)
adjust runtime tests to use daytime port (netbase changes) empty out IPT_MODULES (nf conntrack warning) check-requirements patch for python 3.8
Update, add patches for python 3 interpreter
Add ufw-test package. Backport fixes for check-requirements script Update kernel RRECOMMENDS for linux-yocto 5.4 in dunfell

For dunfell

---
 .../0006-check-requirements-get-error.patch   |    36 +
 ...se-conntrack-instead-of-state-module.patch | 14903 ++++++++++++++++
 ...8-support-.-setup.py-build-LP-819600.patch |    93 +
 ...st-runtime-tests-to-use-daytime-port.patch |  2895 +++
 ...IPT_MODULES-and-update-documentation.patch |   106 +
 ...nts--simplify-and-support-python-3.8.patch |    33 +
 ...tect-openembedded-python-interpreter.patch |    33 +
 ...setup-only-make-one-reference-to-env.patch |    14 +-
 .../recipes-connectivity/ufw/ufw_0.33.bb      |    49 +-
 9 files changed, 18155 insertions(+), 7 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0006-check-requirements-get-error.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0007-use-conntrack-instead-of-state-module.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0009-adjust-runtime-tests-to-use-daytime-port.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0010-empty-out-IPT_MODULES-and-update-documentation.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/0011-tests-check-requirements--simplify-and-support-python-3.8.patch
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/Add-code-to-detect-openembedded-python-interpreter.patch
meta-networking/recipes-connectivity/ufw/ufw/0006-check-requirements-get-error.patch new file +36 -0
new file mode 100644
index 0000000000..9c268599ff
@@ -0,0 +1,36 @@
+ * check-requirements now gives iptables output on failure. Patch thanks to
+    S. Nizio.
+
+Written by Jamie Strandboge <[email protected]>
+
+The patch was imported from git://git.launchpad.net/ufw
+commit id 9a6d8beb4cb1d1646c7d2a19e4aea9898f4571bb
+
+Removed ChangeLog patch due to backport status of this patch.
+
+Upstream-Status: Backport
+Signed-off-by: Jate Sujjavanich <[email protected]>
+
+--- check-requirements.orig 2012-12-03 16:37:20.214274095 +0100
++++ ufw-0.33/tests/check-requirements   2012-12-03 16:40:16.298728133 +0100
+@@ -29,14 +29,19 @@
+         runtime="yes"
+         shift 1
+     fi
+-    if $@ >/dev/null 2>&1 ; then
++    local output ret=0
++    # make sure to always return success below because of set -e
++    output=$( "$@" 2>&1 ) || ret=$?
++    if [ $ret -eq 0 ]; then
+         echo pass
+     else
+         if [ "$runtime" = "yes" ]; then
+             echo "FAIL (no runtime support)"
++            echo "error was: $output"
+             error_runtime="yes"
+         else
+             echo FAIL
++            echo "error was: $output"
+             error="yes"
+         fi
+     fi
meta-networking/recipes-connectivity/ufw/ufw/0007-use-conntrack-instead-of-state-module.patch new file +14903 -0

2,964 lines not on this page · raw message

meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch new file +93 -0

93 lines not on this page · raw message

meta-networking/recipes-connectivity/ufw/ufw/0009-adjust-runtime-tests-to-use-daytime-port.patch new file +2895 -0

2,895 lines not on this page · raw message

meta-networking/recipes-connectivity/ufw/ufw/0010-empty-out-IPT_MODULES-and-update-documentation.patch new file +106 -0

106 lines not on this page · raw message

meta-networking/recipes-connectivity/ufw/ufw/0011-tests-check-requirements--simplify-and-support-python-3.8.patch new file +33 -0
new file mode 100644
index 0000000000..ea48c83b84

Lines of this file are not shown. View the raw message.

meta-networking/recipes-connectivity/ufw/ufw/Add-code-to-detect-openembedded-python-interpreter.patch new file +33 -0
new file mode 100644
index 0000000000..85d51ca21f

Lines of this file are not shown. View the raw message.

meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch +12 -2
index ff704b5a46..f487a6fd6c 100644

Lines of this file are not shown. View the raw message.

meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +44 -5

49 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.