posix,rtld: Make use of version in dlvsym

managarm · Dec 27, 2024 · d72bf08 · d72bf08
1 parent 9ad4eea
commit d72bf08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/options/posix/generic/dlfcn.cpp b/options/posix/generic/dlfcn.cpp
@@ -15,7 +15,7 @@ struct __dlapi_symbol {
 
 extern "C" const char *__dlapi_error();
 extern "C" void *__dlapi_open(const char *, int, void *);
-extern "C" void *__dlapi_resolve(void *, const char *, void *);
+extern "C" void *__dlapi_resolve(void *, const char *, void *, const char *);
 extern "C" int __dlapi_reverse(const void *, __dlapi_symbol *);
 extern "C" int __dlapi_close(void *);
 
@@ -36,14 +36,13 @@ void *dlopen(const char *file, int flags) {
 [[gnu::noinline]]
 void *dlsym(void *__restrict handle, const char *__restrict string) {
 	auto ra = __builtin_extract_return_addr(__builtin_return_address(0));
-	return __dlapi_resolve(handle, string, ra);
+	return __dlapi_resolve(handle, string, ra, NULL);
 }
 
 [[gnu::noinline]]
 void *dlvsym(void *__restrict handle, const char *__restrict string, const char *__restrict version) {
-	mlibc::infoLogger() << "mlibc: dlvsym ignores version " << version << frg::endlog;
 	auto ra = __builtin_extract_return_addr(__builtin_return_address(0));
-	return __dlapi_resolve(handle, string, ra);
+	return __dlapi_resolve(handle, string, ra, version);
 }
 
 //gnu extensions

diff --git a/options/rtld/generic/main.cpp b/options/rtld/generic/main.cpp
@@ -666,7 +666,7 @@ void *__dlapi_open(const char *file, int flags, void *returnAddress) {
 }
 
 extern "C" [[ gnu::visibility("default") ]]
-void *__dlapi_resolve(void *handle, const char *string, void *returnAddress) {
+void *__dlapi_resolve(void *handle, const char *string, void *returnAddress, const char *version) {
 	if (logDlCalls) {
 		const char *name;
 		bool quote = false;
@@ -686,6 +686,9 @@ void *__dlapi_resolve(void *handle, const char *string, void *returnAddress) {
 	frg::optional<ObjectSymbol> target;
 	frg::optional<SymbolVersion> targetVersion = frg::null_opt;
 
+	if(version)
+		targetVersion = SymbolVersion{version};
+
 	if (handle == RTLD_DEFAULT) {
 		target = globalScope->resolveSymbol(string, 0, 0, targetVersion);
 	} else if (handle == RTLD_NEXT) {