From: Alan Modra <amodra@gmail.com>
Date: Tue, 2 Aug 2005 23:09:16 +0000 (+0000)
Subject: 	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Correct value of
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d9620504f6c74c3145515151433b560c15865e3;p=binutils-gdb.git

	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Correct value of
	_GLOBAL_OFFSET_TABLE_ for > 32k GOT.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 841bb022cfa..fe62cb8a10a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Correct value of
+	_GLOBAL_OFFSET_TABLE_ for > 32k GOT.
+
 2005-08-02  Andreas Schwab  <schwab@suse.de>
 
 	* elfxx-ia64.c (struct elfNN_ia64_allocate_data): Add only_got.
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 6239438bb6c..454e9e0f204 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -4676,14 +4676,17 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
     {
       unsigned int g_o_t = 32768;
 
-      /* If we haven't allocated the header, do so now.  */
+      /* If we haven't allocated the header, do so now.  When we get here,
+	 for old plt/got the got size will be 0 to 32764 (not allocated),
+	 or 32780 to 65536 (header allocated).  For new plt/got, the
+	 corresponding ranges are 0 to 32768 and 32780 to 65536.  */
       if (htab->got->size <= 32768)
 	{
 	  g_o_t = htab->got->size;
+	  if (htab->old_plt)
+	    g_o_t += 4;
 	  htab->got->size += htab->got_header_size;
 	}
-      if (htab->old_plt && !htab->is_vxworks)
-	g_o_t += 4;
 
       htab->elf.hgot->root.u.def.value = g_o_t;
     }