Module Name:    src
Committed By:   christos
Date:           Wed Jun 15 14:47:23 UTC 2016

Modified Files:
        src/external/gpl3/binutils/dist/bfd: elf32-hppa.c elf32-i386.c
            elf32-m68k.c elf32-sh.c elf32-vax.c elfxx-sparc.c

Log Message:
Harmonize the error messages about dynamic relocations.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/bfd/elf32-hppa.c \
    src/external/gpl3/binutils/dist/bfd/elf32-m68k.c \
    src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/bfd/elf32-i386.c \
    src/external/gpl3/binutils/dist/bfd/elf32-sh.c
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/dist/bfd/elf32-vax.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/elf32-hppa.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-hppa.c:1.7 src/external/gpl3/binutils/dist/bfd/elf32-hppa.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elf32-hppa.c:1.7	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-hppa.c	Wed Jun 15 10:47:23 2016
@@ -2185,8 +2185,8 @@ readonly_dynrelocs (struct elf_link_hash
 
           if (info->warn_shared_textrel)
             (*_bfd_error_handler)
-              (_("warning: dynamic relocation in readonly section `%s'"),
-              eh->root.root.string);
+              (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+              eh->root.root.string, sec->name);
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
Index: src/external/gpl3/binutils/dist/bfd/elf32-m68k.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.7 src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.7	Fri Apr 22 13:40:36 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-m68k.c	Wed Jun 15 10:47:23 2016
@@ -2816,8 +2816,8 @@ elf_m68k_check_relocs (bfd *abfd,
 		{
 		  if (info->warn_shared_textrel)
 		    (*_bfd_error_handler)
-		      (_("warning: dynamic relocation in readonly section `%s'"),
-		      h->root.root.string); 
+		      (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+		      h->root.root.string, sec->name); 
 		  info->flags |= DF_TEXTREL;
 		}
 
@@ -3439,8 +3439,8 @@ elf_m68k_discard_copies (struct elf_link
 	      {
 		if (info->warn_shared_textrel)
 		  (*_bfd_error_handler)
-		    (_("warning: dynamic relocation in readonly section `%s'"),
-		    h->root.root.string); 
+		    (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+		    h->root.root.string, s->name); 
 		info->flags |= DF_TEXTREL;
 		break;
 	      }
Index: src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c
diff -u src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c:1.7 src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c:1.7	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c	Wed Jun 15 10:47:23 2016
@@ -2516,8 +2516,8 @@ readonly_dynrelocs (struct elf_link_hash
 
           if (info->warn_shared_textrel)
             (*_bfd_error_handler)
-              (_("warning: dynamic relocation in readonly section `%s'"),
-              h->root.root.string);
+              (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+              h->root.root.string, s->name);
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */

Index: src/external/gpl3/binutils/dist/bfd/elf32-i386.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-i386.c:1.6 src/external/gpl3/binutils/dist/bfd/elf32-i386.c:1.7
--- src/external/gpl3/binutils/dist/bfd/elf32-i386.c:1.6	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-i386.c	Wed Jun 15 10:47:23 2016
@@ -2718,8 +2718,8 @@ elf_i386_readonly_dynrelocs (struct elf_
 	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
 	  if (info->warn_shared_textrel)
 	    (*_bfd_error_handler)
-	      (_("warning: dynamic relocation in readonly section `%s'"),
-	      h->root.root.string); 
+	      (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+	      h->root.root.string, s->name); 
 	  info->flags |= DF_TEXTREL;
 
 	  if ((info->warn_shared_textrel && bfd_link_pic (info))
Index: src/external/gpl3/binutils/dist/bfd/elf32-sh.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.6 src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.7
--- src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.6	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-sh.c	Wed Jun 15 10:47:23 2016
@@ -3304,8 +3304,8 @@ readonly_dynrelocs (struct elf_link_hash
 
           if (info->warn_shared_textrel)
             (*_bfd_error_handler)
-              (_("warning: dynamic relocation in readonly section `%s'"),
-              h->root.root.string);
+              (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+              h->root.root.string, s->name);
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */

Index: src/external/gpl3/binutils/dist/bfd/elf32-vax.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.12 src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.13
--- src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.12	Sun Feb 14 14:00:04 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-vax.c	Wed Jun 15 10:47:23 2016
@@ -781,8 +781,8 @@ elf_vax_check_relocs (bfd *abfd, struct 
 		    {
 			if (info->warn_shared_textrel)
 			  (*_bfd_error_handler)
-			    (_("warning: dynamic relocation in readonly section `%s'"),
-			     sec->name);
+			    (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+			     h->root.root.string, sec->name);
 			info->flags |= DF_TEXTREL;
 		    }
 		}

Reply via email to