[commits] r5831 - in /fsf/trunk/libc: ChangeLog locale/programs/ld-collate.c scripts/abi-versions.awk

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Apr  9 00:02:52 2008
New Revision: 5831

Log:
Import glibc-mainline for 2008-04-09

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/locale/programs/ld-collate.c
    fsf/trunk/libc/scripts/abi-versions.awk

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Apr  9 00:02:52 2008
@@ -1,3 +1,13 @@
+2008-04-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #6024]
+	* scripts/abi-versions.awk: If the version specified by
+	--enable-oldest-abi is older than the first version for this
+	architecture, use the default version.
+
+	* locale/programs/ld-collate.c (collate_read): Ignore script lines
+	as well when ignoring the whole category.
+
 2008-04-07  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #6042]

Modified: fsf/trunk/libc/locale/programs/ld-collate.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-collate.c (original)
+++ fsf/trunk/libc/locale/programs/ld-collate.c Wed Apr  9 00:02:52 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2003, 2005-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxx>, 1995.
 
@@ -3195,6 +3195,14 @@
 	  break;
 
 	case tok_script:
+	  /* Ignore the rest of the line if we don't need the input of
+	     this line.  */
+	  if (ignore_content)
+	    {
+	      lr_ignore_rest (ldfile, 0);
+	      break;
+	    }
+
 	  /* We get told about the scripts we know.  */
 	  arg = lr_token (ldfile, charmap, result, repertoire, verbose);
 	  if (arg->tok != tok_bsymbol)

Modified: fsf/trunk/libc/scripts/abi-versions.awk
==============================================================================
--- fsf/trunk/libc/scripts/abi-versions.awk (original)
+++ fsf/trunk/libc/scripts/abi-versions.awk Wed Apr  9 00:02:52 2008
@@ -30,6 +30,9 @@
 
   printf "#define ABI_%s_%s\tABI_%s_%s\n", libid, oldid, libid, newid;
   printf "#define VERSION_%s_%s\t%s\n", libid, oldid, new;
+
+  if ("GLIBC_" oldest_abi == old)
+    oldest_abi = "default";
   next;
 }