about summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-22 04:25:38 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-22 04:25:38 +0000
commitc056ee48cbf7d3fc88d840af64d75c68ac281519 (patch)
tree4f345c5f9a0929a8d46157da92136232e3d90434 /locale
parentd58c3ad0212247b18f5feccd2580296f30816da2 (diff)
downloadglibc-c056ee48cbf7d3fc88d840af64d75c68ac281519.tar.gz
glibc-c056ee48cbf7d3fc88d840af64d75c68ac281519.tar.xz
glibc-c056ee48cbf7d3fc88d840af64d75c68ac281519.zip
Update.
	symbols and elements be named in reorder-after instructions.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-collate.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index fc5b447932..125356dadb 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -3385,6 +3385,25 @@ error while adding equivalent collating symbol"));
 			  no_error = 0;
 			}
 		    }
+		  else if (find_entry (&collate->elem_table,
+				       arg->val.str.startmb,
+				       arg->val.str.lenmb,
+				       (void **) &insp) == 0)
+		    {
+		      if (insp->last != NULL || insp->next != NULL)
+			collate->cursor = insp;
+		      else
+			{
+			  /* This is a collating element but its position
+			     is not yet defined.  */
+			  lr_error (ldfile, _("\
+%s: order for collating element %.*s not yet defined"),
+				    "LC_COLLATE", (int) arg->val.str.lenmb,
+				    arg->val.str.startmb);
+			  collate->cursor = NULL;
+			  no_error = 0;
+			}
+		    }
 		  else
 		    {
 		      /* This is bad.  The symbol after which we have to