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

Ericson2314 · web-flow · commit 58efe298e156 · 2024-07-11T17:23:05.000-04:00
This reverts commit 6bc6f6b.
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ class MCELFObjectTargetWriter : public MCObjectTargetWriter {`
`78`	`78`	`return ELF::ELFOSABI_FREEBSD;`
`79`	`79`	`case Triple::Solaris:`
`80`	`80`	`return ELF::ELFOSABI_SOLARIS;`
`81`		`- case Triple::OpenBSD:`
`82`		`- return ELF::ELFOSABI_OPENBSD;`
`83`	`81`	`default:`
`84`	`82`	`return ELF::ELFOSABI_NONE;`
`85`	`83`	`}`