aboutsummaryrefslogtreecommitdiff
path: root/csu
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-02-13 23:30:40 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-02-13 23:30:40 +0000
commit70d9946a44ba381f81eb08c71cc150315cc112ad (patch)
treeb354421eb394cee78cb16fd35812fb864c481ab8 /csu
parentffb1ec7b7ff1c65523b6926fc3afbacdb94db356 (diff)
downloadglibc-70d9946a44ba381f81eb08c71cc150315cc112ad.zip
glibc-70d9946a44ba381f81eb08c71cc150315cc112ad.tar.gz
glibc-70d9946a44ba381f81eb08c71cc150315cc112ad.tar.bz2
Remove __ptrvalue, __bounded and __unbounded.
Diffstat (limited to 'csu')
-rw-r--r--csu/libc-start.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/csu/libc-start.c b/csu/libc-start.c
index d4a135f..4f2a336 100644
--- a/csu/libc-start.c
+++ b/csu/libc-start.c
@@ -101,14 +101,14 @@ apply_irel (void)
STATIC int LIBC_START_MAIN (int (*main) (int, char **, char **
MAIN_AUXVEC_DECL),
int argc,
- char *__unbounded *__unbounded ubp_av,
+ char **argv,
#ifdef LIBC_START_MAIN_AUXVEC_ARG
- ElfW(auxv_t) *__unbounded auxvec,
+ ElfW(auxv_t) *auxvec,
#endif
__typeof (main) init,
void (*fini) (void),
void (*rtld_fini) (void),
- void *__unbounded stack_end)
+ void *stack_end)
__attribute__ ((noreturn));
@@ -117,29 +117,23 @@ STATIC int LIBC_START_MAIN (int (*main) (int, char **, char **
finalizers were called in more than one place. */
STATIC int
LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
- int argc, char *__unbounded *__unbounded ubp_av,
+ int argc, char **argv,
#ifdef LIBC_START_MAIN_AUXVEC_ARG
- ElfW(auxv_t) *__unbounded auxvec,
+ ElfW(auxv_t) *auxvec,
#endif
__typeof (main) init,
void (*fini) (void),
- void (*rtld_fini) (void), void *__unbounded stack_end)
+ void (*rtld_fini) (void), void *stack_end)
{
-#if __BOUNDED_POINTERS__
- char **argv;
-#else
-# define argv ubp_av
-#endif
-
/* Result of the 'main' function. */
int result;
__libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up;
#ifndef SHARED
- char *__unbounded *__unbounded ubp_ev = &ubp_av[argc + 1];
+ char **ev = &argv[argc + 1];
- __environ = ubp_ev;
+ __environ = ev;
/* Store the lowest stack address. This is done in ld.so if this is
the code for the DSO. */
@@ -149,12 +143,12 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
/* First process the auxiliary vector since we need to find the
program header to locate an eventually present PT_TLS entry. */
# ifndef LIBC_START_MAIN_AUXVEC_ARG
- ElfW(auxv_t) *__unbounded auxvec;
+ ElfW(auxv_t) *auxvec;
{
- char *__unbounded *__unbounded evp = ubp_ev;
+ char **evp = ev;
while (*evp++ != NULL)
;
- auxvec = (ElfW(auxv_t) *__unbounded) evp;
+ auxvec = (ElfW(auxv_t) *) evp;
}
# endif
_dl_aux_init (auxvec);