Use ELFOSABI_NONE instead of ELFOSABI_LINUX.

The doesn't seem to be a difference and ELFOSABI_NONE seems to be far more
common:

* Linux doesn't care when loading and puts ELFOSABI_NONE on core dumps.
* Gold and bfd ld produce files with ELFOSABI_NONE.
* Gold and bfd ld seems to ignore EI_OSABI other than for freebsd.
* Gas puts ELFOSABI_NONE in most .o files.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@248534 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/MCELFObjectWriter.h b/include/llvm/MC/MCELFObjectWriter.h
index 01f694d3b75639b3ae575a07dc677f3c694e8860..193dac018b2b9d52aacc40cc883a72799b40ccbb 100644 (file)
--- a/include/llvm/MC/MCELFObjectWriter.h
+++ b/include/llvm/MC/MCELFObjectWriter.h
@@ -57,8 +57,6 @@ public:
       case Triple::PS4:
       case Triple::FreeBSD:
         return ELF::ELFOSABI_FREEBSD;
-      case Triple::Linux:
-        return ELF::ELFOSABI_LINUX;
       default:
         return ELF::ELFOSABI_NONE;
     }

diff --git a/test/MC/AArch64/elf_osabi_flags.s b/test/MC/AArch64/elf_osabi_flags.s
index 68cb385fc9911686bd8972297c6fad1c668c5d53..0e683ee806c22815626234af059bdadce693f5bc 100644 (file)
--- a/test/MC/AArch64/elf_osabi_flags.s
+++ b/test/MC/AArch64/elf_osabi_flags.s
@@ -1,5 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple aarch64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=AARCH64-OSABI %s
-# AARCH64-OSABI: OS/ABI: SystemV (0x0)
+# RUN: llvm-mc -filetype=obj -triple aarch64 %s -o -| llvm-readobj -h | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple aarch64-linux-gnu %s -o -| llvm-readobj -h | FileCheck %s
 
-# RUN: llvm-mc -filetype=obj -triple aarch64-linux-gnu %s -o -| llvm-readobj -h | FileCheck --check-prefix=AARCH64-LINUX-OSABI %s
-# AARCH64-LINUX-OSABI: OS/ABI: GNU/Linux (0x3)
+# CHECK: OS/ABI: SystemV (0x0)

diff --git a/test/MC/Mips/elf_basic.s b/test/MC/Mips/elf_basic.s
index 6c1e7690126ddabb2af3b9d6e2d229271446f2ff..4739247f67fac61ff83beec136e5d5e03b08320a 100644 (file)
--- a/test/MC/Mips/elf_basic.s
+++ b/test/MC/Mips/elf_basic.s
@@ -36,6 +36,6 @@
 // CHECK-LE64:   Ident {
 // CHECK-LE64:     Class: 64-bit
 // CHECK-LE64:     DataEncoding: LittleEndian
-// CHECK-LE64:     OS/ABI: GNU/Linux
+// CHECK-LE64:     OS/ABI: SystemV
 // CHECK-LE64:   }
 // CHECK-LE64: }