Merge pull request #1111 from Qwinci/misc-fixes

Fix relr relocations and match glibc behavior in frexp
managarm · Aug 20, 2024 · 2eded87 · 2eded87
2 parents f3e45ca + 7130c0e
commit 2eded87
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/options/ansi/musl-generic-math/frexp.c b/options/ansi/musl-generic-math/frexp.c
@@ -13,6 +13,7 @@ double frexp(double x, int *e)
 		} else *e = 0;
 		return x;
 	} else if (ee == 0x7ff) {
+		*e = 0;
 		return x;
 	}
 

diff --git a/options/ansi/musl-generic-math/frexpf.c b/options/ansi/musl-generic-math/frexpf.c
@@ -13,6 +13,7 @@ float frexpf(float x, int *e)
 		} else *e = 0;
 		return x;
 	} else if (ee == 0xff) {
+		*e = 0;
 		return x;
 	}
 

diff --git a/options/ansi/musl-generic-math/frexpl.c b/options/ansi/musl-generic-math/frexpl.c
@@ -18,6 +18,7 @@ long double frexpl(long double x, int *e)
 		} else *e = 0;
 		return x;
 	} else if (ee == 0x7fff) {
+		*e = 0;
 		return x;
 	}
 

diff --git a/options/rtld/generic/linker.cpp b/options/rtld/generic/linker.cpp
@@ -1728,7 +1728,6 @@ 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
@@ -144,7 +144,6 @@ 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) {