[llvm-readobj] Support dumping of MSP430 ELF attributes

[jozefl]

Summary

The MSP430 ABI supports build attributes for specifying
the ISA, code model, data model and enum size in ELF object files.

[jozefl]

This patch relies on https://reviews.llvm.org/D107968, hence the patch application failure.
Is there a way to link these patches in some way? I've added that revision as a parent of this revision.
Thanks,
Jozef

[jozefl]

I don't have commit access, so if this patch is OK, I would appreciate if some would apply it for me.
Thanks.

[asl]

LGTM, thanks

[jhenderson]

We generally test new llvm-readelf features with dedicated llvm-readelf tests, usually with the support of yaml2obj or failing that, llvm-mc to generate the input files, where possible. I've no understanding of the attribute section myself, so don't know if either of these are practical options or not, but they would be preferred if so.

[jozefl]

Added yaml2obj tests that create SHT_MSP430_ATTRIBUTES sections by
directly specifying the raw contents of the section.

I've kept the CodeGen tests to ensure that we have coverage that the different
values for -mcpu= each emit the expected build attributes.

The ELFDumper.cpp changes have been refactored to apply cleanly on top of the
changes in https://reviews.llvm.org/D107968.

Thanks,
Jozef

[jhenderson]

Looks reasonable to me, barring some nits. It would be worth @asl or someone else with MSP430 knowledge to take a brief look at the test.

llvm/test/tools/llvm-readobj/ELF/MSP430/build-attributes.test

24

Small nit: use - rather than _ in prefix names: it's more common in other tests, and is easier to type on a typical English keyboard.

85

Nit: add a blank line immediately before the YAML blocks. This just makes it a little easier to spot the end of the test directives and start of the YAML for a given test case.

[jozefl]

Thanks, fixed the nits.

[jozefl]

Ping.
If the added yaml2obj test is acceptable, I would appreciate it if someone would "arc land" the patch for me, as I do not have commit access.

Thanks,
Jozef

[jhenderson]

In D107969#2974754, @jozefl wrote:

Ping.
If the added yaml2obj test is acceptable, I would appreciate it if someone would "arc land" the patch for me, as I do not have commit access.

Thanks,
Jozef

Hi @jozefl,

The general assumption in LLVM is that someone has commit access to land their own work after an LGTM on the patch has been received, unless they specifically say so. Also, I personally don't use "arc" for landing patches, so I'll need your preferred email address and name for the commit message if you want me (or someone else) to land it for you. Alternatively, if you've already contributed a few patches, you can request commit access for yourself.

[jozefl]

In D107969#2976317, @jhenderson wrote:

In D107969#2974754, @jozefl wrote:

Ping.
If the added yaml2obj test is acceptable, I would appreciate it if someone would "arc land" the patch for me, as I do not have commit access.

Thanks,
Jozef

Hi @jozefl,

The general assumption in LLVM is that someone has commit access to land their own work after an LGTM on the patch has been received, unless they specifically say so. Also, I personally don't use "arc" for landing patches, so I'll need your preferred email address and name for the commit message if you want me (or someone else) to land it for you. Alternatively, if you've already contributed a few patches, you can request commit access for yourself.

Hi @jhenderson,

It would be much appreciated if you could apply the patch for me, the name and email to use is "Jozef Lawrynowicz <[e-mail]>".
This would only be my second commit to LLVM, but once it's applied I'll try applying for commit access.

Thanks!
Jozef

[jhenderson]

Actually, I'd still like @asl to take a look at the test, since they presumably have more understanding of this area than I do. Sorry about that.

[jozefl]

Pinging for review of the MSP430-specific yaml2obj test.

Thanks,
Jozef

[asl]

Sorry, I was AFK for a moment. Will review today

[jozefl]

Thanks for the review, and committing the patch for me.

Jozef

llvm/include/llvm/Support/MSP430AttributeParser.h

+//===-- MSP430AttributeParser.h - MSP430 Attribute Parser -------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file contains support routines for parsing MSP430 ELF build attributes.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_MSP430ATTRIBUTEPARSER_H
+#define LLVM_SUPPORT_MSP430ATTRIBUTEPARSER_H
+
+#include "llvm/Support/ELFAttributeParser.h"
+#include "llvm/Support/MSP430Attributes.h"
+
+namespace llvm {
+class MSP430AttributeParser : public ELFAttributeParser {
+  struct DisplayHandler {
+    MSP430Attrs::AttrType Attribute;
+    Error (MSP430AttributeParser::*Routine)(MSP430Attrs::AttrType);
+  };
+  static const std::array<DisplayHandler, 4> DisplayRoutines;
+
+  Error parseISA(MSP430Attrs::AttrType Tag);
+  Error parseCodeModel(MSP430Attrs::AttrType Tag);
+  Error parseDataModel(MSP430Attrs::AttrType Tag);
+  Error parseEnumSize(MSP430Attrs::AttrType Tag);
+
+  Error handler(uint64_t Tag, bool &Handled) override;
+
+public:
+  MSP430AttributeParser(ScopedPrinter *SW)
+      : ELFAttributeParser(SW, MSP430Attrs::getMSP430AttributeTags(),
+                           "mspabi") {}
+  MSP430AttributeParser()
+      : ELFAttributeParser(MSP430Attrs::getMSP430AttributeTags(), "mspabi") {}
+};
+} // namespace llvm
+
+#endif

llvm/include/llvm/Support/MSP430Attributes.h

+//===-- MSP430Attributes.h - MSP430 Attributes ------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===-----------------------------------------------------------------------===//
+///
+/// \file
+/// This file contains enumerations for MSP430 ELF build attributes as
+/// defined in the MSP430 ELF psABI specification.
+///
+/// MSP430 ELF psABI specification
+///
+/// https://www.ti.com/lit/pdf/slaa534
+///
+//===----------------------------------------------------------------------===//
+#ifndef LLVM_SUPPORT_MSP430ATTRIBUTES_H
+#define LLVM_SUPPORT_MSP430ATTRIBUTES_H
+
+#include "llvm/Support/ELFAttributes.h"
+
+namespace llvm {
+namespace MSP430Attrs {
+
+const TagNameMap &getMSP430AttributeTags();
+
+enum AttrType : unsigned {
+  // Attribute types in ELF/.MSP430.attributes.
+  TagISA = 4,
+  TagCodeModel = 6,
+  TagDataModel = 8,
+  TagEnumSize = 10
+};
+
+enum ISA { ISAMSP430 = 1, ISAMSP430X = 2 };
+enum CodeModel { CMSmall = 1, CMLarge = 2 };
+enum DataModel { DMSmall = 1, DMLarge = 2, DMRestricted = 3 };
+enum EnumSize { ESSmall = 1, ESInteger = 2, ESDontCare = 3 };
+
+} // namespace MSP430Attrs
+} // namespace llvm
+
+#endif

llvm/lib/Object/ELF.cpp

StringRef llvm::object::getELFSectionTypeName(uint32_t Machine, unsigned Type) {
   case ELF::EM_MIPS_RS3_LE:
     switch (Type) {
       STRINGIFY_ENUM_CASE(ELF, SHT_MIPS_REGINFO);
       STRINGIFY_ENUM_CASE(ELF, SHT_MIPS_OPTIONS);
       STRINGIFY_ENUM_CASE(ELF, SHT_MIPS_DWARF);
       STRINGIFY_ENUM_CASE(ELF, SHT_MIPS_ABIFLAGS);
     }
     break;
+  case ELF::EM_MSP430:
+    switch (Type) { STRINGIFY_ENUM_CASE(ELF, SHT_MSP430_ATTRIBUTES); }
+    break;
   case ELF::EM_RISCV:
     switch (Type) { STRINGIFY_ENUM_CASE(ELF, SHT_RISCV_ATTRIBUTES); }
     break;
   default:
     break;
   }
 
   switch (Type) {

llvm/lib/ObjectYAML/ELFYAML.cpp

case ELF::EM_MIPS:
     ECase(SHT_MIPS_REGINFO);
     ECase(SHT_MIPS_OPTIONS);
     ECase(SHT_MIPS_DWARF);
     ECase(SHT_MIPS_ABIFLAGS);
     break;
   case ELF::EM_RISCV:
     ECase(SHT_RISCV_ATTRIBUTES);
     break;
+  case ELF::EM_MSP430:
+    ECase(SHT_MSP430_ATTRIBUTES);
+    break;
   default:
     // Nothing to do.
     break;
   }
 #undef ECase
   IO.enumFallback<Hex32>(Value);
 }
 

llvm/lib/Support/CMakeLists.txt

add_llvm_component_library(LLVMSupport
   LockFileManager.cpp
   LowLevelType.cpp
   ManagedStatic.cpp
   MathExtras.cpp
   MemAlloc.cpp
   MemoryBuffer.cpp
   MemoryBufferRef.cpp
   MD5.cpp
+  MSP430Attributes.cpp
+  MSP430AttributeParser.cpp
   NativeFormatting.cpp
   OptimizedStructLayout.cpp
   Optional.cpp
   Parallel.cpp
   PluginLoader.cpp
   PrettyStackTrace.cpp
   RandomNumberGenerator.cpp
   Regex.cpp

llvm/lib/Support/MSP430AttributeParser.cpp

+//===-- MSP430AttributeParser.cpp - MSP430 Attribute Parser ---------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/MSP430AttributeParser.h"
+#include "llvm/ADT/StringExtras.h"
+
+using namespace llvm;
+using namespace llvm::MSP430Attrs;
+
+constexpr std::array<MSP430AttributeParser::DisplayHandler, 4>
+    MSP430AttributeParser::DisplayRoutines{
+        {{MSP430Attrs::TagISA, &MSP430AttributeParser::parseISA},
+         {MSP430Attrs::TagCodeModel, &MSP430AttributeParser::parseCodeModel},
+         {MSP430Attrs::TagDataModel, &MSP430AttributeParser::parseDataModel},
+         {MSP430Attrs::TagEnumSize, &MSP430AttributeParser::parseEnumSize}}};
+
+Error MSP430AttributeParser::parseISA(AttrType Tag) {
+  static const char *StringVals[] = {"None", "MSP430", "MSP430X"};
+  return parseStringAttribute("ISA", Tag, makeArrayRef(StringVals));
+}
+
+Error MSP430AttributeParser::parseCodeModel(AttrType Tag) {
+  static const char *StringVals[] = {"None", "Small", "Large"};
+  return parseStringAttribute("Code Model", Tag, makeArrayRef(StringVals));
+}
+
+Error MSP430AttributeParser::parseDataModel(AttrType Tag) {
+  static const char *StringVals[] = {"None", "Small", "Large", "Restricted"};
+  return parseStringAttribute("Data Model", Tag, makeArrayRef(StringVals));
+}
+
+Error MSP430AttributeParser::parseEnumSize(AttrType Tag) {
+  static const char *StringVals[] = {"None", "Small", "Integer", "Don't Care"};
+  return parseStringAttribute("Enum Size", Tag, makeArrayRef(StringVals));
+}
+
+Error MSP430AttributeParser::handler(uint64_t Tag, bool &Handled) {
+  Handled = false;
+  for (const DisplayHandler &Disp : DisplayRoutines) {
+    if (uint64_t(Disp.Attribute) != Tag)
+      continue;
+    if (Error E = (this->*Disp.Routine)(static_cast<AttrType>(Tag)))
+      return E;
+    Handled = true;
+    break;
+  }
+  return Error::success();
+}

llvm/lib/Support/MSP430Attributes.cpp

+//===-- MSP430Attributes.cpp - MSP430 Attributes --------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/MSP430Attributes.h"
+
+using namespace llvm;
+using namespace llvm::MSP430Attrs;
+
+static constexpr TagNameItem TagData[] = {{TagISA, "Tag_ISA"},
+                                          {TagCodeModel, "Tag_Code_Model"},
+                                          {TagDataModel, "Tag_Data_Model"},
+                                          {TagEnumSize, "Tag_Enum_Size"}};
+
+constexpr TagNameMap MSP430AttributeTags{TagData};
+const TagNameMap &llvm::MSP430Attrs::getMSP430AttributeTags() {
+  return MSP430AttributeTags;
+}

llvm/lib/Target/MSP430/MCTargetDesc/MSP430ELFStreamer.cpp

 
 #include "MSP430MCTargetDesc.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFStreamer.h"
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSubtargetInfo.h"
+#include "llvm/Support/MSP430Attributes.h"
 
 using namespace llvm;
+using namespace llvm::MSP430Attrs;
 
 namespace llvm {
 
 class MSP430TargetELFStreamer : public MCTargetStreamer {
 public:
   MCELFStreamer &getStreamer();
   MSP430TargetELFStreamer(MCStreamer &S, const MCSubtargetInfo &STI);
 };
MSP430TargetELFStreamer::MSP430TargetELFStreamer(MCStreamer &S,
   // Vendor name string, zero-terminated.
   Streamer.emitBytes("mspabi");
   Streamer.emitInt8(0);
 
   // Attribute vector scope tag. 1 stands for the entire file.
   Streamer.emitInt8(1);
   // Attribute vector length.
   Streamer.emitInt32(11);
-  // OFBA_MSPABI_Tag_ISA(4) = 1, MSP430
-  Streamer.emitInt8(4);
-  Streamer.emitInt8(1);
-  // OFBA_MSPABI_Tag_Code_Model(6) = 1, Small
-  Streamer.emitInt8(6);
-  Streamer.emitInt8(1);
-  // OFBA_MSPABI_Tag_Data_Model(8) = 1, Small
-  Streamer.emitInt8(8);
-  Streamer.emitInt8(1);
+
+  Streamer.emitInt8(TagISA);
+  Streamer.emitInt8(STI.hasFeature(MSP430::FeatureX) ? ISAMSP430X : ISAMSP430);
+  Streamer.emitInt8(TagCodeModel);
+  Streamer.emitInt8(CMSmall);
+  Streamer.emitInt8(TagDataModel);
+  Streamer.emitInt8(DMSmall);
+  // Don't emit TagEnumSize, for full GCC compatibility.
 }
 
 MCELFStreamer &MSP430TargetELFStreamer::getStreamer() {
   return static_cast<MCELFStreamer &>(Streamer);
 }
 
 MCTargetStreamer *
 createMSP430ObjectTargetStreamer(MCStreamer &S, const MCSubtargetInfo &STI) {
   const Triple &TT = STI.getTargetTriple();
   if (TT.isOSBinFormatELF())
     return new MSP430TargetELFStreamer(S, STI);
   return nullptr;
 }
 
 } // namespace llvm

llvm/test/CodeGen/MSP430/build-attrs.ll

+; Test that the -mcpu= option sets the correct ELF build attributes.
+
+; RUN: llc -mtriple=msp430 -filetype=obj < %s \
+; RUN:   | llvm-readelf -A - | FileCheck %s --check-prefixes COMMON,MSP430,SMALL
+; RUN: llc -mtriple=msp430 -mcpu=generic -filetype=obj < %s \
+; RUN:   | llvm-readelf -A - | FileCheck %s --check-prefixes COMMON,MSP430,SMALL
+; RUN: llc -mtriple=msp430 -mcpu=msp430 -filetype=obj < %s \
+; RUN:   | llvm-readelf -A - | FileCheck %s --check-prefixes COMMON,MSP430,SMALL
+; RUN: llc -mtriple=msp430 -mcpu=msp430x -filetype=obj < %s \
+; RUN:   | llvm-readelf -A - | FileCheck %s --check-prefixes COMMON,MSP430X,SMALL
+
+; COMMON: BuildAttributes {
+; COMMON: FormatVersion: 0x41
+; COMMON:   SectionLength: 22
+; COMMON:   Vendor: mspabi
+; COMMON:   Tag: Tag_File (0x1)
+; COMMON:   Size: 11
+
+; MSP430:      Tag: 4
+; MSP430-NEXT: Value: 1
+; MSP430-NEXT: TagName: ISA
+; MSP430-NEXT: Description: MSP430
+
+; MSP430X:      Tag: 4
+; MSP430X-NEXT: Value: 2
+; MSP430X-NEXT: TagName: ISA
+; MSP430X-NEXT: Description: MSP430X
+
+; SMALL:      Tag: 6
+; SMALL-NEXT: Value: 1
+; SMALL-NEXT: TagName: Code_Model
+; SMALL-NEXT: Description: Small
+
+; SMALL:      Tag: 8
+; SMALL-NEXT: Value: 1
+; SMALL-NEXT: TagName: Data_Model
+; SMALL-NEXT: Description: Small
+
+define void @foo() {
+  ret void
+}

llvm/test/tools/llvm-readobj/ELF/MSP430/build-attributes.test

+## Validate MSPABI ELF Build Attributes
+
+## The header of .MSP430.attributes can be specified with.
+##  ContentArray: [ 0x41, 0x16, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+##  0x69, 0x00, 0x01, 0x0b, 0x00, 0x00, 0x00,
+##
+## Following that are individual bytes describing the ISA, code model, data
+## model and optionally enum size.
+##
+## If enum size is being tested, then the second byte (indicating the length of
+## the section), and last 32-bit int (indicating the length of the
+## subsection) of the header should be incremented by 2. This is to account for
+## the additional bytes for the enum size tag and value.
+
+# HEADER:        BuildAttributes {
+# HEADER-NEXT:   FormatVersion: 0x41
+# HEADER-NEXT:   Section 1 {
+# HEADER-NEXT:   SectionLength: 22
+# HEADER-NEXT:   Vendor: mspabi
+# HEADER-NEXT:   Tag: Tag_File (0x1)
+# HEADER-NEXT:   Size: 11
+
+# ENUM-HEADER:        BuildAttributes {
+# ENUM-HEADER-NEXT:   FormatVersion: 0x41
+# ENUM-HEADER-NEXT:   Section 1 {
+# ENUM-HEADER-NEXT:   SectionLength: 24
+# ENUM-HEADER-NEXT:   Vendor: mspabi
+# ENUM-HEADER-NEXT:   Tag: Tag_File (0x1)
+# ENUM-HEADER-NEXT:   Size: 13
+
+# MSP430:      Tag: 4
+# MSP430-NEXT: Value: 1
+# MSP430-NEXT: TagName: ISA
+# MSP430-NEXT: Description: MSP430
+
+# MSP430X:      Tag: 4
+# MSP430X-NEXT: Value: 2
+# MSP430X-NEXT: TagName: ISA
+# MSP430X-NEXT: Description: MSP430X
+
+# SMALL-CODE:      Tag: 6
+# SMALL-CODE-NEXT: Value: 1
+# SMALL-CODE-NEXT: TagName: Code_Model
+# SMALL-CODE-NEXT: Description: Small
+
+# LARGE-CODE:      Tag: 6
+# LARGE-CODE-NEXT: Value: 2
+# LARGE-CODE-NEXT: TagName: Code_Model
+# LARGE-CODE-NEXT: Description: Large
+
+# SMALL-DATA:      Tag: 8
+# SMALL-DATA-NEXT: Value: 1
+# SMALL-DATA-NEXT: TagName: Data_Model
+# SMALL-DATA-NEXT: Description: Small
+
+# LARGE-DATA:      Tag: 8
+# LARGE-DATA-NEXT: Value: 2
+# LARGE-DATA-NEXT: TagName: Data_Model
+# LARGE-DATA-NEXT: Description: Large
+
+# RESTRICTED-DATA:      Tag: 8
+# RESTRICTED-DATA-NEXT: Value: 3
+# RESTRICTED-DATA-NEXT: TagName: Data_Model
+# RESTRICTED-DATA-NEXT: Description: Restricted
+
+# SMALL-ENUM:      Tag: 10
+# SMALL-ENUM-NEXT: Value: 1
+# SMALL-ENUM-NEXT: TagName: Enum_Size
+# SMALL-ENUM-NEXT: Description: Small
+
+# INTEGER-ENUM:      Tag: 10
+# INTEGER-ENUM-NEXT: Value: 2
+# INTEGER-ENUM-NEXT: TagName: Enum_Size
+# INTEGER-ENUM-NEXT: Description: Integer
+
+# DONT-CARE-ENUM:      Tag: 10
+# DONT-CARE-ENUM-NEXT: Value: 3
+# DONT-CARE-ENUM-NEXT: TagName: Enum_Size
+# DONT-CARE-ENUM-NEXT: Description: Don't Care
+
+## MSP430 ISA
+# RUN: yaml2obj --docnum=1 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes HEADER,MSP430,SMALL-CODE,SMALL-DATA
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x16, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0b, 0x00, 0x00, 0x00,
+    0x04, 0x01, 0x06, 0x01, 0x08, 0x01 ]
+
+
+## MSP430X ISA, Small Code Model, Small Data Model
+# RUN: yaml2obj --docnum=2 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes HEADER,MSP430X,SMALL-CODE,SMALL-DATA
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x16, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0b, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x01, 0x08, 0x01 ]
+
+## MSP430X Large Code Model, Small Data Model
+# RUN: yaml2obj --docnum=3 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes HEADER,MSP430X,LARGE-CODE,SMALL-DATA
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x16, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0b, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x02, 0x08, 0x01 ]
+
+## MSP430X Small Code Model, Large Data Model
+# RUN: yaml2obj --docnum=4 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes HEADER,MSP430X,SMALL-CODE,LARGE-DATA
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x16, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0b, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x01, 0x08, 0x02 ]
+
+## MSP430X Small Code Model, Restricted Data Model
+# RUN: yaml2obj --docnum=5 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes HEADER,MSP430X,SMALL-CODE,RESTRICTED-DATA
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x16, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0b, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x01, 0x08, 0x03 ]
+
+## MSP430X Small Code Model, Small Data Model, Small Enums
+# RUN: yaml2obj --docnum=6 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes ENUM-HEADER,MSP430X,SMALL-CODE,SMALL-DATA,SMALL-ENUM
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x18, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0d, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x01, 0x08, 0x01, 0x0a, 0x01 ]
+
+## MSP430X Small Code Model, Small Data Model, Integer Enums
+# RUN: yaml2obj --docnum=7 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes ENUM-HEADER,MSP430X,SMALL-CODE,SMALL-DATA,INTEGER-ENUM
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x18, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0d, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x01, 0x08, 0x01, 0x0a, 0x02 ]
+
+
+## MSP430X Small Code Model, Small Data Model, "Don't Care" Enums
+# RUN: yaml2obj --docnum=8 %s -o %t.o
+# RUN: llvm-readobj -A %t.o | FileCheck %s --check-prefixes ENUM-HEADER,MSP430X,SMALL-CODE,SMALL-DATA,DONT-CARE-ENUM
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MSP430
+Sections:
+  - Name: .MSP430.attributes
+    Type: SHT_MSP430_ATTRIBUTES
+    ContentArray: [ 0x41, 0x18, 0x00, 0x00, 0x00, 0x6D, 0x73, 0x70, 0x61, 0x62,
+    0x69, 0x00, 0x01, 0x0d, 0x00, 0x00, 0x00,
+    0x04, 0x02, 0x06, 0x01, 0x08, 0x01, 0x0a, 0x03 ]

llvm/test/tools/llvm-readobj/ELF/MSP430/lit.local.cfg

+if not 'MSP430' in config.root.targets:
+    config.unsupported = True

llvm/tools/llvm-readobj/ELFDumper.cpp

 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/LEB128.h"
+#include "llvm/Support/MSP430AttributeParser.h"
+#include "llvm/Support/MSP430Attributes.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/MipsABIFlags.h"
 #include "llvm/Support/RISCVAttributeParser.h"
 #include "llvm/Support/RISCVAttributes.h"
 #include "llvm/Support/ScopedPrinter.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <cinttypes>
case EM_RISCV:
     if (Obj.isLE())
       printAttributes(ELF::SHT_RISCV_ATTRIBUTES,
                       std::make_unique<RISCVAttributeParser>(&W),
                       support::little);
     else
       reportUniqueWarning("attribute printing not implemented for big-endian "
                           "RISC-V objects");
     break;
+  case EM_MSP430:
+    printAttributes(ELF::SHT_MSP430_ATTRIBUTES,
+                    std::make_unique<MSP430AttributeParser>(&W),
+                    support::little);
+    break;
   case EM_MIPS: {
     printMipsABIFlags();
     printMipsOptions();
     printMipsReginfo();
     MipsGOTParser<ELFT> Parser(*this);
     if (Error E = Parser.findGOT(dynamic_table(), dynamic_symbols()))
       reportUniqueWarning(std::move(E));
     else if (!Parser.isGotEmpty())