From df8ec2bb46fc55cffcd0ae0e898a007bd4c81ac4 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Thu, 29 Dec 2022 18:45:17 +0100 Subject: [PATCH] [0.4.11][CMAKE] Update baseaddress_msvc.cmake by hand! Motivation is to fix the following warnings at configure-time for *MSVC x86 dbg* : -- fusion has no base address -- fusion_1_1 has no base address -- fusion_2_0 has no base address -- xolehlp has no base address -- localspl_apitest.dll has no base address This fixes CORE-14831 for *MSVC dbg* for this release-branch at least. Meaning: It hides the effect, without fixing the cause. It is not a sustainable solution for master yet. We'd need to improve the python script for that. I tested afterwards the bootup of a build configured via: -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 and built with: MSVC 2010SP1 (16.0.40219.1) x86 target in dbg configuration and verified that we had no relocation happening until 3rd stage desktop VBox4.3.12. MSVC 2010SP1 (16.0.40219.1) x86 target in *rls* configuration was not tested yet, as that up to now did never reach the desktop yet for unrelated reasons. I will not upload an iso to sourceforge after this commit, because it will not have any impact for our primary GCC 4.7.2 toolchain. --- sdk/cmake/baseaddress_msvc.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 219203c33c0..40eee22a8a5 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -188,7 +188,7 @@ set(baseaddress_load_notifications 0x77da0000) set(baseaddress_loadperf 0x77d80000) set(baseaddress_localmon 0x77d50000) set(baseaddress_localspl 0x77d10000) -set(baseaddress_localspl_apitest 0x77cf0000) +set(baseaddress_localspl_apitest.dll 0x77cf0000) #module name corrected manually set(baseaddress_localui 0x77cc0000) set(baseaddress_lpk 0x77c90000) set(baseaddress_lsasrv 0x77c30000) @@ -376,3 +376,7 @@ set(baseaddress_xinput1_3 0x74ca0000) set(baseaddress_xinput9_1_0 0x74c80000) set(baseaddress_xmllite 0x74c50000) set(baseaddress_zipfldr 0x74c00000) +set(baseaddress_fusion 0x74bc0000) #added manually, last entry - 0x40000 +set(baseaddress_fusion_1_1 0x74b80000) #added manually, last entry - 0x40000 +set(baseaddress_fusion_2_0 0x74b40000) #added manually, last entry - 0x40000 +set(baseaddress_xolehlp 0x74b20000) #added manually, last entry - 0x20000