commit 9ed960a358e4606d761779d772dad39cb08513dd
author Andreas Gampe <agampe@google.com> Thu May 24 15:49:36 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 24 15:49:36 2018 -0700
tree a4c85d4421843d6131f2987a034b4ae688119201
parent f7c71c4af046d2741e18c6f43c771ebe0de6354b
parent f9e1920771cdfe38fdc89fe4eb97855a9005f098

Libunwind: Ignore [vsyscall] map am: 0c1a9cab2f
am: f9e1920771

Change-Id: Ifa2ad3f0008ffc7b939abf12c92a545b2dbdfa7f

src/os-linux.c

diff --git a/src/os-linux.c b/src/os-linux.c
index 8dc1ebf..0f914f2 100644
--- a/src/os-linux.c
+++ b/src/os-linux.c
@@ -78,6 +78,7 @@
       /* If this is a readable executable map, and not a stack map or an
          empty map, find the load_base.  */
       if (cur_map->path[0] != '\0' && strncmp ("[stack:", cur_map->path, 7) != 0
+          && strncmp ("[vsyscall]", cur_map->path, 10) != 0
           && (flags & (PROT_EXEC | PROT_READ)) == (PROT_EXEC | PROT_READ)
           && !(cur_map->flags & MAP_FLAGS_DEVICE_MEM))
         {