Index: llvm/test/tools/llvm-readobj/ELF/hash-table.test
===================================================================
--- llvm/test/tools/llvm-readobj/ELF/hash-table.test
+++ llvm/test/tools/llvm-readobj/ELF/hash-table.test
@@ -18,7 +18,7 @@
 
 --- !ELF
 FileHeader:
-  Class:   ELFCLASS[[BITS]]
+  Class:   ELFCLASS[[BITS=64]]
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: [[MACHINE]]
@@ -42,6 +42,21 @@
       - Section: .hash
       - Section: .dynamic
 
+## On EM_S390 and EM_ALPHA platforms we ignore the hash table. We do that because on these platforms the size of entries
+## is 8, what violates the ELF specification, which says that the normal size of hash entries in the hash table must be 4.
+
+# RUN: yaml2obj --docnum=1 -DMACHINE=EM_S390 %s -o %t.s390
+# RUN: llvm-readobj --hash-table %t.s390 2>&1 | FileCheck %s -DFILE=%t.s390 --check-prefixes=IGNORED -DNAME="IBM System/390"
+# RUN: llvm-readelf --hash-table %t.s390 2>&1 | FileCheck %s -DFILE=%t.s390 --check-prefixes=IGNORED -DNAME="IBM System/390"
+
+# IGNORED:      warning: '[[FILE]]': the hash table at 0x78 is not supported and will be ignored: it contains non-standard 8 byte entries on [[NAME]] platform
+# IGNORED:      HashTable {
+# IGNORED-NEXT: }
+
+# RUN: yaml2obj --docnum=1 -DMACHINE=EM_ALPHA %s -o %t.alpha
+# RUN: llvm-readobj --hash-table %t.alpha 2>&1 | FileCheck %s -DFILE=%t.alpha --check-prefixes=IGNORED -DNAME="DEC Alpha"
+# RUN: llvm-readelf --hash-table %t.alpha 2>&1 | FileCheck %s -DFILE=%t.alpha --check-prefixes=IGNORED -DNAME="DEC Alpha"
+
 ## Check we can dump the SHT_HASH section even when an object
 ## does not have the section header table.
 
Index: llvm/tools/llvm-readobj/ELFDumper.cpp
===================================================================
--- llvm/tools/llvm-readobj/ELFDumper.cpp
+++ llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -2059,10 +2059,25 @@
   Optional<DynRegionInfo> DynSymFromTable;
   for (const Elf_Dyn &Dyn : dynamic_table()) {
     switch (Dyn.d_tag) {
-    case ELF::DT_HASH:
+    case ELF::DT_HASH: {
       HashTable = reinterpret_cast<const Elf_Hash *>(
           toMappedAddr(Dyn.getTag(), Dyn.getPtr()));
+
+      unsigned Machine = Obj.getHeader().e_machine;
+      if (HashTable && (Machine == ELF::EM_S390 || Machine == ELF::EM_ALPHA)) {
+        uint64_t Offset =
+            reinterpret_cast<const uint8_t *>(HashTable) - this->Obj.base();
+        StringRef MachineName =
+            Machine == ELF::EM_S390 ? "IBM System/390" : "DEC Alpha";
+        reportUniqueWarning(createError(
+            "the hash table at 0x" + Twine::utohexstr(Offset) +
+            " is not supported and will be ignored: it contains non-standard 8 "
+            "byte entries on " +
+            MachineName + " platform"));
+        HashTable = nullptr;
+      }
       break;
+    }
     case ELF::DT_GNU_HASH:
       GnuHashTable = reinterpret_cast<const Elf_GnuHash *>(
           toMappedAddr(Dyn.getTag(), Dyn.getPtr()));