Re: [patches] Fix build failure in ld-collate.c

[Jim Blandy <jimb@xxxxxxxxxxxxxxxx>]

"Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx> writes:
> On Thu, 13 Sep 2007, Jim Blandy wrote:
>
>> ChangeLog.eglibc:
>> 2007-09-13  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
>> 
>> 	* locale/programs/ld-collate.c (collate_output): Call
>> 	add_locale_callidx_table as required by cross-localedef changes,
>> 	not collidx_table_finalize.
>
> We now have two calls to add_locale_collidx_table very close together.  I 
> hope that's correct....

I'm sure it's not.  Thanks for the sharp eyes.

ChangeLog.eglibc:
2007-09-14  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>

	* locale/programs/ld-collate.c (collate_output): Remove extra call
	to add_locale_collidx_table.

Index: locale/programs/ld-collate.c
===================================================================
--- locale/programs/ld-collate.c	(revision 3490)
+++ locale/programs/ld-collate.c	(working copy)
@@ -2357,8 +2357,6 @@
 
   wchead_table_iterate (&collate->wcheads, add_to_tablewc);
 
-  add_locale_collidx_table (&file, &tablewc);
-
   memset (&atwc, 0, sizeof (atwc));
 
   /* Now add the four tables.  */