From: Alan Modra <amodra@gmail.com>
Date: Sun, 21 Oct 2012 09:06:07 +0000 (+0000)
Subject: bfd/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a72cc6e7e9e329b50b18cdc62b281ee1a5473f1;p=binutils-gdb.git

bfd/
	* compress.c (bfd_cache_section_contents): New function.
	* bfd-in2.h: Regenerate.
binutils/
	* objdump.c (load_specific_debug_section): Use
	bfd_cache_section_contents.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 78115e25255..5c6f6da9086 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-21  Alan Modra  <amodra@gmail.com>
+
+	* compress.c (bfd_cache_section_contents): New function.
+	* bfd-in2.h: Regenerate.
+
 2012-10-21  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* linker.c (_bfd_generic_link_output_symbols): Handle a
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index c37c005d752..919f51a2e9f 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -6709,6 +6709,9 @@ bfd_boolean bfd_compress_section_contents
 bfd_boolean bfd_get_full_section_contents
    (bfd *abfd, asection *section, bfd_byte **ptr);
 
+void bfd_cache_section_contents
+   (asection *sec, void *contents);
+
 bfd_boolean bfd_is_section_compressed
    (bfd *abfd, asection *section);
 
diff --git a/bfd/compress.c b/bfd/compress.c
index 294bfd3e9df..7f947817a17 100644
--- a/bfd/compress.c
+++ b/bfd/compress.c
@@ -253,6 +253,29 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr)
     }
 }
 
+/*
+FUNCTION
+	bfd_cache_section_contents
+
+SYNOPSIS
+	void bfd_cache_section_contents
+	  (asection *sec, void *contents);
+
+DESCRIPTION
+	Stash @var(contents) so any following reads of @var(sec) do
+	not need to decompress again.
+*/
+
+void
+bfd_cache_section_contents (asection *sec, void *contents)
+{
+  if (sec->compress_status == DECOMPRESS_SECTION_SIZED)
+    sec->compress_status = COMPRESS_SECTION_DONE;
+  sec->contents = contents;
+  sec->flags |= SEC_IN_MEMORY;
+}
+
+
 /*
 FUNCTION
 	bfd_is_section_compressed
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 9c091f28c07..a3cfcd0ea7c 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-21  Alan Modra  <amodra@gmail.com>
+
+	* objdump.c (load_specific_debug_section): Use
+	bfd_cache_section_contents.
+
 2012-10-18  Kai Tietz  <ktietz@redhat.com>
 
 	* objdump.c (dump_bfd): Call dump headers after
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 44e857a03fc..3b8f2826777 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -2272,13 +2272,7 @@ load_specific_debug_section (enum dwarf_section_display_enum debug,
 
   if (is_relocatable && debug_displays [debug].relocate)
     {
-      /* We want to relocate the data we've already read (and
-         decompressed), so we store a pointer to the data in
-         the bfd_section, and tell it that the contents are
-         already in memory.  */
-      sec->contents = section->start;
-      sec->flags |= SEC_IN_MEMORY;
-      sec->size = section->size;
+      bfd_cache_section_contents (sec, section->start);
 
       ret = bfd_simple_get_relocated_section_contents (abfd,
 						       sec,