From: Alan Modra <amodra@gmail.com>
Date: Wed, 8 Nov 2006 11:29:16 +0000 (+0000)
Subject: ld/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e3be61d603553999904347b0bd5f14d3ee1f972;p=binutils-gdb.git

ld/
	* emultempl/elf32.em (gld*_before_allocation): Adjust output section
	size for warning sections.
ld/testsuite/
	* ld-elf/group.ld: Handle .rodata.brlt for powerpc64.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f3e13838342..7f838f627fb 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,7 +1,12 @@
+2006-11-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* emultempl/elf32.em (gld*_before_allocation): Adjust output section
+	size for warning sections.
+
 2006-11-06  Vladimir Prus  <vladimir@codesourcery.com>
 
-	* emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
-	Don't prepend "warning" to the message.
+	* emultempl/elf32.em (gld*_before_allocation): Don't prepend
+	"warning" to the message.
 
 2006-10-31  Pedro Alves  <pedro_alves@portugalmail.pt>
 
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index ff48c566870..03d9d8d5ae9 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1204,12 +1204,19 @@ ${ELF_INTERPRETER_SET_DEFAULT}
 	ASSERT (ret);
 	free (msg);
 
-	/* Clobber the section size, so that we don't waste copying the
-	   warning into the output file.  */
+	/* Clobber the section size, so that we don't waste space
+	   copying the warning into the output file.  If we've already
+	   sized the output section, adjust its size.  The adjustment
+	   is on rawsize because targets that size sections early will
+	   have called lang_reset_memory_regions after sizing.  */
+	if (s->output_section != NULL
+	    && s->output_section->rawsize >= s->size)
+	  s->output_section->rawsize -= s->size;
+
 	s->size = 0;
 
-	/* Also set SEC_EXCLUDE, so that symbols defined in the warning
-	   section don't get copied to the output.  */
+	/* Also set SEC_EXCLUDE, so that local symbols defined in the
+	   warning section don't get copied to the output.  */
 	s->flags |= SEC_EXCLUDE | SEC_KEEP;
       }
   }
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 86b084e6ddb..397caa11e35 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,7 +1,11 @@
+2006-11-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* ld-elf/group.ld: Handle .rodata.brlt for powerpc64.
+
 2006-11-07  Vladimir Prus  <vladimir@codesourcery.com>  
 
-	* testsuite/ld-elf/symbol2w.s: Use "%" instead
-	of "@" to avoid breakage on ARM.
+	* testsuite/ld-elf/symbol2w.s: Use "%" instead of "@" to avoid
+	breakage on ARM.
 
 2006-11-06  Vladimir Prus  <vladimir@codesourcery.com>  
 
diff --git a/ld/testsuite/ld-elf/group.ld b/ld/testsuite/ld-elf/group.ld
index d6b27d04946..71852745b64 100644
--- a/ld/testsuite/ld-elf/group.ld
+++ b/ld/testsuite/ld-elf/group.ld
@@ -1,5 +1,5 @@
 SECTIONS
 {
   . = 0x1000;
-  .text : { *(.text) }
+  .text : { *(.text) *(.rodata.brlt) }
 }