diff options
| author | clyon <clyon@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-03 13:04:35 +0000 |
|---|---|---|
| committer | clyon <clyon@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-03 13:04:35 +0000 |
| commit | cba44bca7e5cff22a6e8f4a732907d93325c72a0 (patch) | |
| tree | a7f7e1d2064573d2c3406c5342856e46eb679808 /libsanitizer | |
| parent | 2e541dc54c83c946ae61c603c7a3faf3fa4d311e (diff) | |
| download | gcc-cba44bca7e5cff22a6e8f4a732907d93325c72a0.tar.gz | |
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
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 5 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 8cc31a318fc..d2c80b35704 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 06e5a0a6441..1ab6f780fa3 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_++; |