For b/20141439, don't add "foo.so" as alternate name for previously loaded "foo.so...

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 1afaddff2aa5cf8d062dc920c902226fb4aee04b..20be545401ddff120c0de70cfc1d1d74fc91d47d 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -850,7 +850,10 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, off_t of
        /* If the name is not in the list of names for this object add
           it.  */
        free (realname);
-       add_name_to_object (l, name);
+       if (offset == 0)
+         /* If offset!=0, foo.so/@0x<offset> should be the *only*
+            name for this object. b/20141439.  */
+         add_name_to_object (l, name);
 
        return l;
       }