[PATCH] MIPS/LD: Fix up testsuite breakage from gettextisation

Maciej W. Rozycki macro@codesourcery.com
Tue Aug 17 02:42:00 GMT 2010


Hi,

 This change:

2010-04-20  Nick Clifton  <nickc@redhat.com>

	* readelf.c: Add _() macros to constant strings that are
	translatable.

broke MIPS/LD testsuite, because (despite the innocent description) it 
added semantic changes.  Here's the offending hunk:

Index: binutils/readelf.c
===================================================================
--- binutils/readelf.c	(revision 283350)
+++ binutils/readelf.c	(revision 283351)
@@ -10228,19 +10229,19 @@ display_mips_gnu_attribute (unsigned cha
       switch (val)
 	{
 	case 0:
-	  printf ("Hard or soft float\n");
+	  printf (_("Hard or soft float\n"));
 	  break;
 	case 1:
-	  printf ("Hard float (-mdouble-float)\n");
+	  printf (_("Hard float (double precision)\n"));
 	  break;
 	case 2:
-	  printf ("Hard float (-msingle-float)\n");
+	  printf (_("Hard float (single precision)\n"));
 	  break;
 	case 3:
-	  printf ("Soft float\n");
+	  printf (_("Soft float\n"));
 	  break;
 	case 4:
-	  printf ("64-bit float (-mips32r2 -mfp64)\n");
+	  printf (_("64-bit float (-mips32r2 -mfp64)\n"));
 	  break;
 	default:
 	  printf ("??? (%d)\n", val);

While the changes to the messages might have been legitimate (what was the 
reason behind them BTW? -- I don't find the new ones any better than the 
old ones), please do not combine syntactic and semantic changes like this 
-- they are extremely difficult to track down and separate properly (a 
binary search on the repository is needed as the ChangeLog entry gives no 
clue).

 Here are the test case updates required unless we revert the semantic 
changes above.  Tested with mips-sde-elf and mips-linux-gnu targets.  
Comments?

 If the change is to stay, then we may as well fix up the old ChangeLog 
entry.  I can do this while committing this testsuite update; at this 
point it seems to make sense to do all of this with a single commit.

2010-08-17  Maciej W. Rozycki  <macro@codesourcery.com>

	ld/testsuite/
	* ld-mips-elf/attr-gnu-4-01.d: Correct Tag_GNU_MIPS_ABI_FP.
	* ld-mips-elf/attr-gnu-4-02.d: Likewise.
	* ld-mips-elf/attr-gnu-4-10.d: Likewise.
	* ld-mips-elf/attr-gnu-4-11.d: Likewise.
	* ld-mips-elf/attr-gnu-4-15.d: Likewise.
	* ld-mips-elf/attr-gnu-4-20.d: Likewise.
	* ld-mips-elf/attr-gnu-4-22.d: Likewise.
	* ld-mips-elf/attr-gnu-4-25.d: Likewise.

  Maciej

binutils-2.20.51-20100817-mips-gnu-attr-test-0.diff
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-15.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-15.d	(working copy)
@@ -8,4 +8,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-mdouble-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(double precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-25.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-25.d	(working copy)
@@ -8,4 +8,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-msingle-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(single precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-01.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-01.d	(working copy)
@@ -7,4 +7,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-mdouble-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(double precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-10.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-10.d	(working copy)
@@ -7,4 +7,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-mdouble-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(double precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-02.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-02.d	(working copy)
@@ -7,4 +7,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-msingle-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(single precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-11.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-11.d	(working copy)
@@ -7,4 +7,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-mdouble-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(double precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-20.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-20.d	(working copy)
@@ -7,4 +7,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-msingle-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(single precision\)
Index: ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
===================================================================
--- ld/testsuite/ld-mips-elf/attr-gnu-4-22.d	(revision 296366)
+++ ld/testsuite/ld-mips-elf/attr-gnu-4-22.d	(working copy)
@@ -7,4 +7,4 @@
 
 Attribute Section: gnu
 File Attributes
-  Tag_GNU_MIPS_ABI_FP: Hard float \(-msingle-float\)
+  Tag_GNU_MIPS_ABI_FP: Hard float \(single precision\)



More information about the Binutils mailing list