[lld] r345604 - [PPC64] Handle powerpc64 in OUTPUT_FORMAT.

[Sean Fertile via llvm-commits]

Author: sfertile
Date: Tue Oct 30 07:37:17 2018
New Revision: 345604

URL: http://llvm.org/viewvc/llvm-project?rev=345604&view=rev
Log:
[PPC64] Handle powerpc64 in OUTPUT_FORMAT.

Differential Revision: https://reviews.llvm.org/D53652

Modified:
    lld/trunk/ELF/ScriptParser.cpp
    lld/trunk/test/ELF/emulation-ppc.s

Modified: lld/trunk/ELF/ScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/ScriptParser.cpp?rev=345604&r1=345603&r2=345604&view=diff
==============================================================================
--- lld/trunk/ELF/ScriptParser.cpp (original)
+++ lld/trunk/ELF/ScriptParser.cpp Tue Oct 30 07:37:17 2018
@@ -395,6 +395,10 @@ std::pair<ELFKind, uint16_t> ScriptParse
     return {ELF32LEKind, EM_X86_64};
   if (S == "elf64-littleaarch64")
     return {ELF64LEKind, EM_AARCH64};
+  if (S == "elf64-powerpc")
+    return {ELF64BEKind, EM_PPC64};
+  if (S == "elf64-powerpcle")
+    return {ELF64LEKind, EM_PPC64};
   if (S == "elf64-x86-64")
     return {ELF64LEKind, EM_X86_64};
 

Modified: lld/trunk/test/ELF/emulation-ppc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-ppc.s?rev=345604&r1=345603&r2=345604&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation-ppc.s (original)
+++ lld/trunk/test/ELF/emulation-ppc.s Tue Oct 30 07:37:17 2018
@@ -4,6 +4,10 @@
 # RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
 # RUN: ld.lld %tppc64 -o %t3ppc64
 # RUN: llvm-readobj -file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: echo 'OUTPUT_FORMAT(elf64-powerpc)' > %tppc64.script
+# RUN: ld.lld %tppc64.script  %tppc64 -o %t4ppc64
+# RUN: llvm-readobj -file-headers %t4ppc64 | FileCheck --check-prefix=PPC64 %s
+
 # PPC64:      ElfHeader {
 # PPC64-NEXT:   Ident {
 # PPC64-NEXT:     Magic: (7F 45 4C 46)
@@ -36,6 +40,10 @@
 # RUN: llvm-readobj -file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s
 # RUN: ld.lld %tppc64le -o %t3ppc64le
 # RUN: llvm-readobj -file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: echo 'OUTPUT_FORMAT(elf64-powerpcle)' > %tppc64le.script
+# RUN: ld.lld %tppc64le.script  %tppc64le -o %t4ppc64le
+# RUN: llvm-readobj -file-headers %t4ppc64le | FileCheck --check-prefix=PPC64LE %s
+
 # PPC64LE:      ElfHeader {
 # PPC64LE-NEXT:   Ident {
 # PPC64LE-NEXT:     Magic: (7F 45 4C 46)