diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2013-06-03 13:04:35 +0000 |
|---|---|---|
| committer | Christophe Lyon <clyon@gcc.gnu.org> | 2013-06-03 15:04:35 +0200 |
| commit | 634cfa2ba8eaf9b2d63055a72e2e79686d407758 (patch) | |
| tree | a7f7e1d2064573d2c3406c5342856e46eb679808 | |
| parent | 4096c0c201701ceca5619a262dbc077bf03a7fb1 (diff) | |
| download | gcc-634cfa2ba8eaf9b2d63055a72e2e79686d407758.zip gcc-634cfa2ba8eaf9b2d63055a72e2e79686d407758.tar.gz gcc-634cfa2ba8eaf9b2d63055a72e2e79686d407758.tar.bz2 | |
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
| -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 8cc31a3..d2c80b3 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 06e5a0a..1ab6f78 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_++; |