From 634cfa2ba8eaf9b2d63055a72e2e79686d407758 Mon Sep 17 00:00:00 2001
From: Christophe Lyon <christophe.lyon@linaro.org>
Date: Mon, 3 Jun 2013 13:04:35 +0000
Subject: [PATCH] sanitizer_linux.cc (MemoryMappingLayout::Next): Cherry pick
upstream r182922.
2013-06-03 Christophe Lyon <christophe.lyon@linaro.org>
* sanitizer_common/sanitizer_linux.cc (MemoryMappingLayout::Next):
Cherry pick upstream r182922.
From-SVN: r199606
---
libsanitizer/ChangeLog | 5 +++++
libsanitizer/sanitizer_common/sanitizer_linux.cc | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 8cc31a318fc8..d2c80b357049 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-03 Christophe Lyon <christophe.lyon@linaro.org>
+
+ * sanitizer_common/sanitizer_linux.cc (MemoryMappingLayout::Next):
+ Cherry pick upstream r182922.
+
2013-05-07 Christophe Lyon <christophe.lyon@linaro.org>
* configure.tgt: Add ARM pattern.
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
index 06e5a0a64410..1ab6f780fa33 100644
--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
@@ -410,7 +410,9 @@ bool MemoryMappingLayout::Next(uptr *start, uptr *end, uptr *offset,
CHECK_EQ(*current_++, ' ');
while (IsDecimal(*current_))
current_++;
- CHECK_EQ(*current_++, ' ');
+ // Qemu may lack the trailing space.
+ // http://code.google.com/p/address-sanitizer/issues/detail?id=160
+ // CHECK_EQ(*current_++, ' ');
// Skip spaces.
while (current_ < next_line && *current_ == ' ')
current_++;
--
GitLab