diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 2 | ||||
| -rw-r--r-- | localedata/ChangeLog | 7 | ||||
| -rw-r--r-- | 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 <drepper@redhat.com> + * locale/programs/ld-collate.c (handle_ellipsis): Test for + duplication with generated name, not the name of the first + character. + Patch by Yong Li <yong.li@asu.edu>. + * sysdeps/powerpc/strchr.S: Correct bugs introduced in BP-ification. Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>. 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 <drepper@redhat.com> + + * 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 <drepper@redhat.com> * 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 <drepper@redhat.com> + + * charmaps/SJIS: Add width information. + Patch by GOTO Masanori <gotom@debian.or.jp>. + + * charmaps/SJIS: Correct byte sequence for single byte characters. + 2000-07-19 Ulrich Drepper <drepper@redhat.com> * 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 @@ <mb_cur_max> 2 CHARMAP -<U0000> /x00/x00 NULL (NUL) -<U0001> /x00/x01 START OF HEADING (SOH) -<U0002> /x00/x02 START OF TEXT (STX) -<U0003> /x00/x03 END OF TEXT (ETX) -<U0004> /x00/x04 END OF TRANSMISSION (EOT) -<U0005> /x00/x05 ENQUIRY (ENQ) -<U0006> /x00/x06 ACKNOWLEDGE (ACK) -<U0007> /x00/x07 BELL (BEL) -<U0008> /x00/x08 BACKSPACE (BS) -<U0009> /x00/x09 CHARACTER TABULATION (HT) -<U000A> /x00/x0a LINE FEED (LF) -<U000B> /x00/x0b LINE TABULATION (VT) -<U000C> /x00/x0c FORM FEED (FF) -<U000D> /x00/x0d CARRIAGE RETURN (CR) -<U000E> /x00/x0e SHIFT OUT (SO) -<U000F> /x00/x0f SHIFT IN (SI) -<U0010> /x00/x10 DATALINK ESCAPE (DLE) -<U0011> /x00/x11 DEVICE CONTROL ONE (DC1) -<U0012> /x00/x12 DEVICE CONTROL TWO (DC2) -<U0013> /x00/x13 DEVICE CONTROL THREE (DC3) -<U0014> /x00/x14 DEVICE CONTROL FOUR (DC4) -<U0015> /x00/x15 NEGATIVE ACKNOWLEDGE (NAK) -<U0016> /x00/x16 SYNCHRONOUS IDLE (SYN) -<U0017> /x00/x17 END OF TRANSMISSION BLOCK (ETB) -<U0018> /x00/x18 CANCEL (CAN) -<U0019> /x00/x19 END OF MEDIUM (EM) -<U001A> /x00/x1a SUBSTITUTE (SUB) -<U001B> /x00/x1b ESCAPE (ESC) -<U001C> /x00/x1c FILE SEPARATOR (IS4) -<U001D> /x00/x1d GROUP SEPARATOR (IS3) -<U001E> /x00/x1e RECORD SEPARATOR (IS2) -<U001F> /x00/x1f UNIT SEPARATOR (IS1) -<U0020> /x00/x20 SPACE -<U0021> /x00/x21 EXCLAMATION MARK -<U0022> /x00/x22 QUOTATION MARK -<U0023> /x00/x23 NUMBER SIGN -<U0024> /x00/x24 DOLLAR SIGN -<U0025> /x00/x25 PERCENT SIGN -<U0026> /x00/x26 AMPERSAND -<U0027> /x00/x27 APOSTROPHE -<U0028> /x00/x28 LEFT PARENTHESIS -<U0029> /x00/x29 RIGHT PARENTHESIS -<U002A> /x00/x2a ASTERISK -<U002B> /x00/x2b PLUS SIGN -<U002C> /x00/x2c COMMA -<U002D> /x00/x2d HYPHEN-MINUS -<U002E> /x00/x2e FULL STOP -<U002F> /x00/x2f SOLIDUS -<U0030> /x00/x30 DIGIT ZERO -<U0031> /x00/x31 DIGIT ONE -<U0032> /x00/x32 DIGIT TWO -<U0033> /x00/x33 DIGIT THREE -<U0034> /x00/x34 DIGIT FOUR -<U0035> /x00/x35 DIGIT FIVE -<U0036> /x00/x36 DIGIT SIX -<U0037> /x00/x37 DIGIT SEVEN -<U0038> /x00/x38 DIGIT EIGHT -<U0039> /x00/x39 DIGIT NINE -<U003A> /x00/x3a COLON -<U003B> /x00/x3b SEMICOLON -<U003C> /x00/x3c LESS-THAN SIGN -<U003D> /x00/x3d EQUALS SIGN -<U003E> /x00/x3e GREATER-THAN SIGN -<U003F> /x00/x3f QUESTION MARK -<U0040> /x00/x40 COMMERCIAL AT -<U0041> /x00/x41 LATIN CAPITAL LETTER A -<U0042> /x00/x42 LATIN CAPITAL LETTER B -<U0043> /x00/x43 LATIN CAPITAL LETTER C -<U0044> /x00/x44 LATIN CAPITAL LETTER D -<U0045> /x00/x45 LATIN CAPITAL LETTER E -<U0046> /x00/x46 LATIN CAPITAL LETTER F -<U0047> /x00/x47 LATIN CAPITAL LETTER G -<U0048> /x00/x48 LATIN CAPITAL LETTER H -<U0049> /x00/x49 LATIN CAPITAL LETTER I -<U004A> /x00/x4a LATIN CAPITAL LETTER J -<U004B> /x00/x4b LATIN CAPITAL LETTER K -<U004C> /x00/x4c LATIN CAPITAL LETTER L -<U004D> /x00/x4d LATIN CAPITAL LETTER M -<U004E> /x00/x4e LATIN CAPITAL LETTER N -<U004F> /x00/x4f LATIN CAPITAL LETTER O -<U0050> /x00/x50 LATIN CAPITAL LETTER P -<U0051> /x00/x51 LATIN CAPITAL LETTER Q -<U0052> /x00/x52 LATIN CAPITAL LETTER R -<U0053> /x00/x53 LATIN CAPITAL LETTER S -<U0054> /x00/x54 LATIN CAPITAL LETTER T -<U0055> /x00/x55 LATIN CAPITAL LETTER U -<U0056> /x00/x56 LATIN CAPITAL LETTER V -<U0057> /x00/x57 LATIN CAPITAL LETTER W -<U0058> /x00/x58 LATIN CAPITAL LETTER X -<U0059> /x00/x59 LATIN CAPITAL LETTER Y -<U005A> /x00/x5a LATIN CAPITAL LETTER Z -<U005B> /x00/x5b LEFT SQUARE BRACKET -<U00A5> /x00/x5c YEN SIGN -<U005D> /x00/x5d RIGHT SQUARE BRACKET -<U005E> /x00/x5e CIRCUMFLEX ACCENT -<U005F> /x00/x5f LOW LINE -<U0060> /x00/x60 GRAVE ACCENT -<U0061> /x00/x61 LATIN SMALL LETTER A -<U0062> /x00/x62 LATIN SMALL LETTER B -<U0063> /x00/x63 LATIN SMALL LETTER C -<U0064> /x00/x64 LATIN SMALL LETTER D -<U0065> /x00/x65 LATIN SMALL LETTER E -<U0066> /x00/x66 LATIN SMALL LETTER F -<U0067> /x00/x67 LATIN SMALL LETTER G -<U0068> /x00/x68 LATIN SMALL LETTER H -<U0069> /x00/x69 LATIN SMALL LETTER I -<U006A> /x00/x6a LATIN SMALL LETTER J -<U006B> /x00/x6b LATIN SMALL LETTER K -<U006C> /x00/x6c LATIN SMALL LETTER L -<U006D> /x00/x6d LATIN SMALL LETTER M -<U006E> /x00/x6e LATIN SMALL LETTER N -<U006F> /x00/x6f LATIN SMALL LETTER O -<U0070> /x00/x70 LATIN SMALL LETTER P -<U0071> /x00/x71 LATIN SMALL LETTER Q -<U0072> /x00/x72 LATIN SMALL LETTER R -<U0073> /x00/x73 LATIN SMALL LETTER S -<U0074> /x00/x74 LATIN SMALL LETTER T -<U0075> /x00/x75 LATIN SMALL LETTER U -<U0076> /x00/x76 LATIN SMALL LETTER V -<U0077> /x00/x77 LATIN SMALL LETTER W -<U0078> /x00/x78 LATIN SMALL LETTER X -<U0079> /x00/x79 LATIN SMALL LETTER Y -<U007A> /x00/x7a LATIN SMALL LETTER Z -<U007B> /x00/x7b LEFT CURLY BRACKET -<U007C> /x00/x7c VERTICAL LINE -<U007D> /x00/x7d RIGHT CURLY BRACKET -<U203E> /x00/x7e OVERLINE -<U007F> /x00/x7f DELETE (DEL) +<U0000> /x00 NULL (NUL) +<U0001> /x01 START OF HEADING (SOH) +<U0002> /x02 START OF TEXT (STX) +<U0003> /x03 END OF TEXT (ETX) +<U0004> /x04 END OF TRANSMISSION (EOT) +<U0005> /x05 ENQUIRY (ENQ) +<U0006> /x06 ACKNOWLEDGE (ACK) +<U0007> /x07 BELL (BEL) +<U0008> /x08 BACKSPACE (BS) +<U0009> /x09 CHARACTER TABULATION (HT) +<U000A> /x0a LINE FEED (LF) +<U000B> /x0b LINE TABULATION (VT) +<U000C> /x0c FORM FEED (FF) +<U000D> /x0d CARRIAGE RETURN (CR) +<U000E> /x0e SHIFT OUT (SO) +<U000F> /x0f SHIFT IN (SI) +<U0010> /x10 DATALINK ESCAPE (DLE) +<U0011> /x11 DEVICE CONTROL ONE (DC1) +<U0012> /x12 DEVICE CONTROL TWO (DC2) +<U0013> /x13 DEVICE CONTROL THREE (DC3) +<U0014> /x14 DEVICE CONTROL FOUR (DC4) +<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK) +<U0016> /x16 SYNCHRONOUS IDLE (SYN) +<U0017> /x17 END OF TRANSMISSION BLOCK (ETB) +<U0018> /x18 CANCEL (CAN) +<U0019> /x19 END OF MEDIUM (EM) +<U001A> /x1a SUBSTITUTE (SUB) +<U001B> /x1b ESCAPE (ESC) +<U001C> /x1c FILE SEPARATOR (IS4) +<U001D> /x1d GROUP SEPARATOR (IS3) +<U001E> /x1e RECORD SEPARATOR (IS2) +<U001F> /x1f UNIT SEPARATOR (IS1) +<U0020> /x20 SPACE +<U0021> /x21 EXCLAMATION MARK +<U0022> /x22 QUOTATION MARK +<U0023> /x23 NUMBER SIGN +<U0024> /x24 DOLLAR SIGN +<U0025> /x25 PERCENT SIGN +<U0026> /x26 AMPERSAND +<U0027> /x27 APOSTROPHE +<U0028> /x28 LEFT PARENTHESIS +<U0029> /x29 RIGHT PARENTHESIS +<U002A> /x2a ASTERISK +<U002B> /x2b PLUS SIGN +<U002C> /x2c COMMA +<U002D> /x2d HYPHEN-MINUS +<U002E> /x2e FULL STOP +<U002F> /x2f SOLIDUS +<U0030> /x30 DIGIT ZERO +<U0031> /x31 DIGIT ONE +<U0032> /x32 DIGIT TWO +<U0033> /x33 DIGIT THREE +<U0034> /x34 DIGIT FOUR +<U0035> /x35 DIGIT FIVE +<U0036> /x36 DIGIT SIX +<U0037> /x37 DIGIT SEVEN +<U0038> /x38 DIGIT EIGHT +<U0039> /x39 DIGIT NINE +<U003A> /x3a COLON +<U003B> /x3b SEMICOLON +<U003C> /x3c LESS-THAN SIGN +<U003D> /x3d EQUALS SIGN +<U003E> /x3e GREATER-THAN SIGN +<U003F> /x3f QUESTION MARK +<U0040> /x40 COMMERCIAL AT +<U0041> /x41 LATIN CAPITAL LETTER A +<U0042> /x42 LATIN CAPITAL LETTER B +<U0043> /x43 LATIN CAPITAL LETTER C +<U0044> /x44 LATIN CAPITAL LETTER D +<U0045> /x45 LATIN CAPITAL LETTER E +<U0046> /x46 LATIN CAPITAL LETTER F +<U0047> /x47 LATIN CAPITAL LETTER G +<U0048> /x48 LATIN CAPITAL LETTER H +<U0049> /x49 LATIN CAPITAL LETTER I +<U004A> /x4a LATIN CAPITAL LETTER J +<U004B> /x4b LATIN CAPITAL LETTER K +<U004C> /x4c LATIN CAPITAL LETTER L +<U004D> /x4d LATIN CAPITAL LETTER M +<U004E> /x4e LATIN CAPITAL LETTER N +<U004F> /x4f LATIN CAPITAL LETTER O +<U0050> /x50 LATIN CAPITAL LETTER P +<U0051> /x51 LATIN CAPITAL LETTER Q +<U0052> /x52 LATIN CAPITAL LETTER R +<U0053> /x53 LATIN CAPITAL LETTER S +<U0054> /x54 LATIN CAPITAL LETTER T +<U0055> /x55 LATIN CAPITAL LETTER U +<U0056> /x56 LATIN CAPITAL LETTER V +<U0057> /x57 LATIN CAPITAL LETTER W +<U0058> /x58 LATIN CAPITAL LETTER X +<U0059> /x59 LATIN CAPITAL LETTER Y +<U005A> /x5a LATIN CAPITAL LETTER Z +<U005B> /x5b LEFT SQUARE BRACKET +<U00A5> /x5c YEN SIGN +<U005D> /x5d RIGHT SQUARE BRACKET +<U005E> /x5e CIRCUMFLEX ACCENT +<U005F> /x5f LOW LINE +<U0060> /x60 GRAVE ACCENT +<U0061> /x61 LATIN SMALL LETTER A +<U0062> /x62 LATIN SMALL LETTER B +<U0063> /x63 LATIN SMALL LETTER C +<U0064> /x64 LATIN SMALL LETTER D +<U0065> /x65 LATIN SMALL LETTER E +<U0066> /x66 LATIN SMALL LETTER F +<U0067> /x67 LATIN SMALL LETTER G +<U0068> /x68 LATIN SMALL LETTER H +<U0069> /x69 LATIN SMALL LETTER I +<U006A> /x6a LATIN SMALL LETTER J +<U006B> /x6b LATIN SMALL LETTER K +<U006C> /x6c LATIN SMALL LETTER L +<U006D> /x6d LATIN SMALL LETTER M +<U006E> /x6e LATIN SMALL LETTER N +<U006F> /x6f LATIN SMALL LETTER O +<U0070> /x70 LATIN SMALL LETTER P +<U0071> /x71 LATIN SMALL LETTER Q +<U0072> /x72 LATIN SMALL LETTER R +<U0073> /x73 LATIN SMALL LETTER S +<U0074> /x74 LATIN SMALL LETTER T +<U0075> /x75 LATIN SMALL LETTER U +<U0076> /x76 LATIN SMALL LETTER V +<U0077> /x77 LATIN SMALL LETTER W +<U0078> /x78 LATIN SMALL LETTER X +<U0079> /x79 LATIN SMALL LETTER Y +<U007A> /x7a LATIN SMALL LETTER Z +<U007B> /x7b LEFT CURLY BRACKET +<U007C> /x7c VERTICAL LINE +<U007D> /x7d RIGHT CURLY BRACKET +<U203E> /x7e OVERLINE +<U007F> /x7f DELETE (DEL) <U3000> /x81/x40 IDEOGRAPHIC SPACE <U3001> /x81/x41 IDEOGRAPHIC COMMA @@ -7085,3 +7085,7 @@ CHARMAP <U51DC> /xea/xa3 <CJK> <U7199> /xea/xa4 <CJK> END CHARMAP + +WIDTH +<U3000>...<U7199> 2 +END WIDTH |