Revert "options/rtld: Fix relr relocations"

This reverts commit 92a263c.
managarm · Oct 17, 2024 · 5336ba3 · 5336ba3
1 parent b7e6c6a
commit 5336ba3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/options/rtld/generic/linker.cpp b/options/rtld/generic/linker.cpp
@@ -1731,6 +1731,7 @@ void Loader::_processStaticRelocations(SharedObject *object) {
 			if(!(entry & 1)) {
 				addr = (elf_addr *)(object->baseAddress + entry);
 				__ensure(addr);
+				*addr++ += object->baseAddress;
 			}else {
 				// Odd entry indicates entry is a bitmap of the subsequent locations to be relocated.
 				for(int i = 0; entry; ++i) {

diff --git a/options/rtld/generic/main.cpp b/options/rtld/generic/main.cpp
@@ -145,6 +145,7 @@ extern "C" void relocateSelf() {
 		if(!(entry & 1)) {
 			addr = (elf_addr *)(ldso_base + entry);
 			__ensure(addr);
+			*addr++ += ldso_base;
 		}else {
 			// Odd entry indicates entry is a bitmap of the subsequent locations to be relocated.
 			for(int i = 0; entry; ++i) {