summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2012-12-31 18:20:51 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2012-12-31 18:20:51 +0000
commit5b712efd9a4d29119ce136d46a23454bdc103f68 (patch)
treebc70eedd44b22a4a546c01bb808b592d4c62b089
parent2e594fa85c809178ce598a9b4c3a3bf5e0e6a14e (diff)
downloadllvm-5b712efd9a4d29119ce136d46a23454bdc103f68.tar.gz
llvm-5b712efd9a4d29119ce136d46a23454bdc103f68.tar.bz2
llvm-5b712efd9a4d29119ce136d46a23454bdc103f68.tar.xz
Fix bits check in ELFObjectFile::isSectionZeroInit().
Fixes PR14723. Patch by Sami Liedes! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171309 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Object/ELF.h5
-rw-r--r--test/Object/readobj-shared-object.test2
2 files changed, 2 insertions, 5 deletions
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h
index 1634789809..fcd77c74ab 100644
--- a/include/llvm/Object/ELF.h
+++ b/include/llvm/Object/ELF.h
@@ -1306,10 +1306,7 @@ error_code ELFObjectFile<target_endianness, is64Bits>
const Elf_Shdr *sec = reinterpret_cast<const Elf_Shdr *>(Sec.p);
// For ELF, all zero-init sections are virtual (that is, they occupy no space
// in the object image) and vice versa.
- if (sec->sh_flags & ELF::SHT_NOBITS)
- Result = true;
- else
- Result = false;
+ Result = sec->sh_type == ELF::SHT_NOBITS;
return object_error::success;
}
diff --git a/test/Object/readobj-shared-object.test b/test/Object/readobj-shared-object.test
index c1dd15b1f9..3065c6f636 100644
--- a/test/Object/readobj-shared-object.test
+++ b/test/Object/readobj-shared-object.test
@@ -65,7 +65,7 @@ ELF: .tdata {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} d
ELF: .dynamic {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} required
ELF: .got.plt {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} data,required
ELF: .data {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} data,required
-ELF: .bss {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} {{[a-z,]*}}
+ELF: .bss {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} bss,required,virtual,zeroinit
ELF: .shstrtab {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata
ELF: .symtab {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata
ELF: .strtab {{[0-9a-f]+}} {{[0-9a-f]+}} {{[0-9a-f]+}} rodata