[llvm-branch-commits] [lld] 58efe29 - Revert "[MC] set OpenBSD's ELFOSABI by default (#98158) (#98553)"

[via llvm-branch-commits]

Author: John Ericson
Date: 2024-07-11T17:23:05-04:00
New Revision: 58efe298e1561d7b22fb80360b075a7c8ab6e968

URL: https://github.com/llvm/llvm-project/commit/58efe298e1561d7b22fb80360b075a7c8ab6e968
DIFF: https://github.com/llvm/llvm-project/commit/58efe298e1561d7b22fb80360b075a7c8ab6e968.diff

LOG: Revert "[MC] set OpenBSD's ELFOSABI by default (#98158) (#98553)"

This reverts commit 6bc6f6b0fa8724ac2e6d9d025084a393d4d15694.

Added: 
    

Modified: 
    lld/test/ELF/basic-sparcv9.s
    llvm/include/llvm/MC/MCELFObjectWriter.h
    llvm/test/MC/ELF/osabi.s

Removed: 
    


################################################################################
diff  --git a/lld/test/ELF/basic-sparcv9.s b/lld/test/ELF/basic-sparcv9.s
index b2f760f21ab05..af63dc47ae84e 100644
--- a/lld/test/ELF/basic-sparcv9.s
+++ b/lld/test/ELF/basic-sparcv9.s
@@ -17,7 +17,7 @@ _start:
 # CHECK-NEXT:     Class: 64-bit (0x2)
 # CHECK-NEXT:     DataEncoding: BigEndian (0x2)
 # CHECK-NEXT:     FileVersion: 1
-# CHECK-NEXT:     OS/ABI: OpenBSD (0x0)
+# CHECK-NEXT:     OS/ABI: SystemV (0x0)
 # CHECK-NEXT:     ABIVersion: 0
 # CHECK-NEXT:     Unused: (00 00 00 00 00 00 00)
 # CHECK-NEXT:   }

diff  --git a/llvm/include/llvm/MC/MCELFObjectWriter.h b/llvm/include/llvm/MC/MCELFObjectWriter.h
index 12237094ad86a..d7c223cdcc07f 100644
--- a/llvm/include/llvm/MC/MCELFObjectWriter.h
+++ b/llvm/include/llvm/MC/MCELFObjectWriter.h
@@ -78,8 +78,6 @@ class MCELFObjectTargetWriter : public MCObjectTargetWriter {
         return ELF::ELFOSABI_FREEBSD;
       case Triple::Solaris:
         return ELF::ELFOSABI_SOLARIS;
-      case Triple::OpenBSD:
-        return ELF::ELFOSABI_OPENBSD;
       default:
         return ELF::ELFOSABI_NONE;
     }

diff  --git a/llvm/test/MC/ELF/osabi.s b/llvm/test/MC/ELF/osabi.s
index 44912f4987c11..dc6ad2a349d75 100644
--- a/llvm/test/MC/ELF/osabi.s
+++ b/llvm/test/MC/ELF/osabi.s
@@ -10,7 +10,3 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s | llvm-readobj -h - | \
 # RUN:   FileCheck %s --check-prefix=FREEBSD
 # FREEBSD: OS/ABI: FreeBSD
-
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-openbsd %s | llvm-readobj -h - | \
-# RUN:   FileCheck %s --check-prefix=OPENBSD
-# OPENBSD: OS/ABI: OpenBSD