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

literal 0
Hc$@<O00001

diff --git a/llvm/test/tools/obj2yaml/XCOFF/aix.yaml b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
--- a/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
+++ b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
@@ -1,80 +1,93 @@
-# RUN: obj2yaml %S/Inputs/aix_xcoff.o | FileCheck %s
-# Test that we can parse the XCOFF object file correctly.
-# CHECK: --- !XCOFF
+## This is a basic test to check if we can parse the XCOFF object file correctly.
+# RUN: yaml2obj %s -o %t
+# RUN: obj2yaml %t | FileCheck %s
+
+# CHECK:      --- !XCOFF
 # CHECK-NEXT: FileHeader:
 # CHECK-NEXT:   MagicNumber:     0x1DF
 # CHECK-NEXT:   NumberOfSections: 2
-# CHECK-NEXT:   CreationTime:    1552337792
-# CHECK-NEXT:   OffsetToSymbolTable: 0x13A
-# CHECK-NEXT:   EntriesInSymbolTable: 22
+# CHECK-NEXT:   CreationTime:    0
+# CHECK-NEXT:   OffsetToSymbolTable: 0x80
+# CHECK-NEXT:   EntriesInSymbolTable: 4
 # CHECK-NEXT:   AuxiliaryHeaderSize: 0
 # CHECK-NEXT:   Flags:           0x0
-
-# CHECK: Symbols:
-# CHECK-NEXT:   - Name:      .file
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: N_DEBUG
-# CHECK-NEXT:     Type:      0x3
-# CHECK-NEXT:     StorageClass:    C_FILE
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      i
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: N_UNDEF
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      TestforXcoff
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: N_UNDEF
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      .text
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: .text
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      .main
-# CHECK-NEXT:     Value:     0x0
-# CHECK-NEXT:     Section: .text
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_EXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      main
-# CHECK-NEXT:     Value:     0x60
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      main
-# CHECK-NEXT:     Value:     0x60
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
+# CHECK-NEXT: Sections:
+# CHECK-NEXT:   - Name:            .text
+# CHECK-NEXT:     Address:         0x0
+# CHECK-NEXT:     Size:            0x4
+# CHECK-NEXT:     FileOffsetToData: 0x64
+# CHECK-NEXT:     FileOffsetToRelocations: 0x6C
+# CHECK-NEXT:     FileOffsetToLineNumbers: 0x0
+# CHECK-NEXT:     NumberOfRelocations: 0x1
+# CHECK-NEXT:     NumberOfLineNumbers: 0x0
+# CHECK-NEXT:     Flags:           [ STYP_TEXT ]
+# CHECK-NEXT:     SectionData:     '00007400'
+# CHECK-NEXT:     Relocations:
+# CHECK-NEXT:       - Address:         0xE
+# CHECK-NEXT:         Symbol:          0x12
+# CHECK-NEXT:         Info:            0xF
+# CHECK-NEXT:         Type:            0x3
+# CHECK-NEXT:   - Name:            .data
+# CHECK-NEXT:     Address:         0x4
+# CHECK-NEXT:     Size:            0x4
+# CHECK-NEXT:     FileOffsetToData: 0x68
+# CHECK-NEXT:     FileOffsetToRelocations: 0x76
+# CHECK-NEXT:     FileOffsetToLineNumbers: 0x0
+# CHECK-NEXT:     NumberOfRelocations: 0x1
+# CHECK-NEXT:     NumberOfLineNumbers: 0x0
+# CHECK-NEXT:     Flags:           [ STYP_DATA ]
+# CHECK-NEXT:     SectionData:     '00007700'
+# CHECK-NEXT:     Relocations:
+# CHECK-NEXT:       - Address:         0x60
+# CHECK-NEXT:         Symbol:          0x8
+# CHECK-NEXT:         Info:            0x1F
+# CHECK-NEXT:         Type:            0x0
+# CHECK-NEXT: Symbols:
+# CHECK-NEXT:   - Name:            TestforXcoff
+# CHECK-NEXT:     Value:           0x0
+# CHECK-NEXT:     Section:         N_UNDEF
+# CHECK-NEXT:     Type:            0x0
 # CHECK-NEXT:     StorageClass:    C_EXT
 # CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      .data
-# CHECK-NEXT:     Value:     0x70
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      TOC
-# CHECK-NEXT:     Value:     0x74
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      i
-# CHECK-NEXT:     Value:     0x74
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
-# CHECK-NEXT:     StorageClass:    C_HIDEXT
-# CHECK-NEXT:     NumberOfAuxEntries: 1
-# CHECK-NEXT:   - Name:      TestforXcoff
-# CHECK-NEXT:     Value:     0x78
-# CHECK-NEXT:     Section: .data
-# CHECK-NEXT:     Type:      0x0
+# CHECK-NEXT:   - Name:            .data
+# CHECK-NEXT:     Value:           0x70
+# CHECK-NEXT:     Section:         .data
+# CHECK-NEXT:     Type:            0x0
 # CHECK-NEXT:     StorageClass:    C_HIDEXT
 # CHECK-NEXT:     NumberOfAuxEntries: 1
 # CHECK-NEXT: ...
+
+--- !XCOFF
+FileHeader:
+  MagicNumber:     0x1DF
+Sections:
+  - Name:            .text
+    Flags:           [ STYP_TEXT ]
+    SectionData:     '00007400'
+    Relocations:
+      - Address:         0xE
+        Symbol:          0x12
+        Info:            0xF
+        Type:            0x3
+  - Name:            .data
+    Flags:           [ STYP_DATA ]
+    SectionData:     '00007700'
+    Relocations:
+      - Address:         0x60
+        Symbol:          0x8
+        Info:            0x1F
+        Type:            0x0
+Symbols:
+  - Name:            TestforXcoff
+    Value:           0x0
+    Section:         N_UNDEF
+    Type:            0x0
+    StorageClass:    C_EXT
+    NumberOfAuxEntries: 1
+  - Name:            .data
+    Value:           0x70
+    Section:         .data
+    Type:            0x0
+    StorageClass:    C_HIDEXT
+    NumberOfAuxEntries: 1
+...
diff --git a/llvm/tools/obj2yaml/xcoff2yaml.cpp b/llvm/tools/obj2yaml/xcoff2yaml.cpp
--- a/llvm/tools/obj2yaml/xcoff2yaml.cpp
+++ b/llvm/tools/obj2yaml/xcoff2yaml.cpp
@@ -9,6 +9,7 @@
 #include "obj2yaml.h"
 #include "llvm/Object/XCOFFObjectFile.h"
 #include "llvm/ObjectYAML/XCOFFYAML.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/YAMLTraits.h"
 
 using namespace llvm;
@@ -19,17 +20,21 @@
   const object::XCOFFObjectFile &Obj;
   XCOFFYAML::Object YAMLObj;
   void dumpHeader();
-  std::error_code dumpSymbols();
+  Error dumpSections();
+  Error dumpSymbols();
+  template <typename T> Error dumpSections(ArrayRef<T> Sections);
 
 public:
   XCOFFDumper(const object::XCOFFObjectFile &obj) : Obj(obj) {}
-  std::error_code dump();
+  Error dump();
   XCOFFYAML::Object &getYAMLObj() { return YAMLObj; }
 };
 } // namespace
 
-std::error_code XCOFFDumper::dump() {
+Error XCOFFDumper::dump() {
   dumpHeader();
+  if (Error E = dumpSections())
+    return E;
   return dumpSymbols();
 }
 
@@ -50,7 +55,59 @@
   YAMLObj.Header.Flags = Obj.getFlags();
 }
 
-std::error_code XCOFFDumper::dumpSymbols() {
+Error XCOFFDumper::dumpSections() {
+  if (Obj.is64Bit())
+    return createStringError(object_error::invalid_file_type,
+                             "64-bit XCOFF not supported yet");
+  return dumpSections(Obj.sections32());
+}
+
+template <typename T> Error XCOFFDumper::dumpSections(ArrayRef<T> Sections) {
+  std::vector<XCOFFYAML::Section> &YamlSections = YAMLObj.Sections;
+  for (const T &S : Sections) {
+    XCOFFYAML::Section YamlSec;
+    YamlSec.SectionName = S.getName();
+    YamlSec.Address = S.PhysicalAddress;
+    YamlSec.Size = S.SectionSize;
+    YamlSec.NumberOfRelocations = S.NumberOfRelocations;
+    YamlSec.NumberOfLineNumbers = S.NumberOfLineNumbers;
+    YamlSec.FileOffsetToData = S.FileOffsetToRawData;
+    YamlSec.FileOffsetToRelocations = S.FileOffsetToRelocationInfo;
+    YamlSec.FileOffsetToLineNumbers = S.FileOffsetToLineNumberInfo;
+    YamlSec.Flags = S.Flags;
+
+    // Dump section data.
+    if (S.FileOffsetToRawData) {
+      DataRefImpl SectionDRI;
+      SectionDRI.p = reinterpret_cast<uintptr_t>(&S);
+      Expected<ArrayRef<uint8_t>> SecDataRefOrErr =
+          Obj.getSectionContents(SectionDRI);
+      if (!SecDataRefOrErr)
+        return SecDataRefOrErr.takeError();
+      YamlSec.SectionData = SecDataRefOrErr.get();
+    }
+
+    // Dump relocations.
+    if (S.NumberOfRelocations) {
+      auto RelRefOrErr =
+          Obj.relocations<XCOFFSectionHeader32, XCOFFRelocation32>(S);
+      if (!RelRefOrErr)
+        return RelRefOrErr.takeError();
+      for (XCOFFRelocation32 Rel : RelRefOrErr.get()) {
+        XCOFFYAML::Relocation YamlRel;
+        YamlRel.Type = Rel.Type;
+        YamlRel.Info = Rel.Info;
+        YamlRel.SymbolIndex = Rel.SymbolIndex;
+        YamlRel.VirtualAddress = Rel.VirtualAddress;
+        YamlSec.Relocations.push_back(YamlRel);
+      }
+    }
+    YamlSections.push_back(YamlSec);
+  }
+  return Error::success();
+}
+
+Error XCOFFDumper::dumpSymbols() {
   std::vector<XCOFFYAML::Symbol> &Symbols = YAMLObj.Symbols;
 
   for (const SymbolRef &S : Obj.symbols()) {
@@ -60,7 +117,7 @@
 
     Expected<StringRef> SymNameRefOrErr = Obj.getSymbolName(SymbolDRI);
     if (!SymNameRefOrErr) {
-      return errorToErrorCode(SymNameRefOrErr.takeError());
+      return SymNameRefOrErr.takeError();
     }
     Sym.SymbolName = SymNameRefOrErr.get();
 
@@ -69,7 +126,7 @@
     Expected<StringRef> SectionNameRefOrErr =
         Obj.getSymbolSectionName(SymbolEntRef);
     if (!SectionNameRefOrErr)
-      return errorToErrorCode(SectionNameRefOrErr.takeError());
+      return SectionNameRefOrErr.takeError();
 
     Sym.SectionName = SectionNameRefOrErr.get();
 
@@ -79,15 +136,15 @@
     Symbols.push_back(Sym);
   }
 
-  return std::error_code();
+  return Error::success();
 }
 
 std::error_code xcoff2yaml(raw_ostream &Out,
                            const object::XCOFFObjectFile &Obj) {
   XCOFFDumper Dumper(Obj);
 
-  if (std::error_code EC = Dumper.dump())
-    return EC;
+  if (Error E = Dumper.dump())
+    return errorToErrorCode(std::move(E));
 
   yaml::Output Yout(Out);
   Yout << Dumper.getYAMLObj();