mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 08:11:08 +00:00
Update.
2000-03-23 Bruno Haible <haible@clisp.cons.org> * iconv/gconv_int.h (__gconv_transform_ucs2little_internal, __gconv_transform_internal_ucs2little): Remove declarations. * iconv/gconv_simple.c (__gconv_transform_ucs2_internal, __gconv_transform_internal_ucs2): Never need to bswap_16. (__gconv_transform_ucs2reverse_internal, __gconv_transform_internal_ucs2reverse): Always need to bswap_16.
This commit is contained in:
Ulrich Drepper
parent
d64e704c8f
commit
428bcea4c8
@ -1,3 +1,12 @@
|
||||
2000-03-23 Bruno Haible <haible@clisp.cons.org>
|
||||
|
||||
* iconv/gconv_int.h (__gconv_transform_ucs2little_internal,
|
||||
__gconv_transform_internal_ucs2little): Remove declarations.
|
||||
* iconv/gconv_simple.c (__gconv_transform_ucs2_internal,
|
||||
__gconv_transform_internal_ucs2): Never need to bswap_16.
|
||||
(__gconv_transform_ucs2reverse_internal,
|
||||
__gconv_transform_internal_ucs2reverse): Always need to bswap_16.
|
||||
|
||||
2000-03-27 Roland McGrath <roland@baalperazim.frob.com>
|
||||
|
||||
* include/shlib-compat.h (SHLIB_COMPAT): Make the test handle the
|
||||
|
||||
@ -171,8 +171,6 @@ __BUILTIN_TRANS (__gconv_transform_ucs2_internal);
|
||||
__BUILTIN_TRANS (__gconv_transform_internal_ucs2);
|
||||
__BUILTIN_TRANS (__gconv_transform_ucs2reverse_internal);
|
||||
__BUILTIN_TRANS (__gconv_transform_internal_ucs2reverse);
|
||||
__BUILTIN_TRANS (__gconv_transform_ucs2little_internal);
|
||||
__BUILTIN_TRANS (__gconv_transform_internal_ucs2little);
|
||||
__BUILTIN_TRANS (__gconv_transform_internal_ucs4);
|
||||
__BUILTIN_TRANS (__gconv_transform_internal_ucs4le);
|
||||
__BUILTIN_TRANS (__gconv_transform_internal_utf16);
|
||||
|
||||
@ -396,14 +396,8 @@ internal_ucs4le_loop (const unsigned char **inptrp, const unsigned char *inend,
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
||||
#define LOOPFCT FROM_LOOP
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
# define BODY \
|
||||
*((uint32_t *) outptr)++ = bswap_16 (*(uint16_t *) inptr); \
|
||||
inptr += 2;
|
||||
#else
|
||||
#define BODY \
|
||||
*((uint32_t *) outptr)++ = *((uint16_t *) inptr)++;
|
||||
#endif
|
||||
#include <iconv/loop.c>
|
||||
#include <iconv/skeleton.c>
|
||||
|
||||
@ -421,20 +415,6 @@ internal_ucs4le_loop (const unsigned char **inptrp, const unsigned char *inend,
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
||||
#define LOOPFCT FROM_LOOP
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
# define BODY \
|
||||
{ \
|
||||
if (*((uint32_t *) inptr) >= 0x10000) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
/* Please note that we use the `uint32_t' from-pointer as an `uint16_t' \
|
||||
pointer which works since we are on a little endian machine. */ \
|
||||
*((uint16_t *) outptr)++ = bswap_16 (*((uint16_t *) inptr)); \
|
||||
inptr += 4; \
|
||||
}
|
||||
#else
|
||||
#define BODY \
|
||||
{ \
|
||||
if (*((uint32_t *) inptr) >= 0x10000) \
|
||||
@ -444,70 +424,53 @@ internal_ucs4le_loop (const unsigned char **inptrp, const unsigned char *inend,
|
||||
} \
|
||||
*((uint16_t *) outptr)++ = *((uint32_t *) inptr)++; \
|
||||
}
|
||||
#endif
|
||||
#include <iconv/loop.c>
|
||||
#include <iconv/skeleton.c>
|
||||
|
||||
|
||||
/* Convert from UCS2 in little endian to the internal (UCS4-like) format. */
|
||||
/* Convert from UCS2 in other endianness to the internal (UCS4-like) format. */
|
||||
#define DEFINE_INIT 0
|
||||
#define DEFINE_FINI 0
|
||||
#define MIN_NEEDED_FROM 2
|
||||
#define MIN_NEEDED_TO 4
|
||||
#define FROM_DIRECTION 1
|
||||
#define FROM_LOOP ucs2little_internal_loop
|
||||
#define TO_LOOP ucs2little_internal_loop /* This is not used.*/
|
||||
#define FROM_LOOP ucs2reverse_internal_loop
|
||||
#define TO_LOOP ucs2reverse_internal_loop/* This is not used.*/
|
||||
#define FUNCTION_NAME __gconv_transform_ucs2reverse_internal
|
||||
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
||||
#define LOOPFCT FROM_LOOP
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
# define BODY \
|
||||
*((uint32_t *) outptr)++ = *((uint16_t *) inptr)++;
|
||||
#else
|
||||
#define BODY \
|
||||
*((uint32_t *) outptr)++ = bswap_16 (*(uint16_t *) inptr); \
|
||||
inptr += 2;
|
||||
#endif
|
||||
#include <iconv/loop.c>
|
||||
#include <iconv/skeleton.c>
|
||||
|
||||
|
||||
/* Convert from the internal (UCS4-like) format to UCS2 in little endian. */
|
||||
/* Convert from the internal (UCS4-like) format to UCS2 in other endianness. */
|
||||
#define DEFINE_INIT 0
|
||||
#define DEFINE_FINI 0
|
||||
#define MIN_NEEDED_FROM 4
|
||||
#define MIN_NEEDED_TO 2
|
||||
#define FROM_DIRECTION 1
|
||||
#define FROM_LOOP internal_ucs2little_loop
|
||||
#define TO_LOOP internal_ucs2little_loop /* This is not used.*/
|
||||
#define FROM_LOOP internal_ucs2reverse_loop
|
||||
#define TO_LOOP internal_ucs2reverse_loop/* This is not used.*/
|
||||
#define FUNCTION_NAME __gconv_transform_internal_ucs2reverse
|
||||
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
||||
#define LOOPFCT FROM_LOOP
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
#define BODY \
|
||||
{ \
|
||||
if (*((uint32_t *) inptr) >= 0x10000) \
|
||||
uint32_t val = *((uint32_t *) inptr); \
|
||||
if (val >= 0x10000) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
*((uint16_t *) outptr)++ = *((uint32_t *) inptr)++; \
|
||||
}
|
||||
#else
|
||||
# define BODY \
|
||||
{ \
|
||||
if (*((uint32_t *) inptr) >= 0x10000) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
*((uint16_t *) outptr)++ = bswap_16 (((uint16_t *) inptr)[1]); \
|
||||
*((uint16_t *) outptr)++ = bswap_16 (val); \
|
||||
inptr += 4; \
|
||||
}
|
||||
#endif
|
||||
#include <iconv/loop.c>
|
||||
#include <iconv/skeleton.c>
|
||||
|
||||
@ -25,11 +25,13 @@ alpha.*-.*-.* libm=6
|
||||
powerpc-.*-.* libm=6
|
||||
mips.*-.*-.* libm=6
|
||||
arm.*-.*-.* libm=6
|
||||
ia64-.*-.* libm=6 GLIBC_2.2
|
||||
|
||||
# We provide libc.so.6 for Linux kernel versions 2.0 and later.
|
||||
alpha.*-.*-linux.* libc=6.1
|
||||
# Working mips versions were never released between 2.0 and 2.2.
|
||||
mips.*-.*-linux.* libc=6 GLIBC_2.0 GLIBC_2.2
|
||||
ia64-.*-.* libc=6 GLIBC_2.2
|
||||
.*-.*-linux.* libc=6
|
||||
|
||||
# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
|
||||
@ -51,6 +53,7 @@ sparc64-.*-linux.* ld=ld-linux.so.2
|
||||
sparc.*-.*-linux.* ld=ld-linux.so.2
|
||||
alpha.*-.*-linux.* ld=ld-linux.so.2
|
||||
arm.*-.*-linux.* ld=ld-linux.so.2
|
||||
ia64-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2
|
||||
# We use the ELF ABI standard name for the default.
|
||||
.*-.*-.* ld=ld.so.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user