From 2b6a56c21c1f60cfbb044af3d67d25df5aeaed68 Mon Sep 17 00:00:00 2001 From: Cebtenzzre Date: Thu, 22 Oct 2020 15:43:45 -0400 Subject: [PATCH] Partially revert "Fix debug build gcc/clang linker." This reverts commit 4599d5841353fdf8096191c30a592fedc844efce. The issue this works around was fixed in 3265772 ("idm: Implement creation/destruction invalidation counter") by making the variables constexpr. Fixes #6896 --- rpcs3/Emu/Cell/lv2/sys_vm.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/Emu/Cell/lv2/sys_vm.cpp index 64282ac614..be2f01f2ad 100644 --- a/rpcs3/Emu/Cell/lv2/sys_vm.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_vm.cpp @@ -19,11 +19,8 @@ sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize) sys_vm_t::~sys_vm_t() { - // Debug build : gcc and clang can not find the static var if retrieved directly in "release" function - constexpr auto invalid = id_manager::id_traits::invalid; - // Free ID - g_ids[addr >> 28].release(invalid); + g_ids[addr >> 28].release(id_manager::id_traits::invalid); } LOG_CHANNEL(sys_vm);