diff --git a/llvm/test/tools/llvm-nm/XCOFF/Inputs/test_gcc.o b/llvm/test/tools/llvm-nm/XCOFF/Inputs/test_gcc.o
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/llvm/test/tools/llvm-nm/XCOFF/print_symbol.test b/llvm/test/tools/llvm-nm/XCOFF/print_symbol.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/XCOFF/print_symbol.test
@@ -0,0 +1,110 @@
+# Test the llvm-nm for XCOFF object files.
+# RUN: llvm-nm  %p/Inputs/test_gcc.o | FileCheck --check-prefix=NM-SYM %s
+# RUN: llvm-nm  --print-size --demangle %p/Inputs/test_gcc.o | FileCheck --check-prefix=NM-SIZE-DEMANGLE %s
+
+## test_gcc.o is generated by the following source compiled with g++ in aix os.   
+##  int v = 0;
+## 
+## __attribute__((visibility ("protected"))) int  vp = 1;
+## __attribute__((visibility ("hidden"))) int  vh = 2;
+## __attribute__((visibility ("default"))) int  vd = 3;
+## __attribute__ ((weak)) __attribute__((visibility ("hidden"))) int vwh = 4;
+## __attribute__ ((weak)) __attribute__((visibility ("protected"))) int vwp = 5;
+## 
+## class C {
+## public:
+##  int c;
+##  C(int v):c(v) {}
+## };
+## 
+## C cc(2);
+## 
+## static int si = 6;
+## 
+## static int func0 () {
+##   return vp+si;
+## }
+## 
+## int func1 (int i) {
+##   return func0() * i;
+## }
+## 
+## __attribute__ ((weak)) __attribute__((visibility ("hidden")))
+## int fwh() {
+##   return si+1;
+## }
+## 
+## __attribute__ ((weak)) __attribute__((visibility ("protected")))
+## int fwp() {
+##   return si+2;
+## }
+
+# NM-SYM:      00000240 T ._GLOBAL__I_65535_0_v
+# NM-SYM-NEXT: 000001e4 t ._GLOBAL__sub_I_v
+# NM-SYM-NEXT: 000000b0 W ._Z3fwhv
+# NM-SYM-NEXT: 000000f4 W ._Z3fwpv
+# NM-SYM-NEXT: 00000138 t ._Z41__static_initialization_and_destruction_0ii
+# NM-SYM-NEXT: 00000050 T ._Z5func1i
+# NM-SYM-NEXT: 00000000 t ._ZL5func0v
+# NM-SYM-NEXT: 00000294 W ._ZN1CC1Ei
+# NM-SYM-NEXT: 00000294 t ._ZN1CC1Ei
+# NM-SYM-NEXT: 000002f0 d .data
+# NM-SYM-NEXT: 00000000 f .file
+# NM-SYM-NEXT: 00000000 t .text
+# NM-SYM-NEXT: 00000378 d TOC
+# NM-SYM-NEXT: 0000036c D _GLOBAL__I_65535_0_v
+# NM-SYM-NEXT: 0000036c d _GLOBAL__I_65535_0_v
+# NM-SYM-NEXT: 00000360 d _GLOBAL__sub_I_v
+# NM-SYM-NEXT: 0000033c W _Z3fwhv
+# NM-SYM-NEXT: 00000348 W _Z3fwpv
+# NM-SYM-NEXT: 00000354 d _Z41__static_initialization_and_destruction_0ii
+# NM-SYM-NEXT: 00000330 D _Z5func1i
+# NM-SYM-NEXT: 00000330 d _Z5func1i
+# NM-SYM-NEXT: 0000037c d _ZL2si
+# NM-SYM-NEXT: 00000324 d _ZL5func0v
+# NM-SYM-NEXT: 00000310 W _ZN1CC1Ei
+# NM-SYM-NEXT: 00000320 d _test.rw_
+# NM-SYM-NEXT: 00000308 D cc
+# NM-SYM-NEXT: 00000380 d cc
+# NM-SYM-NEXT: 000002f0 D v
+# NM-SYM-NEXT: 000002fc D vd
+# NM-SYM-NEXT: 000002f8 D vh
+# NM-SYM-NEXT: 000002f4 D vp
+# NM-SYM-NEXT: 00000378 d vp
+# NM-SYM-NEXT: 00000300 W vwh
+# NM-SYM-NEXT: 00000304 W vwp
+
+# NM-SIZE-DEMANGLE:      00000240 00000000 T ._GLOBAL__I_65535_0_v
+# NM-SIZE-DEMANGLE-NEXT: 000001e4 00000000 t ._GLOBAL__sub_I_v
+# NM-SIZE-DEMANGLE-NEXT: 000000b0 00000000 W .fwh()
+# NM-SIZE-DEMANGLE-NEXT: 000000f4 00000000 W .fwp()
+# NM-SIZE-DEMANGLE-NEXT: 00000138 00000000 t .__static_initialization_and_destruction_0(int, int)
+# NM-SIZE-DEMANGLE-NEXT: 00000050 00000000 T .func1(int)
+# NM-SIZE-DEMANGLE-NEXT: 00000000 00000000 t .func0()
+# NM-SIZE-DEMANGLE-NEXT: 00000294 00000000 W .C::C(int)
+# NM-SIZE-DEMANGLE-NEXT: 00000294 00000050 t .C::C(int)
+# NM-SIZE-DEMANGLE-NEXT: 000002f0 00000020 d .data
+# NM-SIZE-DEMANGLE-NEXT: 00000000 00000000 f .file
+# NM-SIZE-DEMANGLE-NEXT: 00000000 00000294 t .text
+# NM-SIZE-DEMANGLE-NEXT: 00000378 00000000 d TOC
+# NM-SIZE-DEMANGLE-NEXT: 0000036c 00000000 D _GLOBAL__I_65535_0_v
+# NM-SIZE-DEMANGLE-NEXT: 0000036c 0000000c d _GLOBAL__I_65535_0_v
+# NM-SIZE-DEMANGLE-NEXT: 00000360 0000000c d _GLOBAL__sub_I_v
+# NM-SIZE-DEMANGLE-NEXT: 0000033c 0000000c W fwh()
+# NM-SIZE-DEMANGLE-NEXT: 00000348 0000000c W fwp()
+# NM-SIZE-DEMANGLE-NEXT: 00000354 0000000c d __static_initialization_and_destruction_0(int, int)
+# NM-SIZE-DEMANGLE-NEXT: 00000330 00000000 D func1(int)
+# NM-SIZE-DEMANGLE-NEXT: 00000330 0000000c d func1(int)
+# NM-SIZE-DEMANGLE-NEXT: 0000037c 00000004 d si
+# NM-SIZE-DEMANGLE-NEXT: 00000324 0000000c d func0()
+# NM-SIZE-DEMANGLE-NEXT: 00000310 0000000c W C::C(int)
+# NM-SIZE-DEMANGLE-NEXT: 00000320 00000004 d _test.rw_
+# NM-SIZE-DEMANGLE-NEXT: 00000308 00000000 D cc
+# NM-SIZE-DEMANGLE-NEXT: 00000380 00000004 d cc
+# NM-SIZE-DEMANGLE-NEXT: 000002f0 00000000 D v
+# NM-SIZE-DEMANGLE-NEXT: 000002fc 00000000 D vd
+# NM-SIZE-DEMANGLE-NEXT: 000002f8 00000000 D vh
+# NM-SIZE-DEMANGLE-NEXT: 000002f4 00000000 D vp
+# NM-SIZE-DEMANGLE-NEXT: 00000378 00000004 d vp
+# NM-SIZE-DEMANGLE-NEXT: 00000300 00000000 W vwh
+# NM-SIZE-DEMANGLE-NEXT: 00000304 00000000 W vwp
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -31,6 +31,7 @@
 #include "llvm/Object/TapiFile.h"
 #include "llvm/Object/TapiUniversal.h"
 #include "llvm/Object/Wasm.h"
+#include "llvm/Object/XCOFFObjectFile.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
@@ -246,6 +247,9 @@
     return Triple(IRObj->getTargetTriple()).isArch64Bit();
   if (isa<COFFObjectFile>(Obj) || isa<COFFImportFile>(Obj))
     return false;
+  if (XCOFFObjectFile *XCOFFObj = dyn_cast<XCOFFObjectFile>(&Obj))
+    return XCOFFObj->is64Bit();
+
   if (isa<WasmObjectFile>(Obj))
     return false;
   if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
@@ -599,10 +603,17 @@
     outs() << format("   %02x", NType);
 }
 
-static Optional<std::string> demangle(StringRef Name, bool StripUnderscore) {
+static Optional<std::string> demangle(StringRef Name, bool StripUnderscore,
+                                      bool isXCOFF) {
   if (StripUnderscore && !Name.empty() && Name[0] == '_')
     Name = Name.substr(1);
 
+  bool isPutXCOFFLabelDotBack = false;
+  if (isXCOFF && !Name.empty() && Name[0] == '.') {
+    Name = Name.substr(1);
+    isPutXCOFFLabelDotBack = true;
+  }
+
   if (!Name.startswith("_Z"))
     return None;
 
@@ -613,6 +624,9 @@
     return None;
 
   std::string S(Undecorated);
+  if (isPutXCOFFLabelDotBack)
+    S.insert(0, 1, '.');
+
   free(Undecorated);
   return S;
 }
@@ -704,8 +718,9 @@
     uint32_t SymFlags;
     std::string Name = S.Name;
     MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj);
+    XCOFFObjectFile *XCOFFO = dyn_cast<XCOFFObjectFile>(&Obj);
     if (Demangle) {
-      if (Optional<std::string> Opt = demangle(S.Name, MachO))
+      if (Optional<std::string> Opt = demangle(S.Name, MachO, XCOFFO))
         Name = *Opt;
     }
     if (S.Sym.getRawDataRefImpl().p) {
@@ -903,6 +918,41 @@
   return '?';
 }
 
+static char getSymbolNMTypeChar(XCOFFObjectFile &Obj, symbol_iterator I) {
+  Expected<uint32_t> TypeOrErr = I->getType();
+  if (!TypeOrErr)
+    error(TypeOrErr.takeError(), Obj.getFileName());
+
+  uint32_t SymType = TypeOrErr.get();
+
+  if (SymType == SymbolRef::ST_Debug)
+    return 'N';
+
+  if (SymType == SymbolRef::ST_File)
+    return 'f';
+
+  Expected<section_iterator> SymSecOrErr = I->getSection();
+
+  if (!SymSecOrErr)
+    error(SymSecOrErr.takeError(), Obj.getFileName());
+
+  section_iterator SecIter = SymSecOrErr.get();
+
+  if (SecIter == Obj.section_end())
+    return '?';
+
+  if (SecIter->isText())
+    return 't';
+
+  if (SecIter->isData())
+    return 'd';
+
+  if (SecIter->isBSS())
+    return 'b';
+
+  return '?';
+}
+
 static char getSymbolNMTypeChar(COFFImportFile &Obj) {
   switch (Obj.getCOFFImportHeader()->getType()) {
   case COFF::IMPORT_CODE:
@@ -1051,6 +1101,8 @@
     Ret = getSymbolNMTypeChar(*IR, I);
   else if (COFFObjectFile *COFF = dyn_cast<COFFObjectFile>(&Obj))
     Ret = getSymbolNMTypeChar(*COFF, I);
+  else if (XCOFFObjectFile *XCOFF = dyn_cast<XCOFFObjectFile>(&Obj))
+    Ret = getSymbolNMTypeChar(*XCOFF, I);
   else if (COFFImportFile *COFFImport = dyn_cast<COFFImportFile>(&Obj))
     Ret = getSymbolNMTypeChar(*COFFImport);
   else if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
@@ -1637,6 +1689,11 @@
       S.Address = 0;
       if (isa<ELFObjectFileBase>(&Obj))
         S.Size = ELFSymbolRef(Sym).getSize();
+
+      if (const XCOFFObjectFile *XCOFFObj =
+              dyn_cast<const XCOFFObjectFile>(&Obj))
+        S.Size = XCOFFObj->getSymbolSize(Sym.getRawDataRefImpl());
+
       if (PrintAddress && isa<ObjectFile>(Obj)) {
         SymbolRef SymRef(Sym);
         Expected<uint64_t> AddressOrErr = SymRef.getAddress();