aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/generic/libc-start.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b4a82ba..4e7beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-16 Roland McGrath <roland@redhat.com>
+
+ * sysdeps/generic/libc-start.c (LIBC_START_MAIN): Move UBP_EV defn
+ inside [! SHARED] where it's used.
+
2005-02-15 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/bits/byteswap.h: Make sure result of all the
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index fdf398a..e0a04cb 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -98,7 +98,6 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
void (*fini) (void),
void (*rtld_fini) (void), void *__unbounded stack_end)
{
- char *__unbounded *__unbounded ubp_ev = &ubp_av[argc + 1];
#if __BOUNDED_POINTERS__
char **argv;
#else
@@ -111,6 +110,8 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
__libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up;
#ifndef SHARED
+ char *__unbounded *__unbounded ubp_ev = &ubp_av[argc + 1];
+
INIT_ARGV_and_ENVIRON;
/* Store the lowest stack address. This is done in ld.so if this is