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

diff --git a/src/ldso/dladdr.c b/src/ldso/dladdr.c
index 7ca718f4fbf4ccc7d2257a56b6ed4a25dbcec4d8..659ab91e8a67976c38f826e0c19e3c2726267460 100644 (file)
--- a/src/ldso/dladdr.c
+++ b/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);

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 492c22a83d016748e2566db54cd3af92295ee748..8d793f26b8914c311ce54756483486b6292a2c04 100644 (file)
--- a/src/ldso/dynlink.c
+++ b/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)