aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--elf/rtld.c2
-rw-r--r--sysdeps/generic/ldsodefs.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 45e389e..c67904e 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 b84a3e7..478d037 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 a5f0a25..8c7f00f 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;