BUILD: tools: rely on __ELF__ not USE_DL to enable use of dladdr()
The approach was wrong. USE_DL is for the makefile to know if it's required
to append -ldl at link time. Some platforms do not need it (and in fact do
not have it) yet they have a working dladdr(). The real condition is related
to ELF. Given that due to Lua, all platforms that require -ldl already have
USE_DL set, let's replace USE_DL with __ELF__ here and consider that dladdr
is always needed on ELF, which basically is already the case.
diff --git a/src/standard.c b/src/standard.c
index 78237b9..38997d5 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -10,7 +10,7 @@
*
*/
-#if defined(USE_DL)
+#ifdef __ELF__
#define _GNU_SOURCE
#include <dlfcn.h>
#include <link.h>
@@ -4335,7 +4335,7 @@
}
}
-#ifdef USE_DL
+#ifdef __ELF__
/* calls dladdr() or dladdr1() on <addr> and <dli>. If dladdr1 is available,
* also returns the symbol size in <size>, otherwise returns 0 there.
*/
@@ -4369,7 +4369,7 @@
* The file name (lib or executable) is limited to what lies between the last
* '/' and the first following '.'. An optional prefix <pfx> is prepended before
* the output if not null. The file is not dumped when it's the same as the one
- * that contains the "main" symbol, or when USE_DL is not set.
+ * that contains the "main" symbol, or when __ELF__ is not set.
*
* The symbol's base address is returned, or NULL when unresolved, in order to
* allow the caller to match it against known ones.
@@ -4397,7 +4397,7 @@
#endif
};
-#ifdef USE_DL
+#ifdef __ELF__
Dl_info dli, dli_main;
size_t size;
const char *fname, *p;
@@ -4414,7 +4414,7 @@
}
}
-#ifdef USE_DL
+#ifdef __ELF__
/* Now let's try to be smarter */
if (!dladdr_and_size(addr, &dli, &size))
goto unknown;
@@ -4454,7 +4454,7 @@
chunk_appendf(buf, "+%#lx", (long)(addr - dli.dli_fbase));
return NULL;
}
-#endif /* USE_DL */
+#endif /* __ELF__ */
unknown:
/* unresolved symbol from the main file, report relative offset to main */
if ((void*)addr < (void*)main)