diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-07-05 09:04:51 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-07-05 09:05:05 -0700 |
| commit | 1d827a720c9659cc8d54059ccc3efae24b875c03 (patch) | |
| tree | 994f49f2ebf72794c24099a34aedcd84643f0983 /bfd | |
| parent | 15a7695fdce108548169ca265cc440b049d63951 (diff) | |
| download | gdb-1d827a720c9659cc8d54059ccc3efae24b875c03.zip gdb-1d827a720c9659cc8d54059ccc3efae24b875c03.tar.gz gdb-1d827a720c9659cc8d54059ccc3efae24b875c03.tar.bz2 | |
Fix build with GCC 4.2
Fix GCC 4.2 warnings like:
cc1: warnings being treated as errors
binutils-gdb/bfd/dwarf2.c:1844: warning: declaration of ‘time’ shadows a global declaration
/usr/include/time.h:187: warning: shadowed declaration is here
binutils-gdb/bfd/dwarf2.c: In function ‘line_info_add_file_name’:
binutils-gdb/bfd/dwarf2.c:1854: warning: declaration of ‘time’ shadows a global declaration
/usr/include/time.h:187: warning: shadowed declaration is here
bfd/
* dwarf2.c (line_info_add_include_dir_stub): Replace time with
xtime.
(line_info_add_file_name): Likewise.
(decode_line_info): Likewise.
binutils/
* dwarf.c (display_debug_names): Replace index with xindex.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/dwarf2.c | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9f5c9a1..f7363ba 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2017-07-05 H.J. Lu <hongjiu.lu@intel.com> + + * dwarf2.c (line_info_add_include_dir_stub): Replace time with + xtime. + (line_info_add_file_name): Likewise. + (decode_line_info): Likewise. + 2017-07-04 Tristan Gingold <gingold@adacore.com> * version.m4: Bump version to 2.29.51 diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 5e674d4..04a2585 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -1841,7 +1841,7 @@ line_info_add_include_dir (struct line_info_table *table, char *cur_dir) static bfd_boolean line_info_add_include_dir_stub (struct line_info_table *table, char *cur_dir, unsigned int dir ATTRIBUTE_UNUSED, - unsigned int time ATTRIBUTE_UNUSED, + unsigned int xtime ATTRIBUTE_UNUSED, unsigned int size ATTRIBUTE_UNUSED) { return line_info_add_include_dir (table, cur_dir); @@ -1851,7 +1851,8 @@ line_info_add_include_dir_stub (struct line_info_table *table, char *cur_dir, static bfd_boolean line_info_add_file_name (struct line_info_table *table, char *cur_file, - unsigned int dir, unsigned int time, unsigned int size) + unsigned int dir, unsigned int xtime, + unsigned int size) { if ((table->num_files % FILE_ALLOC_CHUNK) == 0) { @@ -1869,7 +1870,7 @@ line_info_add_file_name (struct line_info_table *table, char *cur_file, table->files[table->num_files].name = cur_file; table->files[table->num_files].dir = dir; - table->files[table->num_files].time = time; + table->files[table->num_files].time = xtime; table->files[table->num_files].size = size; table->num_files++; return TRUE; @@ -2206,18 +2207,18 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash) /* Read file name table. */ while ((cur_file = read_string (abfd, line_ptr, line_end, &bytes_read)) != NULL) { - unsigned int dir, time, size; + unsigned int dir, xtime, size; line_ptr += bytes_read; dir = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end); line_ptr += bytes_read; - time = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end); + xtime = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end); line_ptr += bytes_read; size = _bfd_safe_read_leb128 (abfd, line_ptr, &bytes_read, FALSE, line_end); line_ptr += bytes_read; - if (!line_info_add_file_name (table, cur_file, dir, time, size)) + if (!line_info_add_file_name (table, cur_file, dir, xtime, size)) goto fail; } |