This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Make _dl_phdr pointer to const.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Thu, 28 Mar 2013 15:40:14 -0700 (PDT)
- Subject: [COMMITTED PATCH] Make _dl_phdr pointer to const.
* elf/dl-support.c (_dl_phdr): Make pointer to const.
(_dl_aux_init): Use const in cast when setting it.
* sysdeps/mach/hurd/i386/init-first.c (init1): Remove superfluous cast.
* sysdeps/generic/ldsodefs.h [!SHARED] (_dl_phdr): Update decl.
* csu/libc-tls.c (__libc_setup_tls): Make PHDR pointer to const.
--- a/csu/libc-tls.c
+++ b/csu/libc-tls.c
@@ -114,7 +114,7 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign)
size_t align = 0;
size_t max_align = tcbalign;
size_t tcb_offset;
- ElfW(Phdr) *phdr;
+ const ElfW(Phdr) *phdr;
/* Look through the TLS segment if there is any. */
if (_dl_phdr != NULL)
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -126,7 +126,7 @@ int _dl_debug_fd = STDERR_FILENO;
int _dl_correct_cache_id = _DL_CACHE_DEFAULT_ID;
ElfW(auxv_t) *_dl_auxv;
-ElfW(Phdr) *_dl_phdr;
+const ElfW(Phdr) *_dl_phdr;
size_t _dl_phnum;
uint64_t _dl_hwcap __attribute__ ((nocommon));
@@ -205,7 +205,7 @@ _dl_aux_init (ElfW(auxv_t) *av)
GLRO(dl_clktck) = av->a_un.a_val;
break;
case AT_PHDR:
- GL(dl_phdr) = (void *) av->a_un.a_val;
+ GL(dl_phdr) = (const void *) av->a_un.a_val;
break;
case AT_PHNUM:
GL(dl_phnum) = av->a_un.a_val;
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -603,7 +603,7 @@ extern const struct rtld_global_ro _rtld_global_ro
#ifndef SHARED
/* dl-support.c defines these and initializes them early on. */
-extern ElfW(Phdr) *_dl_phdr;
+extern const ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
#endif
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -122,7 +122,7 @@ init1 (int argc, char *arg0, ...)
the exec server. */
extern const void _start;
const ElfW(Ehdr) *const ehdr = &_start;
- _dl_phdr = (ElfW(Phdr) *) ((const void *) ehdr + ehdr->e_phoff);
+ _dl_phdr = (const void *) ehdr + ehdr->e_phoff;
_dl_phnum = ehdr->e_phnum;
assert (ehdr->e_phentsize == sizeof (ElfW(Phdr)));
#endif