aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-16 09:39:23 +0000
committerRoland McGrath <roland@gnu.org>2005-02-16 09:39:23 +0000
commit4f657581ddb7f1dd2508e5797623492bb6c9c1ed (patch)
tree41561cc7965cd2f49840da7b4287b1f8eb467d11
parent15e3f6f66a35788639b1875248b97a39aaaabfe1 (diff)
downloadglibc-4f657581ddb7f1dd2508e5797623492bb6c9c1ed.tar
glibc-4f657581ddb7f1dd2508e5797623492bb6c9c1ed.tar.gz
glibc-4f657581ddb7f1dd2508e5797623492bb6c9c1ed.tar.bz2
glibc-4f657581ddb7f1dd2508e5797623492bb6c9c1ed.zip
* sysdeps/generic/libc-start.c (LIBC_START_MAIN): Move UBP_EV defn
inside [! SHARED] where it's used.
-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 b4a82babc3..4e7beeb4f4 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 fdf398ada6..e0a04cba58 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