Browse Source

move static/stub version of dladdr out of dynlink.c

Rich Felker 9 years ago
parent
commit
4f8f038060
2 changed files with 6 additions and 9 deletions
  1. 5 4
      src/ldso/dladdr.c
  2. 1 5
      src/ldso/dynlink.c

+ 5 - 4
src/ldso/dladdr.c

@@ -1,9 +1,10 @@
 #define _GNU_SOURCE
 #include <dlfcn.h>
+#include "libc.h"
 
-int __dladdr(const void *, Dl_info *);
-
-int dladdr(const void *addr, Dl_info *info)
+static int stub_dladdr(const void *addr, Dl_info *info)
 {
-	return __dladdr(addr, info);
+	return 0;
 }
+
+weak_alias(stub_dladdr, dladdr);

+ 1 - 5
src/ldso/dynlink.c

@@ -1823,7 +1823,7 @@ failed:
 	return 0;
 }
 
-int __dladdr(const void *addr, Dl_info *info)
+int dladdr(const void *addr, Dl_info *info)
 {
 	struct dso *p;
 	Sym *sym, *bestsym;
@@ -1928,10 +1928,6 @@ void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra)
 	error("Symbol not found: %s", s);
 	return 0;
 }
-int __dladdr (const void *addr, Dl_info *info)
-{
-	return 0;
-}
 #endif
 
 int __dlinfo(void *dso, int req, void *res)