| 1 | Binary files src/coregrind/m_coredump/.coredump-elf.c.swp and src2/coregrind/m_coredump/.coredump-elf.c.swp differ |
| 2 | diff -purN src/coregrind/m_coredump/coredump-elf.c src2/coregrind/m_coredump/coredump-elf.c |
| 3 | --- src/coregrind/m_coredump/coredump-elf.c 2016-06-09 19:42:06.566486519 +0000 |
| 4 | +++ src2/coregrind/m_coredump/coredump-elf.c 2015-09-08 13:23:27.000000000 +0000 |
| 5 | @@ -135,18 +135,6 @@ static void fill_phdr(ESZ(Phdr) *phdr, c |
| 6 | phdr->p_align = VKI_PAGE_SIZE; |
| 7 | } |
| 8 | |
| 9 | -#if defined(VGPV_arm_linux_android) || defined(VGPV_x86_linux_android) \ |
| 10 | - || defined(VGPV_mips32_linux_android) |
| 11 | -/* Android's libc doesn't provide a definition for this. Hence: */ |
| 12 | -typedef |
| 13 | - struct { |
| 14 | - Elf32_Word n_namesz; |
| 15 | - Elf32_Word n_descsz; |
| 16 | - Elf32_Word n_type; |
| 17 | - } |
| 18 | - Elf32_Nhdr; |
| 19 | -#endif |
| 20 | - |
| 21 | struct note { |
| 22 | struct note *next; |
| 23 | ESZ(Nhdr) note; |