Merge branch 'jankratochvil/basecleanup-basealign' into pending

Conflicts:
	tests/dwfl-report-elf-align.c

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c
index 86297fa8..494ab65b 100644
--- a/tests/dwfl-report-elf-align.c
+++ b/tests/dwfl-report-elf-align.c
@@ -50,13 +50,13 @@ main (int argc, char **argv)
   assert (dwfl != NULL);
 
   char *endptr;
-  uintptr_t base = strtol (argv[2], &endptr, 0);
+  uintptr_t base = strtoull (argv[2], &endptr, 0);
   assert (endptr && !*endptr);
 
   Dwfl_Module *mod = dwfl_report_elf (dwfl, argv[1], argv[1], -1, base);
   assert (mod != NULL);
 
-  uintptr_t funcaddr = strtol (argv[3], &endptr, 0);
+  uintptr_t funcaddr = strtoull (argv[3], &endptr, 0);
   assert (endptr && !*endptr);
 
   Dwfl_Module *mod_found = dwfl_addrmodule (dwfl, funcaddr);