diff options
| author | Roland McGrath <roland@gnu.org> | 2003-03-03 00:20:51 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-03-03 00:20:51 +0000 |
| commit | 3a601d31b6ac9686665a2d103c2e57f6c6443f57 (patch) | |
| tree | f5e3b901830acb023b554cee4904a4f62feec0d2 /sysdeps | |
| parent | bb0ddc2f1eca652aa8af56825b2ba3182498cc5a (diff) | |
| download | glibc-3a601d31b6ac9686665a2d103c2e57f6c6443f57.zip glibc-3a601d31b6ac9686665a2d103c2e57f6c6443f57.tar.gz glibc-3a601d31b6ac9686665a2d103c2e57f6c6443f57.tar.bz2 | |
* sysdeps/generic/libc-start.c (__libc_start_main): Don't assign const
variable.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/libc-start.c | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index a6dbebe..b79c803 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -158,12 +158,11 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **), /* One less thread. Decrement the counter. If it is zero we terminate the entire process. */ result = 0; - int *const ptr; # ifdef SHARED - ptr = __libc_pthread_functions.ptr_nthreads; + int *const ptr = __libc_pthread_functions.ptr_nthreads; # else extern int __nptl_nthreads __attribute ((weak)); - ptr = &__nptl_nthreads; + int *const ptr = &__nptl_nthreads; # endif if (! atomic_decrement_and_test (ptr)) diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 8798263..93cbc8b 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -610,14 +610,14 @@ elf_machine_rela (struct link_map *map, # endif return; - case R_PPC_DTPREL64: + case R_PPC64_DTPREL64: /* During relocation all TLS symbols are defined and used. Therefore the offset is already correct. */ # ifndef RTLD_BOOTSTRAP *reloc_addr = TLS_DTPREL_VALUE (sym, reloc); # endif break; - case R_PPC_TPREL64: + case R_PPC64_TPREL64: # ifndef RTLD_BOOTSTRAP if (sym_map) { |