From 0c0c8bdeed0b6d5546e287300d1e210445991ae4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 22 Jul 2000 02:36:19 +0000 Subject: Update. * locale/programs/ld-collate.c (handle_ellipsis): Test for duplication with generated name, not the name of the first character. Patch by Yong Li . --- ChangeLog | 5 + linuxthreads/ChangeLog | 7 ++ locale/programs/ld-collate.c | 2 +- localedata/ChangeLog | 7 ++ localedata/charmaps/SJIS | 260 ++++++++++++++++++++++--------------------- 5 files changed, 152 insertions(+), 129 deletions(-) diff --git a/ChangeLog b/ChangeLog index c81ec9a4a8..0ce2f6b95f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2000-07-21 Ulrich Drepper + * locale/programs/ld-collate.c (handle_ellipsis): Test for + duplication with generated name, not the name of the first + character. + Patch by Yong Li . + * sysdeps/powerpc/strchr.S: Correct bugs introduced in BP-ification. Patch by Franz Sirl . diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 438f451a41..a151848cbf 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2000-07-21 Ulrich Drepper + + * linuxthreads/spinlock.h: If IMPLEMENT_TAS_WITH_CAS is defined use + __compare_and_swap to define testandset. + * linuxthreads/sysdeps/powerpc/pt-machine.h: Add volatile to asms. + Define IMPLEMENT_TAS_WITH_CAS. + 2000-07-20 Ulrich Drepper * Makefile: Pass -z nodelete to linker for libpthread.so diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 89621c82e1..861269bc70 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1264,7 +1264,7 @@ order for `%.*s' already defined at %s:%Zu"), sprintf (buf + preflen, base == 10 ? "%d" : "%x", from); /* Look whether this name is already defined. */ - if (find_entry (&collate->seq_table, symstr, symlen, + if (find_entry (&collate->seq_table, buf, symlen, (void **) &elem) == 0) { if (elem->next != NULL || (collate->cursor != NULL diff --git a/localedata/ChangeLog b/localedata/ChangeLog index a2a6952183..cec673a49b 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2000-07-21 Ulrich Drepper + + * charmaps/SJIS: Add width information. + Patch by GOTO Masanori . + + * charmaps/SJIS: Correct byte sequence for single byte characters. + 2000-07-19 Ulrich Drepper * locales/i18n: Fix typos. diff --git a/localedata/charmaps/SJIS b/localedata/charmaps/SJIS index ac8cd14687..49dd94e514 100644 --- a/localedata/charmaps/SJIS +++ b/localedata/charmaps/SJIS @@ -5,134 +5,134 @@ 2 CHARMAP - /x00/x00 NULL (NUL) - /x00/x01 START OF HEADING (SOH) - /x00/x02 START OF TEXT (STX) - /x00/x03 END OF TEXT (ETX) - /x00/x04 END OF TRANSMISSION (EOT) - /x00/x05 ENQUIRY (ENQ) - /x00/x06 ACKNOWLEDGE (ACK) - /x00/x07 BELL (BEL) - /x00/x08 BACKSPACE (BS) - /x00/x09 CHARACTER TABULATION (HT) - /x00/x0a LINE FEED (LF) - /x00/x0b LINE TABULATION (VT) - /x00/x0c FORM FEED (FF) - /x00/x0d CARRIAGE RETURN (CR) - /x00/x0e SHIFT OUT (SO) - /x00/x0f SHIFT IN (SI) - /x00/x10 DATALINK ESCAPE (DLE) - /x00/x11 DEVICE CONTROL ONE (DC1) - /x00/x12 DEVICE CONTROL TWO (DC2) - /x00/x13 DEVICE CONTROL THREE (DC3) - /x00/x14 DEVICE CONTROL FOUR (DC4) - /x00/x15 NEGATIVE ACKNOWLEDGE (NAK) - /x00/x16 SYNCHRONOUS IDLE (SYN) - /x00/x17 END OF TRANSMISSION BLOCK (ETB) - /x00/x18 CANCEL (CAN) - /x00/x19 END OF MEDIUM (EM) - /x00/x1a SUBSTITUTE (SUB) - /x00/x1b ESCAPE (ESC) - /x00/x1c FILE SEPARATOR (IS4) - /x00/x1d GROUP SEPARATOR (IS3) - /x00/x1e RECORD SEPARATOR (IS2) - /x00/x1f UNIT SEPARATOR (IS1) - /x00/x20 SPACE - /x00/x21 EXCLAMATION MARK - /x00/x22 QUOTATION MARK - /x00/x23 NUMBER SIGN - /x00/x24 DOLLAR SIGN - /x00/x25 PERCENT SIGN - /x00/x26 AMPERSAND - /x00/x27 APOSTROPHE - /x00/x28 LEFT PARENTHESIS - /x00/x29 RIGHT PARENTHESIS - /x00/x2a ASTERISK - /x00/x2b PLUS SIGN - /x00/x2c COMMA - /x00/x2d HYPHEN-MINUS - /x00/x2e FULL STOP - /x00/x2f SOLIDUS - /x00/x30 DIGIT ZERO - /x00/x31 DIGIT ONE - /x00/x32 DIGIT TWO - /x00/x33 DIGIT THREE - /x00/x34 DIGIT FOUR - /x00/x35 DIGIT FIVE - /x00/x36 DIGIT SIX - /x00/x37 DIGIT SEVEN - /x00/x38 DIGIT EIGHT - /x00/x39 DIGIT NINE - /x00/x3a COLON - /x00/x3b SEMICOLON - /x00/x3c LESS-THAN SIGN - /x00/x3d EQUALS SIGN - /x00/x3e GREATER-THAN SIGN - /x00/x3f QUESTION MARK - /x00/x40 COMMERCIAL AT - /x00/x41 LATIN CAPITAL LETTER A - /x00/x42 LATIN CAPITAL LETTER B - /x00/x43 LATIN CAPITAL LETTER C - /x00/x44 LATIN CAPITAL LETTER D - /x00/x45 LATIN CAPITAL LETTER E - /x00/x46 LATIN CAPITAL LETTER F - /x00/x47 LATIN CAPITAL LETTER G - /x00/x48 LATIN CAPITAL LETTER H - /x00/x49 LATIN CAPITAL LETTER I - /x00/x4a LATIN CAPITAL LETTER J - /x00/x4b LATIN CAPITAL LETTER K - /x00/x4c LATIN CAPITAL LETTER L - /x00/x4d LATIN CAPITAL LETTER M - /x00/x4e LATIN CAPITAL LETTER N - /x00/x4f LATIN CAPITAL LETTER O - /x00/x50 LATIN CAPITAL LETTER P - /x00/x51 LATIN CAPITAL LETTER Q - /x00/x52 LATIN CAPITAL LETTER R - /x00/x53 LATIN CAPITAL LETTER S - /x00/x54 LATIN CAPITAL LETTER T - /x00/x55 LATIN CAPITAL LETTER U - /x00/x56 LATIN CAPITAL LETTER V - /x00/x57 LATIN CAPITAL LETTER W - /x00/x58 LATIN CAPITAL LETTER X - /x00/x59 LATIN CAPITAL LETTER Y - /x00/x5a LATIN CAPITAL LETTER Z - /x00/x5b LEFT SQUARE BRACKET - /x00/x5c YEN SIGN - /x00/x5d RIGHT SQUARE BRACKET - /x00/x5e CIRCUMFLEX ACCENT - /x00/x5f LOW LINE - /x00/x60 GRAVE ACCENT - /x00/x61 LATIN SMALL LETTER A - /x00/x62 LATIN SMALL LETTER B - /x00/x63 LATIN SMALL LETTER C - /x00/x64 LATIN SMALL LETTER D - /x00/x65 LATIN SMALL LETTER E - /x00/x66 LATIN SMALL LETTER F - /x00/x67 LATIN SMALL LETTER G - /x00/x68 LATIN SMALL LETTER H - /x00/x69 LATIN SMALL LETTER I - /x00/x6a LATIN SMALL LETTER J - /x00/x6b LATIN SMALL LETTER K - /x00/x6c LATIN SMALL LETTER L - /x00/x6d LATIN SMALL LETTER M - /x00/x6e LATIN SMALL LETTER N - /x00/x6f LATIN SMALL LETTER O - /x00/x70 LATIN SMALL LETTER P - /x00/x71 LATIN SMALL LETTER Q - /x00/x72 LATIN SMALL LETTER R - /x00/x73 LATIN SMALL LETTER S - /x00/x74 LATIN SMALL LETTER T - /x00/x75 LATIN SMALL LETTER U - /x00/x76 LATIN SMALL LETTER V - /x00/x77 LATIN SMALL LETTER W - /x00/x78 LATIN SMALL LETTER X - /x00/x79 LATIN SMALL LETTER Y - /x00/x7a LATIN SMALL LETTER Z - /x00/x7b LEFT CURLY BRACKET - /x00/x7c VERTICAL LINE - /x00/x7d RIGHT CURLY BRACKET - /x00/x7e OVERLINE - /x00/x7f DELETE (DEL) + /x00 NULL (NUL) + /x01 START OF HEADING (SOH) + /x02 START OF TEXT (STX) + /x03 END OF TEXT (ETX) + /x04 END OF TRANSMISSION (EOT) + /x05 ENQUIRY (ENQ) + /x06 ACKNOWLEDGE (ACK) + /x07 BELL (BEL) + /x08 BACKSPACE (BS) + /x09 CHARACTER TABULATION (HT) + /x0a LINE FEED (LF) + /x0b LINE TABULATION (VT) + /x0c FORM FEED (FF) + /x0d CARRIAGE RETURN (CR) + /x0e SHIFT OUT (SO) + /x0f SHIFT IN (SI) + /x10 DATALINK ESCAPE (DLE) + /x11 DEVICE CONTROL ONE (DC1) + /x12 DEVICE CONTROL TWO (DC2) + /x13 DEVICE CONTROL THREE (DC3) + /x14 DEVICE CONTROL FOUR (DC4) + /x15 NEGATIVE ACKNOWLEDGE (NAK) + /x16 SYNCHRONOUS IDLE (SYN) + /x17 END OF TRANSMISSION BLOCK (ETB) + /x18 CANCEL (CAN) + /x19 END OF MEDIUM (EM) + /x1a SUBSTITUTE (SUB) + /x1b ESCAPE (ESC) + /x1c FILE SEPARATOR (IS4) + /x1d GROUP SEPARATOR (IS3) + /x1e RECORD SEPARATOR (IS2) + /x1f UNIT SEPARATOR (IS1) + /x20 SPACE + /x21 EXCLAMATION MARK + /x22 QUOTATION MARK + /x23 NUMBER SIGN + /x24 DOLLAR SIGN + /x25 PERCENT SIGN + /x26 AMPERSAND + /x27 APOSTROPHE + /x28 LEFT PARENTHESIS + /x29 RIGHT PARENTHESIS + /x2a ASTERISK + /x2b PLUS SIGN + /x2c COMMA + /x2d HYPHEN-MINUS + /x2e FULL STOP + /x2f SOLIDUS + /x30 DIGIT ZERO + /x31 DIGIT ONE + /x32 DIGIT TWO + /x33 DIGIT THREE + /x34 DIGIT FOUR + /x35 DIGIT FIVE + /x36 DIGIT SIX + /x37 DIGIT SEVEN + /x38 DIGIT EIGHT + /x39 DIGIT NINE + /x3a COLON + /x3b SEMICOLON + /x3c LESS-THAN SIGN + /x3d EQUALS SIGN + /x3e GREATER-THAN SIGN + /x3f QUESTION MARK + /x40 COMMERCIAL AT + /x41 LATIN CAPITAL LETTER A + /x42 LATIN CAPITAL LETTER B + /x43 LATIN CAPITAL LETTER C + /x44 LATIN CAPITAL LETTER D + /x45 LATIN CAPITAL LETTER E + /x46 LATIN CAPITAL LETTER F + /x47 LATIN CAPITAL LETTER G + /x48 LATIN CAPITAL LETTER H + /x49 LATIN CAPITAL LETTER I + /x4a LATIN CAPITAL LETTER J + /x4b LATIN CAPITAL LETTER K + /x4c LATIN CAPITAL LETTER L + /x4d LATIN CAPITAL LETTER M + /x4e LATIN CAPITAL LETTER N + /x4f LATIN CAPITAL LETTER O + /x50 LATIN CAPITAL LETTER P + /x51 LATIN CAPITAL LETTER Q + /x52 LATIN CAPITAL LETTER R + /x53 LATIN CAPITAL LETTER S + /x54 LATIN CAPITAL LETTER T + /x55 LATIN CAPITAL LETTER U + /x56 LATIN CAPITAL LETTER V + /x57 LATIN CAPITAL LETTER W + /x58 LATIN CAPITAL LETTER X + /x59 LATIN CAPITAL LETTER Y + /x5a LATIN CAPITAL LETTER Z + /x5b LEFT SQUARE BRACKET + /x5c YEN SIGN + /x5d RIGHT SQUARE BRACKET + /x5e CIRCUMFLEX ACCENT + /x5f LOW LINE + /x60 GRAVE ACCENT + /x61 LATIN SMALL LETTER A + /x62 LATIN SMALL LETTER B + /x63 LATIN SMALL LETTER C + /x64 LATIN SMALL LETTER D + /x65 LATIN SMALL LETTER E + /x66 LATIN SMALL LETTER F + /x67 LATIN SMALL LETTER G + /x68 LATIN SMALL LETTER H + /x69 LATIN SMALL LETTER I + /x6a LATIN SMALL LETTER J + /x6b LATIN SMALL LETTER K + /x6c LATIN SMALL LETTER L + /x6d LATIN SMALL LETTER M + /x6e LATIN SMALL LETTER N + /x6f LATIN SMALL LETTER O + /x70 LATIN SMALL LETTER P + /x71 LATIN SMALL LETTER Q + /x72 LATIN SMALL LETTER R + /x73 LATIN SMALL LETTER S + /x74 LATIN SMALL LETTER T + /x75 LATIN SMALL LETTER U + /x76 LATIN SMALL LETTER V + /x77 LATIN SMALL LETTER W + /x78 LATIN SMALL LETTER X + /x79 LATIN SMALL LETTER Y + /x7a LATIN SMALL LETTER Z + /x7b LEFT CURLY BRACKET + /x7c VERTICAL LINE + /x7d RIGHT CURLY BRACKET + /x7e OVERLINE + /x7f DELETE (DEL) /x81/x40 IDEOGRAPHIC SPACE /x81/x41 IDEOGRAPHIC COMMA @@ -7085,3 +7085,7 @@ CHARMAP /xea/xa3 /xea/xa4 END CHARMAP + +WIDTH +... 2 +END WIDTH -- cgit 1.4.1