summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libdw/ChangeLog6
-rw-r--r--libdw/dwarf_end.c1
-rw-r--r--libdw/dwarf_error.c1
-rw-r--r--libdw/libdwP.h2
-rw-r--r--libdwfl/ChangeLog10
-rw-r--r--libdwfl/cu.c8
-rw-r--r--libdwfl/dwfl_error.c4
-rw-r--r--libdwfl/dwfl_module.c2
-rw-r--r--libdwfl/dwfl_module_getdwarf.c4
-rw-r--r--libdwfl/dwfl_module_getsrc_file.c9
-rw-r--r--libdwfl/libdwflP.h2
-rw-r--r--libdwfl/lines.c2
12 files changed, 37 insertions, 14 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index d87cf11c..3e5fbc3b 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-09 Roland McGrath <[email protected]>
+
+ * dwarf_end.c: Add INTDEF.
+ * dwarf_error.c (dwarf_errmsg): Likewise.
+ * libdwP.h (dwarf_end, dwarf_errmsg): Add INTDECLs.
+
2005-08-01 Roland McGrath <[email protected]>
* dwarf_getaranges.c (dwarf_getaranges): Check for bogus offset.
diff --git a/libdw/dwarf_end.c b/libdw/dwarf_end.c
index 935bd3d2..3328a7ca 100644
--- a/libdw/dwarf_end.c
+++ b/libdw/dwarf_end.c
@@ -73,3 +73,4 @@ dwarf_end (dwarf)
return 0;
}
+INTDEF(dwarf_end)
diff --git a/libdw/dwarf_error.c b/libdw/dwarf_error.c
index 85d928c9..291dbc6d 100644
--- a/libdw/dwarf_error.c
+++ b/libdw/dwarf_error.c
@@ -155,6 +155,7 @@ dwarf_errmsg (error)
return _(errmsgs[error == -1 ? last_error : error]);
}
+INTDEF(dwarf_errmsg)
#ifndef USE_TLS
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 05e02aa3..062b3dce 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -353,6 +353,8 @@ INTDECL (dwarf_attr_integrate)
INTDECL (dwarf_begin_elf)
INTDECL (dwarf_child)
INTDECL (dwarf_dieoffset)
+INTDECL (dwarf_end)
+INTDECL (dwarf_errmsg)
INTDECL (dwarf_formaddr)
INTDECL (dwarf_formblock)
INTDECL (dwarf_formref)
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 91523860..6c22f8a8 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-09 Roland McGrath <[email protected]>
+
+ * libdwflP.h: Include ../libdw/libdwP.h for its INTDECLs.
+ * cu.c: Use INTUSE on dwarf_* calls.
+ * dwfl_error.c: Likewise.
+ * dwfl_module.c: Likewise.
+ * dwfl_module_getdwarf.c: Likewise.
+ * dwfl_module_getsrc_file.c: Likewise.
+ * lines.c: Likewise.
+
2005-08-07 Roland McGrath <[email protected]>
* linux-kernel-modules.c (dwfl_linux_kernel_find_elf): When module
diff --git a/libdwfl/cu.c b/libdwfl/cu.c
index 44207097..cf7e3887 100644
--- a/libdwfl/cu.c
+++ b/libdwfl/cu.c
@@ -30,7 +30,7 @@ addrarange (Dwfl_Module *mod, Dwarf_Addr addr, struct dwfl_arange **arange)
if (mod->aranges == NULL)
{
Dwarf_Aranges *dwaranges;
- if (dwarf_getaranges (mod->dw, &dwaranges, NULL) != 0)
+ if (INTUSE(dwarf_getaranges) (mod->dw, &dwaranges, NULL) != 0)
return DWFL_E_LIBDW;
struct dwfl_arange *aranges = malloc (dwaranges->naranges
@@ -176,7 +176,7 @@ intern_cu (Dwfl_Module *mod, Dwarf_Off cuoff, struct dwfl_cu **result)
cu->lines = NULL;
/* XXX use non-searching lookup */
- Dwarf_Die *die = dwarf_offdie (mod->dw, cuoff, &cu->die);
+ Dwarf_Die *die = INTUSE(dwarf_offdie) (mod->dw, cuoff, &cu->die);
if (die == NULL)
return DWFL_E_LIBDW;
assert (die == &cu->die);
@@ -230,8 +230,8 @@ __libdwfl_nextcu (Dwfl_Module *mod, struct dwfl_cu *lastcu,
{
size_t cuhdrsz;
Dwarf_Off nextoff;
- if (dwarf_nextcu (mod->dw, cuoff, &nextoff, &cuhdrsz,
- NULL, NULL, NULL) != 0)
+ if (INTUSE(dwarf_nextcu) (mod->dw, cuoff, &nextoff, &cuhdrsz,
+ NULL, NULL, NULL) != 0)
return DWFL_E_LIBDW;
Dwfl_Error result = intern_cu (mod, cuoff + cuhdrsz, nextp);
diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
index 4bd1a50f..553c585f 100644
--- a/libdwfl/dwfl_error.c
+++ b/libdwfl/dwfl_error.c
@@ -113,7 +113,7 @@ canonicalize (Dwfl_Error error)
value = DWFL_E (LIBELF, elf_errno ());
break;
case DWFL_E_LIBDW:
- value = DWFL_E (LIBDW, dwarf_errno ());
+ value = DWFL_E (LIBDW, INTUSE(dwarf_errno) ());
break;
#if 0
DWFL_E_LIBEBL:
@@ -186,7 +186,7 @@ dwfl_errmsg (error)
case OTHER_ERROR (LIBELF):
return elf_errmsg (error & 0xffff);
case OTHER_ERROR (LIBDW):
- return dwarf_errmsg (error & 0xffff);
+ return INTUSE(dwarf_errmsg) (error & 0xffff);
#if 0
case OTHER_ERROR (LIBEBL):
return ebl_errmsg (error & 0xffff);
diff --git a/libdwfl/dwfl_module.c b/libdwfl/dwfl_module.c
index a6d9f41f..eecdb524 100644
--- a/libdwfl/dwfl_module.c
+++ b/libdwfl/dwfl_module.c
@@ -45,7 +45,7 @@ __libdwfl_module_free (Dwfl_Module *mod)
}
if (mod->dw != NULL)
- dwarf_end (mod->dw);
+ INTUSE(dwarf_end) (mod->dw);
if (mod->ebl != NULL)
ebl_closebackend (mod->ebl);
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 03cf8f05..1583c7a8 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -304,10 +304,10 @@ load_dw (Dwfl_Module *mod, Elf *debugfile)
return result;
}
- mod->dw = dwarf_begin_elf (debugfile, DWARF_C_READ, NULL);
+ mod->dw = INTUSE(dwarf_begin_elf) (debugfile, DWARF_C_READ, NULL);
if (mod->dw == NULL)
{
- int err = dwarf_errno ();
+ int err = INTUSE(dwarf_errno) ();
return err == DWARF_E_NO_DWARF ? DWFL_E_NO_DWARF : DWFL_E (LIBDW, err);
}
diff --git a/libdwfl/dwfl_module_getsrc_file.c b/libdwfl/dwfl_module_getsrc_file.c
index 81f57ed6..7c617dd8 100644
--- a/libdwfl/dwfl_module_getsrc_file.c
+++ b/libdwfl/dwfl_module_getsrc_file.c
@@ -36,7 +36,7 @@ dwfl_module_getsrc_file (Dwfl_Module *mod,
&& cu != NULL
&& (error = __libdwfl_cu_getsrclines (cu)) == DWFL_E_NOERROR)
{
- inline const char *dwarf_line_file (const Dwarf_Line *line)
+ inline const char *INTUSE(dwarf_line_file) (const Dwarf_Line *line)
{
return line->files->info[line->file].name;
}
@@ -46,7 +46,7 @@ dwfl_module_getsrc_file (Dwfl_Module *mod,
}
inline const char *dwfl_line_file (const Dwfl_Line *line)
{
- return dwarf_line_file (dwfl_line (line));
+ return INTUSE(dwarf_line_file) (dwfl_line (line));
}
/* Search through all the line number records for a matching
@@ -65,7 +65,7 @@ dwfl_module_getsrc_file (Dwfl_Module *mod,
}
else
{
- const char *file = dwarf_line_file (line);
+ const char *file = INTUSE(dwarf_line_file) (line);
if (file != lastfile)
{
/* Match the name with the name the user provided. */
@@ -87,7 +87,8 @@ dwfl_module_getsrc_file (Dwfl_Module *mod,
/* Determine whether this is the best match so far. */
size_t inner;
for (inner = 0; inner < cur_match; ++inner)
- if (dwfl_line_file (match[inner]) == dwarf_line_file (line))
+ if (dwfl_line_file (match[inner])
+ == INTUSE(dwarf_line_file) (line))
break;
if (inner < cur_match
&& (dwfl_line (match[inner])->line != line->line
diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h
index e8fb88c8..772bf29c 100644
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
@@ -25,6 +25,8 @@
#include <stdlib.h>
#include <string.h>
+#include "../libdw/libdwP.h" /* We need its INTDECLs. */
+
/* gettext helper macros. */
#define _(Str) dgettext ("elfutils", Str)
diff --git a/libdwfl/lines.c b/libdwfl/lines.c
index 3eb4c195..d48b3803 100644
--- a/libdwfl/lines.c
+++ b/libdwfl/lines.c
@@ -22,7 +22,7 @@ __libdwfl_cu_getsrclines (struct dwfl_cu *cu)
{
Dwarf_Lines *lines;
size_t nlines;
- if (dwarf_getsrclines (&cu->die, &lines, &nlines) != 0)
+ if (INTUSE(dwarf_getsrclines) (&cu->die, &lines, &nlines) != 0)
return DWFL_E_LIBDW;
cu->lines = malloc (offsetof (struct Dwfl_Lines, idx[nlines]));
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 09:42:24 +0000