From b18c51783b2fc6ffd70b245d26539d9a0128e136 Mon Sep 17 00:00:00 2001 From: dim Date: Fri, 22 Oct 2010 18:08:37 +0000 Subject: Fix gdb compilation with new binutils: bfd_get_section_size_before_reloc() has been renamed to bfd_get_section_size(). --- contrib/gdb/gdb/dsrec.c | 2 +- contrib/gdb/gdb/dwarf2-frame.c | 4 ++-- contrib/gdb/gdb/dwarf2read.c | 24 ++++++++++++------------ contrib/gdb/gdb/elfread.c | 4 ++-- contrib/gdb/gdb/gcore.c | 2 +- contrib/gdb/gdb/mipsread.c | 8 ++++---- contrib/gdb/gdb/remote-e7000.c | 2 +- contrib/gdb/gdb/remote.c | 2 +- contrib/gdb/gdb/symfile.c | 18 +++++++++--------- contrib/gdb/gdb/tracepoint.c | 2 +- 10 files changed, 34 insertions(+), 34 deletions(-) (limited to 'contrib/gdb') diff --git a/contrib/gdb/gdb/dsrec.c b/contrib/gdb/gdb/dsrec.c index 1422600..42071e1 100644 --- a/contrib/gdb/gdb/dsrec.c +++ b/contrib/gdb/gdb/dsrec.c @@ -93,7 +93,7 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset, { int numbytes; bfd_vma addr = bfd_get_section_vma (abfd, s) + load_offset; - bfd_size_type size = bfd_get_section_size_before_reloc (s); + bfd_size_type size = bfd_get_section_size (s); char *section_name = (char *) bfd_get_section_name (abfd, s); /* Both GDB and BFD have mechanisms for printing addresses. In the below, GDB's is used so that the address is diff --git a/contrib/gdb/gdb/dwarf2-frame.c b/contrib/gdb/gdb/dwarf2-frame.c index 51a631d..b54717a 100644 --- a/contrib/gdb/gdb/dwarf2-frame.c +++ b/contrib/gdb/gdb/dwarf2-frame.c @@ -1573,7 +1573,7 @@ dwarf2_build_frame_info (struct objfile *objfile) dwarf_eh_frame_section); unit.dwarf_frame_size - = bfd_get_section_size_before_reloc (dwarf_eh_frame_section); + = bfd_get_section_size (dwarf_eh_frame_section); unit.dwarf_frame_section = dwarf_eh_frame_section; /* FIXME: kettenis/20030602: This is the DW_EH_PE_datarel base @@ -1601,7 +1601,7 @@ dwarf2_build_frame_info (struct objfile *objfile) unit.dwarf_frame_buffer = dwarf2_read_section (objfile, dwarf_frame_section); unit.dwarf_frame_size - = bfd_get_section_size_before_reloc (dwarf_frame_section); + = bfd_get_section_size (dwarf_frame_section); unit.dwarf_frame_section = dwarf_frame_section; frame_ptr = unit.dwarf_frame_buffer; diff --git a/contrib/gdb/gdb/dwarf2read.c b/contrib/gdb/gdb/dwarf2read.c index cc69ede..4cfc1fe 100644 --- a/contrib/gdb/gdb/dwarf2read.c +++ b/contrib/gdb/gdb/dwarf2read.c @@ -954,47 +954,47 @@ dwarf2_locate_sections (bfd *ignore_abfd, asection *sectp, void *ignore_ptr) { if (strcmp (sectp->name, INFO_SECTION) == 0) { - dwarf_info_size = bfd_get_section_size_before_reloc (sectp); + dwarf_info_size = bfd_get_section_size (sectp); dwarf_info_section = sectp; } else if (strcmp (sectp->name, ABBREV_SECTION) == 0) { - dwarf_abbrev_size = bfd_get_section_size_before_reloc (sectp); + dwarf_abbrev_size = bfd_get_section_size (sectp); dwarf_abbrev_section = sectp; } else if (strcmp (sectp->name, LINE_SECTION) == 0) { - dwarf_line_size = bfd_get_section_size_before_reloc (sectp); + dwarf_line_size = bfd_get_section_size (sectp); dwarf_line_section = sectp; } else if (strcmp (sectp->name, PUBNAMES_SECTION) == 0) { - dwarf_pubnames_size = bfd_get_section_size_before_reloc (sectp); + dwarf_pubnames_size = bfd_get_section_size (sectp); dwarf_pubnames_section = sectp; } else if (strcmp (sectp->name, ARANGES_SECTION) == 0) { - dwarf_aranges_size = bfd_get_section_size_before_reloc (sectp); + dwarf_aranges_size = bfd_get_section_size (sectp); dwarf_aranges_section = sectp; } else if (strcmp (sectp->name, LOC_SECTION) == 0) { - dwarf_loc_size = bfd_get_section_size_before_reloc (sectp); + dwarf_loc_size = bfd_get_section_size (sectp); dwarf_loc_section = sectp; } else if (strcmp (sectp->name, MACINFO_SECTION) == 0) { - dwarf_macinfo_size = bfd_get_section_size_before_reloc (sectp); + dwarf_macinfo_size = bfd_get_section_size (sectp); dwarf_macinfo_section = sectp; } else if (strcmp (sectp->name, STR_SECTION) == 0) { - dwarf_str_size = bfd_get_section_size_before_reloc (sectp); + dwarf_str_size = bfd_get_section_size (sectp); dwarf_str_section = sectp; } else if (strcmp (sectp->name, FRAME_SECTION) == 0) { - dwarf_frame_size = bfd_get_section_size_before_reloc (sectp); + dwarf_frame_size = bfd_get_section_size (sectp); dwarf_frame_section = sectp; } else if (strcmp (sectp->name, EH_FRAME_SECTION) == 0) @@ -1002,13 +1002,13 @@ dwarf2_locate_sections (bfd *ignore_abfd, asection *sectp, void *ignore_ptr) flagword aflag = bfd_get_section_flags (ignore_abfd, sectp); if (aflag & SEC_HAS_CONTENTS) { - dwarf_eh_frame_size = bfd_get_section_size_before_reloc (sectp); + dwarf_eh_frame_size = bfd_get_section_size (sectp); dwarf_eh_frame_section = sectp; } } else if (strcmp (sectp->name, RANGES_SECTION) == 0) { - dwarf_ranges_size = bfd_get_section_size_before_reloc (sectp); + dwarf_ranges_size = bfd_get_section_size (sectp); dwarf_ranges_section = sectp; } } @@ -4185,7 +4185,7 @@ dwarf2_read_section (struct objfile *objfile, asection *sectp) { bfd *abfd = objfile->obfd; char *buf, *retbuf; - bfd_size_type size = bfd_get_section_size_before_reloc (sectp); + bfd_size_type size = bfd_get_section_size (sectp); if (size == 0) return NULL; diff --git a/contrib/gdb/gdb/elfread.c b/contrib/gdb/gdb/elfread.c index 83a1862..a2850d1 100644 --- a/contrib/gdb/gdb/elfread.c +++ b/contrib/gdb/gdb/elfread.c @@ -83,12 +83,12 @@ elf_locate_sections (bfd *ignore_abfd, asection *sectp, void *eip) if (strcmp (sectp->name, ".debug") == 0) { ei->dboffset = sectp->filepos; - ei->dbsize = bfd_get_section_size_before_reloc (sectp); + ei->dbsize = bfd_get_section_size (sectp); } else if (strcmp (sectp->name, ".line") == 0) { ei->lnoffset = sectp->filepos; - ei->lnsize = bfd_get_section_size_before_reloc (sectp); + ei->lnsize = bfd_get_section_size (sectp); } else if (strcmp (sectp->name, ".stab") == 0) { diff --git a/contrib/gdb/gdb/gcore.c b/contrib/gdb/gdb/gcore.c index b551372..3b3a259 100644 --- a/contrib/gdb/gdb/gcore.c +++ b/contrib/gdb/gdb/gcore.c @@ -244,7 +244,7 @@ derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) || strcmp (".bss", bfd_section_name (abfd, sec)) == 0) { sec_vaddr = bfd_get_section_vma (abfd, sec); - sec_size = bfd_get_section_size_before_reloc (sec); + sec_size = bfd_get_section_size (sec); if (sec_vaddr + sec_size > top_of_data_memory) top_of_data_memory = sec_vaddr + sec_size; } diff --git a/contrib/gdb/gdb/mipsread.c b/contrib/gdb/gdb/mipsread.c index f67eeea..18549e8 100644 --- a/contrib/gdb/gdb/mipsread.c +++ b/contrib/gdb/gdb/mipsread.c @@ -256,10 +256,10 @@ read_alphacoff_dynamic_symtab (struct section_offsets *section_offsets, || si.got_sect == NULL) return; - sym_secsize = bfd_get_section_size_before_reloc (si.sym_sect); - str_secsize = bfd_get_section_size_before_reloc (si.str_sect); - dyninfo_secsize = bfd_get_section_size_before_reloc (si.dyninfo_sect); - got_secsize = bfd_get_section_size_before_reloc (si.got_sect); + sym_secsize = bfd_get_section_size (si.sym_sect); + str_secsize = bfd_get_section_size (si.str_sect); + dyninfo_secsize = bfd_get_section_size (si.dyninfo_sect); + got_secsize = bfd_get_section_size (si.got_sect); sym_secptr = xmalloc (sym_secsize); cleanups = make_cleanup (free, sym_secptr); str_secptr = xmalloc (str_secsize); diff --git a/contrib/gdb/gdb/remote-e7000.c b/contrib/gdb/gdb/remote-e7000.c index c422c94..725aeef 100644 --- a/contrib/gdb/gdb/remote-e7000.c +++ b/contrib/gdb/gdb/remote-e7000.c @@ -1568,7 +1568,7 @@ e7000_load (char *args, int from_tty) file_ptr fptr; section_address = bfd_get_section_vma (pbfd, section); - section_size = bfd_get_section_size_before_reloc (section); + section_size = bfd_get_section_size (section); if (!quiet) printf_filtered ("[Loading section %s at 0x%s (%s bytes)]\n", diff --git a/contrib/gdb/gdb/remote.c b/contrib/gdb/gdb/remote.c index 36da449..7ff2cb8 100644 --- a/contrib/gdb/gdb/remote.c +++ b/contrib/gdb/gdb/remote.c @@ -4834,7 +4834,7 @@ compare_sections_command (char *args, int from_tty) if (!(s->flags & SEC_LOAD)) continue; /* skip non-loadable section */ - size = bfd_get_section_size_before_reloc (s); + size = bfd_get_section_size (s); if (size == 0) continue; /* skip zero-length section */ diff --git a/contrib/gdb/gdb/symfile.c b/contrib/gdb/gdb/symfile.c index 19ae294..c97b44c 100644 --- a/contrib/gdb/gdb/symfile.c +++ b/contrib/gdb/gdb/symfile.c @@ -1353,7 +1353,7 @@ add_section_size_callback (bfd *abfd, asection *asec, void *data) { bfd_size_type *sum = data; - *sum += bfd_get_section_size_before_reloc (asec); + *sum += bfd_get_section_size (asec); } /* Opaque data for load_section_callback. */ @@ -1373,7 +1373,7 @@ load_section_callback (bfd *abfd, asection *asec, void *data) if (bfd_get_section_flags (abfd, asec) & SEC_LOAD) { - bfd_size_type size = bfd_get_section_size_before_reloc (asec); + bfd_size_type size = bfd_get_section_size (asec); if (size > 0) { char *buffer; @@ -2879,7 +2879,7 @@ pc_in_unmapped_range (CORE_ADDR pc, asection *section) if (overlay_debugging) if (section && section_is_overlay (section)) { - size = bfd_get_section_size_before_reloc (section); + size = bfd_get_section_size (section); if (section->lma <= pc && pc < section->lma + size) return 1; } @@ -2899,7 +2899,7 @@ pc_in_mapped_range (CORE_ADDR pc, asection *section) if (overlay_debugging) if (section && section_is_overlay (section)) { - size = bfd_get_section_size_before_reloc (section); + size = bfd_get_section_size (section); if (section->vma <= pc && pc < section->vma + size) return 1; } @@ -2915,9 +2915,9 @@ sections_overlap (asection *a, asection *b) /* FIXME: need bfd *, so we can use bfd_section_vma methods. */ CORE_ADDR a_start = a->vma; - CORE_ADDR a_end = a->vma + bfd_get_section_size_before_reloc (a); + CORE_ADDR a_end = a->vma + bfd_get_section_size (a); CORE_ADDR b_start = b->vma; - CORE_ADDR b_end = b->vma + bfd_get_section_size_before_reloc (b); + CORE_ADDR b_end = b->vma + bfd_get_section_size (b); return (a_start < b_end && b_start < a_end); } @@ -3052,7 +3052,7 @@ list_overlays_command (char *args, int from_tty) vma = bfd_section_vma (objfile->obfd, osect->the_bfd_section); lma = bfd_section_lma (objfile->obfd, osect->the_bfd_section); - size = bfd_get_section_size_before_reloc (osect->the_bfd_section); + size = bfd_get_section_size (osect->the_bfd_section); name = bfd_section_name (objfile->obfd, osect->the_bfd_section); printf_filtered ("Section %s, loaded at ", name); @@ -3392,7 +3392,7 @@ simple_overlay_update_1 (struct obj_section *osect) bfd *obfd = osect->objfile->obfd; asection *bsect = osect->the_bfd_section; - size = bfd_get_section_size_before_reloc (osect->the_bfd_section); + size = bfd_get_section_size (osect->the_bfd_section); for (i = 0; i < cache_novlys; i++) if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect) && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect) @@ -3453,7 +3453,7 @@ simple_overlay_update (struct obj_section *osect) bfd *obfd = osect->objfile->obfd; asection *bsect = osect->the_bfd_section; - size = bfd_get_section_size_before_reloc (osect->the_bfd_section); + size = bfd_get_section_size (osect->the_bfd_section); for (i = 0; i < cache_novlys; i++) if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect) && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect) diff --git a/contrib/gdb/gdb/tracepoint.c b/contrib/gdb/gdb/tracepoint.c index 39c6877..52fe4ca 100644 --- a/contrib/gdb/gdb/tracepoint.c +++ b/contrib/gdb/gdb/tracepoint.c @@ -1693,7 +1693,7 @@ remote_set_transparent_ranges (void) anysecs = 1; lma = s->lma; - size = bfd_get_section_size_before_reloc (s); + size = bfd_get_section_size (s); sprintf_vma (tmp1, lma); sprintf_vma (tmp2, lma + size); sprintf (target_buf + strlen (target_buf), -- cgit v1.1