diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
| commit | 0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0 (patch) | |
| tree | 1ef0d0dc09dba23037800d5f3794a77d9b45554f /sysdeps/generic | |
| parent | e4f5d077e9190f57abd49684bd7afcf4325bd348 (diff) | |
Updated to fedora-glibc-20050106T1443
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-tls.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/libc-start.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c index 3382e3493c..2282dda9cc 100644 --- a/sysdeps/generic/dl-tls.c +++ b/sysdeps/generic/dl-tls.c @@ -577,7 +577,7 @@ __tls_get_addr (GET_ADDR_ARGS) { size_t cnt; - for (cnt = total = 0 ? 1 : 0; cnt < listp->len; ++cnt) + for (cnt = total == 0 ? 1 : 0; cnt < listp->len; ++cnt) { size_t gen = listp->slotinfo[cnt].gen; struct link_map *map; diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index fc9df40996..ad5ebe0911 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1998-2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -106,9 +106,9 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), __libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up; +#ifndef SHARED INIT_ARGV_and_ENVIRON; -#ifndef SHARED /* Store the lowest stack address. This is done in ld.so if this is the code for the DSO. */ __libc_stack_end = stack_end; |