AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-19 01:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-04-05  Cristian Gafton  <gafton@redhat.com>

	* ctype/ctype.h (__isctype_l): Define even if not __OPTIMIZE__
	because it is used in generic code.
	* wctype/wctrans.c: Define __ctype32_toupper and __ctype32_tolower.
	* wcsmbs/wcwidth.h: Declare __ctype32_b.
	* intl/gettext.c: Include <locale.h>.
	* intl/ngettext.c: Likewise.

2000-04-05  Jakub Jelinek  <jakub@redhat.com>

	* resolv/inet_ntop.c (inet_ntop4, inet_ntop6, inet_ntop): Use
	socklen_t type for size.
	* sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Rewrite for new
	init function interface.
	* sysdeps/sparc/sparc64/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/setjmp.h: Don't include
	sys/ucontext.h.
	(__jmp_buf): Declare the whole type structure here, don't use
	ucontext.

	* iconv/skeleton.c (put16u): Fix typo.
	Reported by Bruno Haible <haible@ilog.fr>.
This commit is contained in:
Ulrich Drepper 2000-04-06 05:04:50 +00:00
parent 2a0ff6ff1a
commit a1303dc8dc
11 changed files with 101 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,5 +1,29 @@
2000-04-05 Cristian Gafton <gafton@redhat.com>
* ctype/ctype.h (__isctype_l): Define even if not __OPTIMIZE__
because it is used in generic code.
* wctype/wctrans.c: Define __ctype32_toupper and __ctype32_tolower.
* wcsmbs/wcwidth.h: Declare __ctype32_b.
* intl/gettext.c: Include <locale.h>.
* intl/ngettext.c: Likewise.
2000-04-05 Jakub Jelinek <jakub@redhat.com>
* resolv/inet_ntop.c (inet_ntop4, inet_ntop6, inet_ntop): Use
socklen_t type for size.
* sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Rewrite for new
init function interface.
* sysdeps/sparc/sparc64/dl-machine.h (RTLD_START): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/setjmp.h: Don't include
sys/ucontext.h.
(__jmp_buf): Declare the whole type structure here, don't use
ucontext.
2000-04-05 Ulrich Drepper <drepper@redhat.com> 2000-04-05 Ulrich Drepper <drepper@redhat.com>
* iconv/skeleton.c (put16u): Fix typo.
Reported by Bruno Haible <haible@ilog.fr>.
* sysdeps/unix/sysv/linux/alpha/init-first.h: Not needed anymore. * sysdeps/unix/sysv/linux/alpha/init-first.h: Not needed anymore.
* sysdeps/unix/sysv/linux/arm/init-first.h: Likewise. * sysdeps/unix/sysv/linux/arm/init-first.h: Likewise.
* sysdeps/unix/sysv/linux/mips/init-first.h: Likewise. * sysdeps/unix/sysv/linux/mips/init-first.h: Likewise.

2
ctype/ctype.h
View File

@ -212,10 +212,8 @@ toupper (int __c) __THROW
/* These definitions are similar to the ones above but all functions /* These definitions are similar to the ones above but all functions
take as an argument a handle for the locale which shall be used. */ take as an argument a handle for the locale which shall be used. */
# ifdef __OPTIMIZE__
# define __isctype_l(c, type, locale) \ # define __isctype_l(c, type, locale) \
((locale)->__ctype_b[(int) (c)] & (unsigned short int) type) ((locale)->__ctype_b[(int) (c)] & (unsigned short int) type)
# endif
# define __exctype_l(name) extern int name (int, __locale_t) __THROW # define __exctype_l(name) extern int name (int, __locale_t) __THROW

2
iconv/skeleton.c
View File

@ -168,7 +168,7 @@ static int to_object;
# define put16u(addr, val) \ # define put16u(addr, val) \
({ uint16_t __val = (val); \ ({ uint16_t __val = (val); \
((unsigned char *) (addr))[1] = __val; \ ((unsigned char *) (addr))[1] = __val; \
((unsigned char *) (addr))[2] = __val >> 8; \ ((unsigned char *) (addr))[0] = __val >> 8; \
(void) 0; }) (void) 0; })
# define put32u(addr, val) \ # define put32u(addr, val) \
({ uint32_t __val = (val); \ ({ uint32_t __val = (val); \

2
intl/gettext.c
View File

@ -41,6 +41,8 @@
# include "libgettext.h" # include "libgettext.h"
#endif #endif
#include <locale.h>
/* @@ end of prolog @@ */ /* @@ end of prolog @@ */
/* Names for the libintl functions are a problem. They must not clash /* Names for the libintl functions are a problem. They must not clash

2
intl/ngettext.c
View File

@ -43,6 +43,8 @@
# include "libgettext.h" # include "libgettext.h"
#endif #endif
#include <locale.h>
/* @@ end of prolog @@ */ /* @@ end of prolog @@ */
/* Names for the libintl functions are a problem. They must not clash /* Names for the libintl functions are a problem. They must not clash

12
resolv/inet_ntop.c
View File

@ -40,9 +40,9 @@ static char rcsid[] = "$Id$";
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
*/ */
static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size)) static const char *inet_ntop4 __P((const u_char *src, char *dst, socklen_t size))
internal_function; internal_function;
static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size)) static const char *inet_ntop6 __P((const u_char *src, char *dst, socklen_t size))
internal_function; internal_function;
/* char * /* char *
@ -58,7 +58,7 @@ inet_ntop(af, src, dst, size)
int af; int af;
const void *src; const void *src;
char *dst; char *dst;
size_t size; socklen_t size;
{ {
switch (af) { switch (af) {
case AF_INET: case AF_INET:
@ -88,7 +88,7 @@ internal_function
inet_ntop4(src, dst, size) inet_ntop4(src, dst, size)
const u_char *src; const u_char *src;
char *dst; char *dst;
size_t size; socklen_t size;
{ {
static const char fmt[] = "%u.%u.%u.%u"; static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"]; char tmp[sizeof "255.255.255.255"];
@ -111,7 +111,7 @@ internal_function
inet_ntop6(src, dst, size) inet_ntop6(src, dst, size)
const u_char *src; const u_char *src;
char *dst; char *dst;
size_t size; socklen_t size;
{ {
/* /*
* Note that int32_t and int16_t need only be "at least" large enough * Note that int32_t and int16_t need only be "at least" large enough
@ -189,7 +189,7 @@ inet_ntop6(src, dst, size)
/* /*
* Check for overflow, copy, and we're done. * Check for overflow, copy, and we're done.
*/ */
if ((size_t)(tp - tmp) > size) { if ((socklen_t)(tp - tmp) > size) {
__set_errno (ENOSPC); __set_errno (ENOSPC);
return (NULL); return (NULL);
} }

36
sysdeps/sparc/sparc32/dl-machine.h
View File

@ -234,12 +234,11 @@ _dl_start_user:
ld [%i0], %i0 ld [%i0], %i0
tst %i0 tst %i0
beq 3f beq 3f
nop ld [%sp+22*4], %i5 /* load argc */
/* Find out how far to shift. */ /* Find out how far to shift. */
ld [%sp+22*4], %i1 /* load argc */ sub %i5, %i0, %i5
sub %i1, %i0, %i1
sll %i0, 2, %i2 sll %i0, 2, %i2
st %i1, [%sp+22*4] st %i5, [%sp+22*4]
add %sp, 23*4, %i1 add %sp, 23*4, %i1
add %i1, %i2, %i2 add %i1, %i2, %i2
/* Copy down argv */ /* Copy down argv */
@ -265,24 +264,17 @@ _dl_start_user:
st %i4, [%i1+4] st %i4, [%i1+4]
bne 23b bne 23b
add %i1, 8, %i1 add %i1, 8, %i1
/* Load searchlist of the main object to pass to _dl_init_next. */ /* %o0 = _dl_loaded, %o1 = argc, %o2 = argv, %o3 = envp. */
3: sethi %hi(_dl_main_searchlist), %g1 3: sethi %hi(_dl_loaded), %o0
or %g1, %lo(_dl_main_searchlist), %g1 add %sp, 23*4, %o2
ld [%l7+%g1], %l1 orcc %o0, %lo(_dl_loaded), %o0
ld [%l1], %l1 sll %i5, 2, %o3
/* Call _dl_init_next to return the address of an initializer to run. */ ld [%l7+%o0], %o0
4: call _dl_init_next add %o3, 4, %o3
mov %l1, %o0 mov %i5, %o1
tst %o0 add %o2, %o3, %o3
beq 5f call _dl_init
nop ld [%o0], %o0
jmpl %o0, %o7
sub %o7, 28, %o7
/* Clear the startup flag. */
5: sethi %hi(_dl_starting_up), %g1
or %g1, %lo(_dl_starting_up), %g1
ld [%l7+%g1], %g1
st %g0, [%g1]
/* Pass our finalizer function to the user in %g1. */ /* Pass our finalizer function to the user in %g1. */
sethi %hi(_dl_fini), %g1 sethi %hi(_dl_fini), %g1
or %g1, %lo(_dl_fini), %g1 or %g1, %lo(_dl_fini), %g1

35
sysdeps/sparc/sparc64/dl-machine.h
View File

@ -540,12 +540,11 @@ _dl_start_user:
ldx [%l7+%g5], %i0 ldx [%l7+%g5], %i0
ld [%i0], %i0 ld [%i0], %i0
brz,pt %i0, 2f brz,pt %i0, 2f
nop ldx [%sp+" __S(STACK_BIAS) "+22*8], %i5
/* Find out how far to shift. */ /* Find out how far to shift. */
ldx [%sp+" __S(STACK_BIAS) "+22*8], %i1 sub %i5, %i0, %i5
sub %i1, %i0, %i1
sllx %i0, 3, %i2 sllx %i0, 3, %i2
stx %i1, [%sp+" __S(STACK_BIAS) "+22*8] stx %i5, [%sp+" __S(STACK_BIAS) "+22*8]
add %sp, " __S(STACK_BIAS) "+23*8, %i1 add %sp, " __S(STACK_BIAS) "+23*8, %i1
add %i1, %i2, %i2 add %i1, %i2, %i2
/* Copy down argv. */ /* Copy down argv. */
@ -568,23 +567,17 @@ _dl_start_user:
stx %i4, [%i1+8] stx %i4, [%i1+8]
brnz,pt %i3, 13b brnz,pt %i3, 13b
add %i1, 16, %i1 add %i1, 16, %i1
/* Load searchlist of the main object to pass to _dl_init_next. */ /* %o0 = _dl_loaded, %o1 = argc, %o2 = argv, %o3 = envp. */
2: sethi %hi(_dl_main_searchlist), %g5 2: sethi %hi(_dl_loaded), %o0
or %g5, %lo(_dl_main_searchlist), %g5 add %sp, " __S(STACK_BIAS) "+23*8, %o2
ldx [%l7+%g5], %g5 orcc %o0, %lo(_dl_loaded), %o0
ldx [%g5], %l1 sllx %i5, 3, %o3
/* Call _dl_init_next to return the address of an initializer to run. */ ldx [%l7+%o0], %o0
3: call _dl_init_next add %o3, 8, %o3
mov %l1, %o0 mov %i5, %o1
brz,pn %o0, 4f add %o2, %o3, %o3
nop call _dl_init
jmpl %o0, %o7 ldx [%o0], %o0
sub %o7, 24, %o7
/* Clear the startup flag. */
4: sethi %hi(_dl_starting_up), %g5
or %g5, %lo(_dl_starting_up), %g5
ldx [%l7+%g5], %g5
st %g0, [%g5]
/* Pass our finalizer function to the user in %g1. */ /* Pass our finalizer function to the user in %g1. */
sethi %hi(_dl_fini), %g1 sethi %hi(_dl_fini), %g1
or %g1, %lo(_dl_fini), %g1 or %g1, %lo(_dl_fini), %g1

34
sysdeps/unix/sysv/linux/sparc/bits/setjmp.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997,1999 Free Software Foundation, Inc. /* Copyright (C) 1997,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -25,9 +25,35 @@
#if __WORDSIZE == 64 #if __WORDSIZE == 64
#include <sys/ucontext.h> #ifndef _ASM
typedef struct __sparc64_jmp_buf
typedef ucontext_t __jmp_buf[1]; {
struct __sparc64_jmp_buf *uc_link;
unsigned long uc_flags;
unsigned long uc_sigmask;
struct __sparc64_jmp_buf_mcontext
{
unsigned long mc_gregs[19];
unsigned long mc_fp;
unsigned long mc_i7;
struct __sparc64_jmp_buf_fpu
{
union
{
unsigned int sregs[32];
unsigned long dregs[32];
long double qregs[16];
} mcfpu_fpregs;
unsigned long mcfpu_fprs;
unsigned long mcfpu_gsr;
void *mcfpu_fq;
unsigned char mcfpu_qcnt;
unsigned char mcfpu_qentsz;
unsigned char mcfpu_enab;
} mc_fpregs;
} uc_mcontext;
} __jmp_buf[1];
#endif
/* Test if longjmp to JMPBUF would unwind the frame /* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */ containing a local variable at ADDRESS. */

4
wcsmbs/wcwidth.h
View File

@ -25,6 +25,10 @@
/* Array containing width information. */ /* Array containing width information. */
extern unsigned char *__ctype_width; extern unsigned char *__ctype_width;
/* If the program is compiled without optimization the following declaration
is not visible in the header. */
extern unsigned int *__ctype32_b;
static __inline int static __inline int
internal_wcwidth (wint_t ch) internal_wcwidth (wint_t ch)
{ {

4
wctype/wctrans.c
View File

@ -23,6 +23,10 @@
#include <wctype.h> #include <wctype.h>
#include "../locale/localeinfo.h" #include "../locale/localeinfo.h"
/* These are not exported. */
extern const uint32_t *__ctype32_toupper;
extern const uint32_t *__ctype32_tolower;
wctrans_t wctrans_t
wctrans (const char *property) wctrans (const char *property)
{ {