Update.

	* iconvdata/gen-8bit-gap-1.sh: Update for new charmap format.
	* iconvdata/gen-8bit-gap.sh: Likewise.
	* iconvdata/gen-8bit.sh: Likewise.

	* iconv/gconv_open.c (__gconv_open): Move comment to correct position.

	* locale/programs/ld-collate.c (collate_read): Don't actually read
	the copy locale if we are ignoring the content.

	* sunrpc/xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from
	Jens Moeller <jens.moeller@waii.com>.

1 files changed, 3 insertions, 3 deletions

diff --git a/iconvdata/gen-8bit-gap-1.sh b/iconvdata/gen-8bit-gap-1.sh
index 5e949e7a2e..87d879bba2 100644
--- a/iconvdata/gen-8bit-gap-1.sh
+++ b/iconvdata/gen-8bit-gap-1.sh
@@ -1,15 +1,15 @@
 #! /bin/sh
 echo "static const uint32_t iso88597_to_ucs4[96] = {"
 sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \
-    -e 's/^[^[:space:]]*[[:space:]]*.x\([A-F].\)[[:space:]]*<U\(....\)>.*/  [0x\1 - 0xA0] = 0x\2,/p' \
+    -e 's/^<U\(....\)>[[:space:]]*.x\([A-F].\).*/  [0x\2 - 0xA0] = 0x\1,/p' \
     "$@" | sort -u
 echo "};"
 echo "static const struct gap from_idx[] = {"
-sed -ne 's/^[^[:space:]]*[[:space:]]*.x\([A-F].\)[[:space:]]*<U\(....\)>.*/\2/p' \
+sed -ne 's/^<U\(....\)>[[:space:]]*.x[A-F]..*/\1/p' \
     "$@" | sort -u | $AWK -f gap.awk
 echo "  { start: 0xffff, end: 0xffff, idx:     0 }"
 echo "};"
 echo "static const char iso88597_from_ucs4[] = {"
-sed -ne 's/^[^[:space:]]*[[:space:]]*.x\([A-F].\)[[:space:]]*<U\(....\)>.*/0x\2 0x\1/p' \
+sed -ne 's/^<U\(....\)>[[:space:]]*.x\([A-F].\).*/0x\1 0x\2/p' \
     "$@" | sort -u | $AWK -f gaptab.awk
 echo "};"