* sysdeps/unix/sysv/linux/init-first.c: Include <libc-internals.h>
	for prototypes, remove redundant prototypes.
	* gmon/gmon.c: Likewise.
	* sysdeps/unix/i386/i586/clock_getres.c: Likewise.
	* sysdeps/unix/i386/i586/clock_gettime.c: Likewise.

	* sysdeps/generic/enbl-secure.c: Include <libc-internals.h> for
	prototypes.
	* elf/soinit.c: Likewise.
	* sysdeps/generic/prof-freq.c: Likewise.
	* sysdeps/mach/hurd/profil.c: Likewise.
	* debug/noophooks.c: Likewise.
	* debug/pcprofile.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/get_clockfreq.c: Likewise.
	* sysdeps/generic/get_clockfreq.c: Likewise.

	* locale/localeinfo.h: Add internal prototypes.

	* elf/rtld.c (dl_main): Fix prototype.
This commit is contained in:
Andreas Jaeger 2000-12-31 18:24:24 +00:00
parent 9346aad7c4
commit 72f70279f4
4 changed files with 55 additions and 5 deletions

View File

@ -1,5 +1,25 @@
2000-12-31 Andreas Jaeger <aj@suse.de> 2000-12-31 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/init-first.c: Include <libc-internals.h>
for prototypes, remove redundant prototypes.
* gmon/gmon.c: Likewise.
* sysdeps/unix/i386/i586/clock_getres.c: Likewise.
* sysdeps/unix/i386/i586/clock_gettime.c: Likewise.
* sysdeps/generic/enbl-secure.c: Include <libc-internals.h> for
prototypes.
* elf/soinit.c: Likewise.
* sysdeps/generic/prof-freq.c: Likewise.
* sysdeps/mach/hurd/profil.c: Likewise.
* debug/noophooks.c: Likewise.
* debug/pcprofile.c: Likewise.
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c: Likewise.
* sysdeps/generic/get_clockfreq.c: Likewise.
* locale/localeinfo.h: Add internal prototypes.
* elf/rtld.c (dl_main): Fix prototype.
* iconvdata/tst-table-to.c (main): Use return instead of exit to * iconvdata/tst-table-to.c (main): Use return instead of exit to
avoid warning. avoid warning.

View File

@ -119,7 +119,7 @@ int _dl_starting_up;
static void dl_main (const ElfW(Phdr) *phdr, static void dl_main (const ElfW(Phdr) *phdr,
ElfW(Half) phent, ElfW(Word) phnum,
ElfW(Addr) *user_entry); ElfW(Addr) *user_entry);
struct link_map _dl_rtld_map; struct link_map _dl_rtld_map;
@ -371,7 +371,7 @@ static int version_info; /* Nonzero if information about
static void static void
dl_main (const ElfW(Phdr) *phdr, dl_main (const ElfW(Phdr) *phdr,
ElfW(Half) phent, ElfW(Word) phnum,
ElfW(Addr) *user_entry) ElfW(Addr) *user_entry)
{ {
const ElfW(Phdr) *ph; const ElfW(Phdr) *ph;
@ -513,7 +513,7 @@ of this helper program; chances are you did not intend to run this program.\n\
} }
phdr = _dl_loaded->l_phdr; phdr = _dl_loaded->l_phdr;
phent = _dl_loaded->l_phnum; phnum = _dl_loaded->l_phnum;
/* We overwrite here a pointer to a malloc()ed string. But since /* We overwrite here a pointer to a malloc()ed string. But since
the malloc() implementation used at this point is the dummy the malloc() implementation used at this point is the dummy
implementations which has no real free() function it does not implementations which has no real free() function it does not
@ -529,7 +529,7 @@ of this helper program; chances are you did not intend to run this program.\n\
if (_dl_loaded == NULL) if (_dl_loaded == NULL)
_dl_sysdep_fatal ("cannot allocate memory for link map\n", NULL); _dl_sysdep_fatal ("cannot allocate memory for link map\n", NULL);
_dl_loaded->l_phdr = phdr; _dl_loaded->l_phdr = phdr;
_dl_loaded->l_phnum = phent; _dl_loaded->l_phnum = phnum;
_dl_loaded->l_entry = *user_entry; _dl_loaded->l_entry = *user_entry;
/* At this point we are in a bit of trouble. We would have to /* At this point we are in a bit of trouble. We would have to
@ -557,7 +557,7 @@ of this helper program; chances are you did not intend to run this program.\n\
_dl_loaded->l_map_start = ~0; _dl_loaded->l_map_start = ~0;
/* Scan the program header table for the dynamic section. */ /* Scan the program header table for the dynamic section. */
for (ph = phdr; ph < &phdr[phent]; ++ph) for (ph = phdr; ph < &phdr[phnum]; ++ph)
switch (ph->p_type) switch (ph->p_type)
{ {
case PT_PHDR: case PT_PHDR:

25
include/libc-internal.h Normal file
View File

@ -0,0 +1,25 @@
/* This file contains a number of internal prototype declarations that
don't fit anywhere else. */
#ifndef _LIBC_INTERNAL
# define _LIBC_INTERNAL 1
/* Initialize the `__libc_enable_secure' flag. */
extern void __libc_init_secure (void);
/* This function will be called from _init in init-first.c. */
extern void __libc_global_ctors (void);
/* Discover the tick frequency of the machine if something goes wrong,
we return 0, an impossible hertz. */
extern int __profile_frequency (void);
/* Hooks for the instrumenting functions. */
extern void __cyg_profile_func_enter (void *this_fn, void *call_site);
extern void __cyg_profile_func_exit (void *this_fn, void *call_site);
/* Get frequency of the system processor. */
extern unsigned long long int __get_clockfreq (void);
#endif /* _LIBC_INTERNAL */

View File

@ -202,4 +202,9 @@ extern const char *_nl_get_alt_digit (unsigned int number);
/* Similar, but now for wide characters. */ /* Similar, but now for wide characters. */
extern const wchar_t *_nl_get_walt_digit (unsigned int number); extern const wchar_t *_nl_get_walt_digit (unsigned int number);
/* Postload processing. */
extern void _nl_postload_ctype (void);
extern void _nl_postload_time (void);
#endif /* localeinfo.h */ #endif /* localeinfo.h */