File ppc-ensure-undef-dynamic-weak-undefined.patch of Package binutils

Overview Repositories Revisions Requests Users Attributes Meta

File ppc-ensure-undef-dynamic-weak-undefined.patch of Package binutils (Revision c9f08feffb0a6f2e0e55085b33615d1a)

Currently displaying revision c9f08feffb0a6f2e0e55085b33615d1a , Show latest

From b293661219c36e72acb80502a86b51160bb88cfd Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 3 May 2021 10:03:06 +0930
Subject: [PATCH] PPC: ensure_undef_dynamic on weak undef only in plt

It's slightly weird to have a call to a weak function not protected by
a test of that function being non-NULL, but the non-NULL test might be
covered by a test of another function.  For example:
  if (func1)
    {
      func1 ();
      func2 ();
    }
where func2 is known to exist if func1 exists.

* elf32-ppc.c (allocate_dynrelocs): Call ensure_undef_dynamic for
	weak undefined symols that only appear on PLT relocs.
	* elf64-ppc.c (allocate_dynrelocs): Likewise.

From 4916030821bb0b052091bd1e29f1851e1512a056 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 3 May 2021 12:28:46 +0930
Subject: [PATCH] PPC: undefweak dynamic relocs

This makes the default for ppc to keep dynamic relocs on undefweak
symbols when the code won't cause DT_TEXTREL (for instance when -fPIE
or -fPIC).  If ld is given -z dynamic-undefined-weak then dynamic
relocations will be created for non-PIC at the expense of possibly
causing DT_TEXTREL to be set on ppc32.  Note that DT_TEXTREL and GNU
indirect functions are incompatible.

* elf32-ppc.c (allocate_dynrelocs): Keep dyn_relocs for undefweak
	symbols when -z dynamic-undefined-weak or when there are no
	dynamic relocs in read-only sections and -z nodynamic-undefined-weak
	is not given.
	* elf64-ppc.c (allocate_dynrelocs): Likewise.

Index: binutils-2.36/bfd/elf32-ppc.c
===================================================================
--- binutils-2.36.orig/bfd/elf32-ppc.c
+++ binutils-2.36/bfd/elf32-ppc.c
@@ -5237,7 +5237,11 @@ allocate_dynrelocs (struct elf_link_hash
       /* For the non-pic case, discard space for relocs against
 	 symbols which turn out to need copy relocs or are not
 	 dynamic.  */
-      if (h->dynamic_adjusted
+      if ((h->dynamic_adjusted
+	   || (h->ref_regular
+	       && h->root.type == bfd_link_hash_undefweak
+	       && (info->dynamic_undefined_weak > 0
+		   || !_bfd_elf_readonly_dynrelocs (h))))
 	  && !h->def_regular
 	  && !ELF_COMMON_DEF_P (h)
 	  && !(h->protected_def
@@ -5289,8 +5293,12 @@ allocate_dynrelocs (struct elf_link_hash
       for (ent = h->plt.plist; ent != NULL; ent = ent->next)
 	if (ent->plt.refcount > 0)
 	  {
-	    asection *s = htab->elf.splt;
+	    asection *s;
 
+	    if (!ensure_undef_dynamic (info, h))
+	      return FALSE;
+
+	    s = htab->elf.splt;
 	    if (!dyn)
 	      {
 		if (h->type == STT_GNU_IFUNC)
Index: binutils-2.36/bfd/elf64-ppc.c
===================================================================
--- binutils-2.36.orig/bfd/elf64-ppc.c
+++ binutils-2.36/bfd/elf64-ppc.c
@@ -9777,7 +9777,11 @@ allocate_dynrelocs (struct elf_link_hash
 	 relocs against symbols which are not dynamic.  */
       else if (h->type != STT_GNU_IFUNC)
 	{
-	  if (h->dynamic_adjusted
+	  if ((h->dynamic_adjusted
+	       || (h->ref_regular
+		   && h->root.type == bfd_link_hash_undefweak
+		   && (info->dynamic_undefined_weak > 0
+		       || !_bfd_elf_readonly_dynrelocs (h))))
 	      && !h->def_regular
 	      && !ELF_COMMON_DEF_P (h))
 	    {
@@ -9824,6 +9828,9 @@ allocate_dynrelocs (struct elf_link_hash
       for (pent = h->plt.plist; pent != NULL; pent = pent->next)
 	if (pent->plt.refcount > 0)
 	  {
+	    if (!ensure_undef_dynamic (info, h))
+	      return FALSE;
+
 	    if (!htab->elf.dynamic_sections_created
 		|| h->dynindx == -1)
 	      {

Places

File ppc-ensure-undef-dynamic-weak-undefined.patch of Package binutils (Revision c9f08feffb0a6f2e0e55085b33615d1a)

Places