From c34f4fc672e56b1bcd89a108e2b799437ce2241a Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 25 Sep 2009 09:57:50 +0000 Subject: [PATCH] PR 10656 * readelf.c: Remove duplicate declaration of variable do_wide. * dwarf.h: Add export of do_wide. * hist.h: Move declaration of histograms and num_histograms variables from here to... * hist.c: ...here. --- binutils/ChangeLog | 6 ++++++ binutils/dwarf.h | 14 ++++++++------ binutils/readelf.c | 1 - gprof/ChangeLog | 7 +++++++ gprof/hist.c | 4 +++- gprof/hist.h | 7 ++++--- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 71df175..04e553f 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2009-09-25 Dimitry Gorbachev + + PR 10656 + * readelf.c: Remove duplicate declaration of variable do_wide. + * dwarf.h: Add export of do_wide. + 2009-09-24 Cary Coutant * dwarf.c (get_TAG_name): Add missing DWARF-3 and new DWARF-4 tags. diff --git a/binutils/dwarf.h b/binutils/dwarf.h index 5d793ed..b39aba1 100644 --- a/binutils/dwarf.h +++ b/binutils/dwarf.h @@ -32,9 +32,9 @@ typedef unsigned long dwarf_size_type; struct dwarf_section { /* A debug section has a different name when it's stored compressed - * or not. COMPRESSED_NAME and UNCOMPRESSED_NAME are the two - * possibilities. NAME is set to whichever one is used for this - * input file, as determined by load_debug_section(). */ + or not. COMPRESSED_NAME and UNCOMPRESSED_NAME are the two + possibilities. NAME is set to whichever one is used for this + input file, as determined by load_debug_section(). */ const char *uncompressed_name; const char *compressed_name; const char *name; @@ -53,7 +53,8 @@ struct dwarf_section_display unsigned int relocate : 1; }; -enum dwarf_section_display_enum { +enum dwarf_section_display_enum +{ abbrev = 0, aranges, frame, @@ -111,6 +112,7 @@ extern int do_debug_frames_interp; extern int do_debug_macinfo; extern int do_debug_str; extern int do_debug_loc; +extern int do_wide; extern void init_dwarf_regnames (unsigned int); @@ -120,8 +122,8 @@ extern void free_debug_section (enum dwarf_section_display_enum); extern void free_debug_memory (void); -extern void dwarf_select_sections_by_names (const char *names); -extern void dwarf_select_sections_by_letters (const char *letters); +extern void dwarf_select_sections_by_names (const char *); +extern void dwarf_select_sections_by_letters (const char *); extern void dwarf_select_sections_all (void); void *cmalloc (size_t, size_t); diff --git a/binutils/readelf.c b/binutils/readelf.c index 425161c..9c09823 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -149,7 +149,6 @@ #include "filenames.h" char * program_name = "readelf"; -int do_wide; static long archive_file_offset; static unsigned long archive_file_size; static unsigned long dynamic_addr; diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 8908440..1f0b8cb 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,10 @@ +2009-09-25 Dimitry Gorbachev + + PR 10656 + * hist.h: Move declaration of histograms and num_histograms + variables from here to... + * hist.c: ...here. + 2009-09-23 Nick Clifton * po/vi.po: Updated Vietnamese translation. diff --git a/gprof/hist.c b/gprof/hist.c index a790fd4..6f4ead8 100644 --- a/gprof/hist.c +++ b/gprof/hist.c @@ -1,6 +1,6 @@ /* hist.c - Histogram related operations. - Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2007 + Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2009 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -48,6 +48,8 @@ extern void flat_blurb (FILE * fp); static histogram *find_histogram (bfd_vma lowpc, bfd_vma highpc); static histogram *find_histogram_for_pc (bfd_vma pc); +histogram * histograms; +unsigned num_histograms; double hist_scale; static char hist_dimension[16] = "seconds"; static char hist_dimension_abbrev = 's'; diff --git a/gprof/hist.h b/gprof/hist.h index 3facb5a..0bd5320 100644 --- a/gprof/hist.h +++ b/gprof/hist.h @@ -1,6 +1,7 @@ /* hist.h - Copyright 2000, 2001, 2002, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002, 2004, 2005, 2007, 2009 + Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -30,8 +31,8 @@ typedef struct histogram int *sample; /* Histogram samples (shorts in the file!). */ } histogram; -histogram *histograms; -unsigned num_histograms; +extern histogram * histograms; +extern unsigned num_histograms; /* Scale factor converting samples to pc values: each sample covers HIST_SCALE bytes. */ -- 2.7.4