2013-06-03 Christophe Lyon <christophe.lyon@linaro.org>

       * sanitizer_common/sanitizer_linux.cc (MemoryMappingLayout::Next):
       Cherry pick upstream r182922.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199606 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 8cc31a318fc819abf2f8f8468d9881168b2b7d5d..d2c80b357049df30c90fa8a7409242bc09f9b5a2 100644 (file)
--- 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 06e5a0a64410ea689fdde48f13f8251d6a5bf29a..1ab6f780fa33c064b73f4688f207654e4cd35b23 100644 (file)
--- 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_++;