Update patch to latest version from https://reviews.llvm.org/D48964

Author: ColinFinck

include/llvm/BinaryFormat/ELF.h

@@ -357,7 +357,6 @@ enum {
   ELFOSABI_AMDGPU_HSA = 64,    // AMD HSA runtime
   ELFOSABI_AMDGPU_PAL = 65,    // AMD PAL runtime
   ELFOSABI_AMDGPU_MESA3D = 66, // AMD GCN GPUs (GFX6+) for MESA runtime
-  ELFOSABI_HERMITCORE = 66,    // HermitCore Unikernel/Multikernel
   ELFOSABI_ARM = 97,           // ARM
   ELFOSABI_C6000_ELFABI = 64,  // Bare-metal TMS320C6000
   ELFOSABI_C6000_LINUX = 65,   // Linux TMS320C6000

include/llvm/MC/MCELFObjectWriter.h

@@ -74,7 +74,7 @@ class MCELFObjectTargetWriter : public MCObjectTargetWriter {
       case Triple::CloudABI:
         return ELF::ELFOSABI_CLOUDABI;
       case Triple::HermitCore:
-        return ELF::ELFOSABI_HERMITCORE;
+        return ELF::ELFOSABI_STANDALONE;
       case Triple::PS4:
       case Triple::FreeBSD:
         return ELF::ELFOSABI_FREEBSD;

tools/llvm-readobj/ELFDumper.cpp

@@ -868,7 +868,6 @@ static const EnumEntry<unsigned> ElfOSABI[] = {
   {"AROS",         "AROS",                 ELF::ELFOSABI_AROS},
   {"FenixOS",      "FenixOS",              ELF::ELFOSABI_FENIXOS},
   {"CloudABI",     "CloudABI",             ELF::ELFOSABI_CLOUDABI},
-  {"HermitCore",   "HermitCore",           ELF::ELFOSABI_HERMITCORE},
   {"Standalone",   "Standalone App",       ELF::ELFOSABI_STANDALONE}
 };