diff options
| author | Roland McGrath <roland@hack.frob.com> | 2011-08-14 15:59:11 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2011-08-14 15:59:11 -0700 |
| commit | 5e4287d16f897cde3e0201de0f96d148248c0ca9 (patch) | |
| tree | 178dc8fef4fdd2d5e3a66d1347f4b007e5556f1c | |
| parent | 9c96ff23858b0759e12ad69e3c4599931c90bee8 (diff) | |
| download | glibc-5e4287d16f897cde3e0201de0f96d148248c0ca9.tar.gz glibc-5e4287d16f897cde3e0201de0f96d148248c0ca9.tar.xz glibc-5e4287d16f897cde3e0201de0f96d148248c0ca9.zip | |
Warning patrol.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/rtld.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 45e389ece4..c67904ea53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-08-14 Roland McGrath <roland@hack.frob.com> + + * sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const. + * elf/rtld.c (dl_main): Invert order of assignment in last change, + to avoid a warning. + 2011-08-14 David S. Miller <davem@davemloft.net> * sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIM_INFINITY, diff --git a/elf/rtld.c b/elf/rtld.c index b84a3e7a34..478d037306 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1391,7 +1391,7 @@ of this helper program; chances are you did not intend to run this program.\n\ char *copy = malloc (len); if (copy == NULL) _dl_fatal_printf ("out of memory\n"); - l->l_name = l->l_libname->name = memcpy (copy, dsoname, len); + l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); } /* Add the vDSO to the object list. */ diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index a5f0a25ccc..8c7f00fc5d 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -396,7 +396,7 @@ struct rtld_global uint32_t hashval; const char *name; const ElfW(Sym) *sym; - struct link_map *map; + const struct link_map *map; } *entries; size_t size; size_t n_elements; |