From bc2f47a76eb1471f0795b4e6d29e83836d2aff28 Mon Sep 17 00:00:00 2001
From: Colin LeMahieu <colinl@codeaurora.org>
Date: Fri, 23 Jan 2015 20:06:24 +0000
Subject: [PATCH] [Objdump] Output information about common symbols in a way
 closer to GNU objdump.

llvm-svn: 226932
---
 llvm/test/tools/llvm-objdump/Inputs/common-symbol-elf | Bin 0 -> 598 bytes
 llvm/test/tools/llvm-objdump/common-symbol-elf.test   |   3 +++
 llvm/tools/llvm-objdump/llvm-objdump.cpp              |  12 +++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/tools/llvm-objdump/Inputs/common-symbol-elf
 create mode 100644 llvm/test/tools/llvm-objdump/common-symbol-elf.test

diff --git a/llvm/test/tools/llvm-objdump/Inputs/common-symbol-elf b/llvm/test/tools/llvm-objdump/Inputs/common-symbol-elf
new file mode 100644
index 0000000000000000000000000000000000000000..9609edb041fe99e42372d7ad7d1040c65c9e453b
GIT binary patch
literal 598
zcma)3yH3ME5L^>O(g6juxQRk_AOxaCia;Qlf+kWbIEPa}ifxoTP*U*=d;}lFufPw4
znX^xEibz>$Z)d!-kMn(Ar#Dd)Nw7%1WywUoka&Whd%>}EWLxCn{jQ&+>EJ%OH8VXf
zi=;o%#W?veQ~L^bsm?@{GczY@ROY!U05WSu*%#}kPG>+N&U4S7wbOpaW(Rkq@6_^Y
zzh!M)!xKd6S~Xv%+e5yyfvyb=`<=pR?AP_EI>KHDpkXF6L-++jZPd|v@GXz3;|Ga1
zK+fUacn|J&1aJ1cLeU|<1q=NG4{<jD#8`e84T^rNRjrjxIIlU8JoXj*Ph4zY{uaXb
REsIAx&$DtO&RC~L@(-5JFm3<<

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-objdump/common-symbol-elf.test b/llvm/test/tools/llvm-objdump/common-symbol-elf.test
new file mode 100644
index 0000000..32df05a
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/common-symbol-elf.test
@@ -0,0 +1,3 @@
+// RUN: llvm-objdump -t %p/Inputs/common-symbol-elf | FileCheck %s
+
+CHECK: 00000400 g       *COM*  00000008 common_symbol
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index cd94a3a..1204a97 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -642,7 +642,15 @@ void llvm::PrintSymbolTable(const ObjectFile *o) {
     bool Global = Flags & SymbolRef::SF_Global;
     bool Weak = Flags & SymbolRef::SF_Weak;
     bool Absolute = Flags & SymbolRef::SF_Absolute;
-
+    bool Common = Flags & SymbolRef::SF_Common;
+
+    if (Common) {
+      uint32_t Alignment;
+      if (error(Symbol.getAlignment(Alignment)))
+        Alignment = 0;
+      Address = Size;
+      Size = Alignment;
+    }
     if (Address == UnknownAddressOrSize)
       Address = 0;
     if (Size == UnknownAddressOrSize)
@@ -672,6 +680,8 @@ void llvm::PrintSymbolTable(const ObjectFile *o) {
            << ' ';
     if (Absolute) {
       outs() << "*ABS*";
+    } else if (Common) {
+      outs() << "*COM*";
     } else if (Section == o->section_end()) {
       outs() << "*UND*";
     } else {
-- 
2.7.4