rpms/binutils/devel binutils-2.16.91.0.6-frepo.patch, NONE, 1.1 binutils.spec, 1.78, 1.79

[fedora-cvs-commits redhat com]

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2240

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.16.91.0.6-frepo.patch 
Log Message:
2.16.91.0.6-6


binutils-2.16.91.0.6-frepo.patch:
 ldmisc.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

--- NEW FILE binutils-2.16.91.0.6-frepo.patch ---
2006-03-31  Jakub Jelinek  <jakub redhat com>

	* ldmisc.c (vfinfo): Revert 2005-10-05 changes.  If
	bfd_find_nearest_line succeeded for %C or %D, but filename
	is NULL, print section+offset at the end.

--- ld/ldmisc.c.jj	2005-12-14 13:50:35.000000000 +0100
+++ ld/ldmisc.c	2006-03-30 18:23:59.000000000 +0200
@@ -1,6 +1,6 @@
 /* ldmisc.c
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005
+   2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
@@ -337,7 +337,7 @@ vfinfo (FILE *fp, const char *fmt, va_li
 				&& strcmp (last_file, filename) != 0)
 			    || strcmp (last_function, functionname) != 0)
 			  {
-			    lfinfo (fp, _("%B: In function `%T'"),
+			    lfinfo (fp, _("%B: In function `%T':\n"),
 				    abfd, functionname);
 
 			    last_bfd = abfd;
@@ -353,20 +353,17 @@ vfinfo (FILE *fp, const char *fmt, va_li
 			discard_last = FALSE;
 		      }
 		    else
-		      lfinfo (fp, "%B", abfd);
+		      lfinfo (fp, "%B:", abfd);
 
 		    if (filename != NULL)
-		      fprintf (fp, ":%s", filename);
+		      fprintf (fp, "%s:", filename);
 
 		    if (functionname != NULL && fmt[-1] == 'G')
-		      lfinfo (fp, ":%T", functionname);
-		    else if (filename != NULL)
-		      {
-			if (linenumber != 0)
-			  fprintf (fp, ":%u", linenumber);
-			else
-			  lfinfo (fp, ":(%A+0x%v)", section, offset);
-		      }
+		      lfinfo (fp, "%T", functionname);
+		    else if (filename != NULL && linenumber != 0)
+		      fprintf (fp, "%u", linenumber);
+		    else
+		      lfinfo (fp, "(%A+0x%v)", section, offset);
 		  }
 		else
 		  lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset);


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- binutils.spec	10 Mar 2006 02:55:57 -0000	1.78
+++ binutils.spec	31 Mar 2006 11:35:30 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.16.91.0.6
-Release: 4
+Release: 6
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -17,6 +17,7 @@
 Patch9: binutils-2.16.91.0.6-mni.patch
 Patch10: binutils-2.16.91.0.6-cfaval.patch
 Patch11: binutils-2.16.91.0.6-rh184590.patch
+Patch12: binutils-2.16.91.0.6-frepo.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -57,6 +58,7 @@
 %patch9 -p0 -b .mni~
 %patch10 -p0 -b .cfaval~
 %patch11 -p0 -b .rh184590~
+%patch12 -p0 -b .frepo~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -167,6 +169,10 @@
 %{_infodir}/*info*
 
 %changelog
+* Fri Mar 31 2006 Jakub Jelinek <jakub redhat com> 2.16.91.0.6-6
+- fix ld error message formatting, so that collect2 parser can
+  parse it again for g++ -frepo (#187142)
+
 * Thu Mar  9 2006 Alexandre Oliva <aoliva redhat com> 2.16.91.0.6-4
 - fix relaxation of TLS GD to LE on PPC (#184590)