From f698ca8e12472fe919b1ab2b81961b9771d3cd70 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Tue, 19 Feb 2013 18:31:49 +0000 Subject: [PATCH] PR gdb/15161 * symfile.c (load_section_data): Change type of load_offset to CORE_ADDR. (generic_load): User strtoulst instead of strtoul for conversion of load_offset. --- gdb/ChangeLog | 8 ++++++++ gdb/symfile.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 881379cf84..07758236b9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2013-02-19 Kai Tietz + + PR gdb/15161 + * symfile.c (load_section_data): Change type of load_offset + to CORE_ADDR. + (generic_load): User strtoulst instead of strtoul for conversion + of load_offset. + 2013-02-19 Jiong Wang * tilegx-tdep.c (tilegx_analyze_prologue): add check for diff --git a/gdb/symfile.c b/gdb/symfile.c index 6f968b7abd..22a7970fa9 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1948,7 +1948,7 @@ add_section_size_callback (bfd *abfd, asection *asec, void *data) /* Opaque data for load_section_callback. */ struct load_section_data { - unsigned long load_offset; + CORE_ADDR load_offset; struct load_progress_data *progress_data; VEC(memory_write_request_s) *requests; }; @@ -2126,9 +2126,9 @@ generic_load (char *args, int from_tty) if (argv[1] != NULL) { - char *endptr; + const char *endptr; - cbdata.load_offset = strtoul (argv[1], &endptr, 0); + cbdata.load_offset = strtoulst (argv[1], &endptr, 0); /* If the last word was not a valid number then treat it as a file name with spaces in. */ -- 2.34.1