diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2016-02-09 21:30:10 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2016-02-09 21:30:10 +0000 |
commit | 77f6c46922f88cbfe4125b063f4c901a4c4747af (patch) | |
tree | 12bee8495e74735ed7a41dd476eb14e58789feb6 | |
parent | 0e14c044792e464b00ed1303f59a3484bbf4f830 (diff) | |
download | llvm-77f6c46922f88cbfe4125b063f4c901a4c4747af.tar.gz |
Revert "Correct size calculations for ELF files"
This reverts commit r259578.
There are enough issues with this small patch that it is better to
revert and then commit a fixed version (will be committed shortly).
llvm-svn: 260285
-rw-r--r-- | llvm/test/tools/llvm-size/Inputs/1.o | bin | 1576 -> 0 bytes | |||
-rw-r--r-- | llvm/test/tools/llvm-size/basic.test | 26 | ||||
-rw-r--r-- | llvm/tools/llvm-size/llvm-size.cpp | 20 |
3 files changed, 0 insertions, 46 deletions
diff --git a/llvm/test/tools/llvm-size/Inputs/1.o b/llvm/test/tools/llvm-size/Inputs/1.o Binary files differdeleted file mode 100644 index ebcb20701b81..000000000000 --- a/llvm/test/tools/llvm-size/Inputs/1.o +++ /dev/null diff --git a/llvm/test/tools/llvm-size/basic.test b/llvm/test/tools/llvm-size/basic.test index 09827af9c90c..8b2d66eef3ce 100644 --- a/llvm/test/tools/llvm-size/basic.test +++ b/llvm/test/tools/llvm-size/basic.test @@ -1,28 +1,2 @@ RUN: llvm-size %t.blah 2>&1 | FileCheck --check-prefix=ENOENT %s -#1.o source -#int x ; int y ; int z; -# -#int main () { -# x = 1; -# y = 1; -# z = 1; -# return x + y + z; -#} -#Compilation: clang -c -O0 -RUN: llvm-size -A %p/Inputs/1.o | FileCheck --check-prefix="SYSV" %s -RUN: llvm-size -B %p/Inputs/1.o | FileCheck --check-prefix="BSD" %s - ENOENT: {{.*}}llvm-size{{(\.EXE|\.exe)?}}: {{.*}}.blah: {{[Nn]}}o such file or directory -SYSV: {{[ -\(\)_A-Za-z0-9.\\/:]+}} : -SYSV-NEXT: section size addr -SYSV-NEXT: .text 67 0 -SYSV-NEXT: .data 0 0 -SYSV-NEXT: .bss 0 0 -SYSV-NEXT: .comment 46 0 -SYSV-NEXT: .note.GNU-stack 0 0 -SYSV-NEXT: .eh_frame 56 0 -SYSV-NEXT: Total 169 - -BSD: text data bss dec hex filename -BSD-NEXT: 67 56 0 123 7b {{[ -\(\)_A-Za-z0-9.\\/:]+}} - diff --git a/llvm/tools/llvm-size/llvm-size.cpp b/llvm/tools/llvm-size/llvm-size.cpp index 5addbb3ea9d9..56b9dc58d2ef 100644 --- a/llvm/tools/llvm-size/llvm-size.cpp +++ b/llvm/tools/llvm-size/llvm-size.cpp @@ -15,13 +15,11 @@ #include "llvm/ADT/APInt.h" #include "llvm/Object/Archive.h" -#include "llvm/Object/ELFObjectFile.h" #include "llvm/Object/MachO.h" #include "llvm/Object/MachOUniversal.h" #include "llvm/Object/ObjectFile.h" #include "llvm/Support/Casting.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/ELF.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Format.h" #include "llvm/Support/ManagedStatic.h" @@ -113,20 +111,6 @@ static const char *getRadixFmt() { return nullptr; } -/// @brief Remove unneeded ELF sections from calculation -static bool ConsiderForSize(ObjectFile *Obj, SectionRef Section) { - if (Obj->isELF()) { - switch (static_cast<ELFSectionRef>(Section).getType()) { - case ELF::SHT_NULL: - case ELF::SHT_SYMTAB: - case ELF::SHT_STRTAB: - case ELF::SHT_REL: - case ELF::SHT_RELA: - return false; - } - } - return true; -} /// @brief Print the size of each Mach-O segment and section in @p MachO. /// /// This is when used when @c OutputFormat is darwin and produces the same @@ -303,8 +287,6 @@ static void PrintObjectSectionSizes(ObjectFile *Obj) { std::size_t max_size_len = strlen("size"); std::size_t max_addr_len = strlen("addr"); for (const SectionRef &Section : Obj->sections()) { - if (!ConsiderForSize(Obj, Section)) - continue; uint64_t size = Section.getSize(); total += size; @@ -340,8 +322,6 @@ static void PrintObjectSectionSizes(ObjectFile *Obj) { // Print each section. for (const SectionRef &Section : Obj->sections()) { - if (!ConsiderForSize(Obj, Section)) - continue; StringRef name; if (error(Section.getName(name))) return; |