Index: ELF/Config.h
===================================================================
--- ELF/Config.h
+++ ELF/Config.h
@@ -11,17 +11,32 @@
 #define LLD_ELF_CONFIG_H
 
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Object/ELF.h"
+#include <cstdint>
 
 namespace lld {
 namespace elf2 {
 
+enum ELFKind { ELF32LEKind, ELF32BEKind, ELF64LEKind, ELF64BEKind };
+
 struct Configuration {
+  bool Is64Bits() const {
+    return TargetELFKind == ELF64BEKind || TargetELFKind == ELF64LEKind;
+  }
+  bool IsBE() const {
+    return TargetELFKind == ELF64BEKind || TargetELFKind == ELF32BEKind;
+  }
+
   llvm::StringRef OutputFile;
   llvm::StringRef DynamicLinker;
   std::string RPath;
   bool Shared = false;
   bool DiscardAll = false;
   bool DiscardLocals = false;
+
+  // FIXME: Conditionally depends on host machine.
+  ELFKind TargetELFKind = ELF64LEKind;
+  uint16_t TargetEMachine = llvm::ELF::EM_X86_64;
 };
 
 extern Configuration *Config;
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -15,6 +15,7 @@
 #include "Writer.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/Object/ELF.h"
 #include "llvm/Support/FileSystem.h"
 
 using namespace llvm;
@@ -35,6 +36,23 @@
 }
 }
 
+namespace {
+using namespace ELF;
+
+struct Emulation {
+  const char *Name;
+  ELFKind TargetELFKind;
+  uint16_t TargetEMachine;
+};
+
+static const Emulation Emulations[] = {
+    {"elf_x86_64", ELF64LEKind, EM_X86_64},
+    {"elf_i386", ELF32LEKind, EM_386},
+    {"elf64ppc", ELF64BEKind, EM_PPC64},
+    {"elf32ppc", ELF32BEKind, EM_PPC},
+};
+}
+
 // Opens a file. Path has to be resolved already.
 // Newly created memory buffers are owned by this driver.
 MemoryBufferRef LinkerDriver::openFile(StringRef Path) {
@@ -46,6 +64,30 @@
   return MBRef;
 }
 
+static uint16_t getElfMachineType(StringRef Object, bool IsBE) {
+  using namespace object;
+
+  // First three fields of 32-bit and 64-bit ELF headers are of equal
+  // size, so no matter which one to use, but care about endianness.
+  if (Object.size() < (ELF::EI_NIDENT + 2 * sizeof(ELF::Elf32_Half)))
+    return ELF::EM_NONE;
+  if (IsBE)
+    return ((const Elf_Ehdr_Impl<ELF32BE> *)Object.data())->e_machine;
+  else
+    return ((const Elf_Ehdr_Impl<ELF32LE> *)Object.data())->e_machine;
+}
+
+template <template <class> class T>
+static std::unique_ptr<InputFile> createTargetELFFile(MemoryBufferRef MB) {
+  std::unique_ptr<ELFFileBase> f = createELFFile<T>(MB);
+  if (f->getELFKind() != Config->TargetELFKind ||
+      getElfMachineType(MB.getBuffer(), Config->IsBE()) !=
+          Config->TargetEMachine)
+    error(Twine(MB.getBufferIdentifier() +
+                " is incompatible with target architecture"));
+  return f;
+}
+
 static std::unique_ptr<InputFile> createFile(MemoryBufferRef MB) {
   using namespace llvm::sys::fs;
   file_magic Magic = identify_magic(MB.getBuffer());
@@ -54,9 +96,20 @@
     return make_unique<ArchiveFile>(MB);
 
   if (Magic == file_magic::elf_shared_object)
-    return createELFFile<SharedFile>(MB);
+    return createTargetELFFile<SharedFile>(MB);
 
-  return createELFFile<ObjectFile>(MB);
+  return createTargetELFFile<ObjectFile>(MB);
+}
+
+static void applyEmulation(StringRef Emul) {
+  for (auto E : Emulations) {
+    if (Emul == E.Name) {
+      Config->TargetELFKind = E.TargetELFKind;
+      Config->TargetEMachine = E.TargetEMachine;
+      return;
+    }
+  }
+  error(Twine("unknown emulation: ") + Emul);
 }
 
 void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
@@ -88,6 +141,10 @@
   if (Args.hasArg(OPT_discard_locals))
     Config->DiscardLocals = true;
 
+  // Handle -m emulation
+  if (auto *Arg = Args.getLastArg(OPT_m))
+    applyEmulation(Arg->getValue());
+
   // Create a list of input files.
   std::vector<MemoryBufferRef> Inputs;
 
@@ -110,8 +167,7 @@
   }
 
   // Write the result.
-  const ELFFileBase *FirstObj = Symtab.getFirstELF();
-  switch (FirstObj->getELFKind()) {
+  switch (Config->TargetELFKind) {
   case ELF32LEKind:
     writeResult<object::ELF32LE>(&Symtab);
     return;
Index: ELF/InputFiles.h
===================================================================
--- ELF/InputFiles.h
+++ ELF/InputFiles.h
@@ -10,6 +10,7 @@
 #ifndef LLD_ELF_INPUT_FILES_H
 #define LLD_ELF_INPUT_FILES_H
 
+#include "Config.h"
 #include "InputSection.h"
 #include "Error.h"
 #include "Symbols.h"
@@ -48,8 +49,6 @@
   const Kind FileKind;
 };
 
-enum ELFKind { ELF32LEKind, ELF32BEKind, ELF64LEKind, ELF64BEKind };
-
 class ELFFileBase : public InputFile {
 public:
   explicit ELFFileBase(Kind K, ELFKind EKind, MemoryBufferRef M)
@@ -59,7 +58,6 @@
     return K == ObjectKind || K == SharedKind;
   }
 
-  bool isCompatibleWith(const ELFFileBase &Other) const;
   ELFKind getELFKind() const { return EKind; }
 
 protected:
@@ -100,8 +98,6 @@
 
   llvm::object::ELFFile<ELFT> *getObj() const { return ELFObj.get(); }
 
-  uint16_t getEMachine() const { return getObj()->getHeader()->e_machine; }
-
   StringRef getStringTable() const { return StringTable; }
 
 protected:
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -20,33 +20,6 @@
 using namespace lld;
 using namespace lld::elf2;
 
-template <class ELFT> static uint16_t getEMachine(const ELFFileBase &B) {
-  bool IsShared = isa<SharedFileBase>(B);
-  if (IsShared)
-    return cast<SharedFile<ELFT>>(B).getEMachine();
-  return cast<ObjectFile<ELFT>>(B).getEMachine();
-}
-
-static uint16_t getEMachine(const ELFFileBase &B) {
-  ELFKind K = B.getELFKind();
-  switch (K) {
-  case ELF32BEKind:
-    return getEMachine<ELF32BE>(B);
-  case ELF32LEKind:
-    return getEMachine<ELF32LE>(B);
-  case ELF64BEKind:
-    return getEMachine<ELF64BE>(B);
-  case ELF64LEKind:
-    return getEMachine<ELF64LE>(B);
-  }
-  llvm_unreachable("Invalid kind");
-}
-
-bool ELFFileBase::isCompatibleWith(const ELFFileBase &Other) const {
-  return getELFKind() == Other.getELFKind() &&
-         getEMachine(*this) == getEMachine(Other);
-}
-
 template <class ELFT> void ELFData<ELFT>::openELF(MemoryBufferRef MB) {
   // Parse a memory buffer as a ELF file.
   std::error_code EC;
Index: ELF/Options.td
===================================================================
--- ELF/Options.td
+++ ELF/Options.td
@@ -27,3 +27,6 @@
 
 def alias_discard_locals: Flag<["-"], "X">,
      Alias<discard_locals>;
+
+def m : Separate<["-"], "m">,
+     HelpText<"Set target emulation">;
Index: ELF/SymbolTable.h
===================================================================
--- ELF/SymbolTable.h
+++ ELF/SymbolTable.h
@@ -33,14 +33,6 @@
 
   void addFile(std::unique_ptr<InputFile> File);
 
-  const ELFFileBase *getFirstELF() const {
-    if (!ObjectFiles.empty())
-      return ObjectFiles[0].get();
-    if (!SharedFiles.empty())
-      return SharedFiles[0].get();
-    return nullptr;
-  }
-
   bool shouldUseRela() const;
 
   const llvm::MapVector<StringRef, Symbol *> &getSymbols() const {
Index: ELF/SymbolTable.cpp
===================================================================
--- ELF/SymbolTable.cpp
+++ ELF/SymbolTable.cpp
@@ -21,8 +21,7 @@
 SymbolTable::SymbolTable() {}
 
 bool SymbolTable::shouldUseRela() const {
-  ELFKind K = getFirstELF()->getELFKind();
-  return K == ELF64LEKind || K == ELF64BEKind;
+  return Config->Is64Bits();
 }
 
 void SymbolTable::addFile(std::unique_ptr<InputFile> File) {
@@ -45,12 +44,9 @@
 }
 
 template <class ELFT> void SymbolTable::addELFFile(ELFFileBase *File) {
-  if (const ELFFileBase *Old = getFirstELF()) {
-    if (!Old->isCompatibleWith(*File))
-      error(Twine(Old->getName() + " is incompatible with " + File->getName()));
-  } else {
+  // Initialize before the first file is added.
+  if (ObjectFiles.empty() && SharedFiles.empty())
     init<ELFT>();
-  }
 
   if (auto *O = dyn_cast<ObjectFileBase>(File)) {
     ObjectFiles.emplace_back(O);
Index: ELF/Writer.cpp
===================================================================
--- ELF/Writer.cpp
+++ ELF/Writer.cpp
@@ -487,8 +487,7 @@
   const SymbolTable &Symtab = SymTabSec.getSymTable();
 
   EHdr->e_type = Config->Shared ? ET_DYN : ET_EXEC;
-  auto &FirstObj = cast<ObjectFile<ELFT>>(*Symtab.getFirstELF());
-  EHdr->e_machine = FirstObj.getEMachine();
+  EHdr->e_machine = Config->TargetEMachine;
   EHdr->e_version = EV_CURRENT;
   SymbolBody *Entry = Symtab.getEntrySym();
   EHdr->e_entry = Entry ? getSymVA(cast<DefinedRegular<ELFT>>(Entry)) : 0;
Index: test/elf2/archive.s
===================================================================
--- test/elf2/archive.s
+++ test/elf2/archive.s
@@ -1,7 +1,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/archive.s -o %t2
 # RUN: llvm-ar rcs %tar %t2
-# RUN: lld -flavor gnu2 %t %tar -o %tout
+# RUN: lld -flavor gnu2 -m elf_x86_64 %t %tar -o %tout
 # RUN: llvm-nm %tout | FileCheck %s
 # REQUIRES: x86
 
Index: test/elf2/basic.s
===================================================================
--- test/elf2/basic.s
+++ test/elf2/basic.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: lld -flavor gnu2 %t -o %t2
+# RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
 # RUN:   | FileCheck %s
 # REQUIRES: x86
@@ -176,27 +176,30 @@
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
-# RUN: not lld -flavor gnu2 %t 2>&1 | FileCheck --check-prefix=NO_O %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t 2>&1 | FileCheck --check-prefix=NO_O %s
 # NO_O: -o must be specified.
 
-# RUN: not lld -flavor gnu2 %t.foo -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t.foo -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=MISSING %s
 # MISSING: cannot open {{.*}}.foo: {{[Nn]}}o such file or directory
 
-# RUN: not lld -flavor gnu2 -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 -m elf_x86_64 -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=NO_INPUT %s
 # NO_INPUT: no input files.
 
-# RUN: not lld -flavor gnu2 %t.no.such.file -o %t2 2>&1 | \
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t.no.such.file -o %t2 2>&1 | \
 # RUN:  FileCheck --check-prefix=CANNOT_OPEN %s
 # CANNOT_OPEN: cannot open {{.*}}.no.such.file: {{[Nn]}}o such file or directory
 
-# RUN: not lld -flavor gnu2 %t -o 2>&1 | FileCheck --check-prefix=NO_O_VAL %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t -o 2>&1 | FileCheck --check-prefix=NO_O_VAL %s
 # NO_O_VAL: missing arg value for "-o", expected 1 argument.
 
-# RUN: not lld -flavor gnu2 --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s
 # UNKNOWN: unknown argument: --foo
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not lld -flavor gnu2 %t %t -o %t2 2>&1 | FileCheck --check-prefix=DUP %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t %t -o %t2 2>&1 | FileCheck --check-prefix=DUP %s
 # DUP: duplicate symbol: _start
+
+# RUN: not lld -flavor gnu2 %t -o %t -m wrong_emul 2>&1 | FileCheck --check-prefix=UNKNOWN_EMUL %s
+# UNKNOWN_EMUL: unknown emulation: wrong_emul
Index: test/elf2/basic32.s
===================================================================
--- test/elf2/basic32.s
+++ test/elf2/basic32.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t
-# RUN: lld -flavor gnu2 %t -o %t2
+# RUN: lld -flavor gnu2 -m elf_i386 %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
 # REQUIRES: x86
 
Index: test/elf2/basic32be.s
===================================================================
--- test/elf2/basic32be.s
+++ test/elf2/basic32be.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux %s -o %t
-# RUN: lld -flavor gnu2 %t -o %t2
+# RUN: lld -flavor gnu2 -m elf32ppc %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
 # REQUIRES: ppc
 
Index: test/elf2/basic64be.s
===================================================================
--- test/elf2/basic64be.s
+++ test/elf2/basic64be.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: lld -flavor gnu2 -discard-all %t -o %t2
+# RUN: lld -flavor gnu2 -m elf64ppc -discard-all %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
 # REQUIRES: ppc
 
Index: test/elf2/bss.s
===================================================================
--- test/elf2/bss.s
+++ test/elf2/bss.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-readobj -sections %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/common.s
===================================================================
--- test/elf2/common.s
+++ test/elf2/common.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2
-// RUN: lld -flavor gnu2 %t %t2 -o %t3
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t %t2 -o %t3
 // RUN: llvm-readobj -t -s %t3 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/discard-locals.s
===================================================================
--- test/elf2/discard-locals.s
+++ test/elf2/discard-locals.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
-// RUN: lld -flavor gnu2 -discard-locals %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 -discard-locals %t -o %t2
 // RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/dynamic-reloc-index.s
===================================================================
--- test/elf2/dynamic-reloc-index.s
+++ test/elf2/dynamic-reloc-index.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: lld -flavor gnu2 -shared %t2.o -o %t2.so
-// RUN: lld -flavor gnu2 %t.o %t2.so -o %t
+// RUN: lld -flavor gnu2 -m elf_x86_64 -shared %t2.o -o %t2.so
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t.o %t2.so -o %t
 // RUN: llvm-readobj -r %t | FileCheck %s
 
 // We used to record the wrong symbol index for this test
Index: test/elf2/dynamic-reloc.s
===================================================================
--- test/elf2/dynamic-reloc.s
+++ test/elf2/dynamic-reloc.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: lld -flavor gnu2 -shared %t2.o -o %t2.so
-// RUN: lld -flavor gnu2 %t.o %t2.so -o %t
+// RUN: lld -flavor gnu2 -m elf_x86_64 -shared %t2.o -o %t2.so
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t.o %t2.so -o %t
 // RUN: llvm-readobj -dynamic-table -r --expand-relocs -s %t | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/emulation.s
===================================================================
--- /dev/null
+++ test/elf2/emulation.s
@@ -0,0 +1,120 @@
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %tx64
+# RUN: lld -flavor gnu2 -m elf_x86_64 %tx64 -o %t2x64
+# RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=X86-64 %s
+# X86-64:      ElfHeader {
+# X86-64-NEXT:   Ident {
+# X86-64-NEXT:     Magic: (7F 45 4C 46)
+# X86-64-NEXT:     Class: 64-bit (0x2)
+# X86-64-NEXT:     DataEncoding: LittleEndian (0x1)
+# X86-64-NEXT:     FileVersion: 1
+# X86-64-NEXT:     OS/ABI: SystemV (0x0)
+# X86-64-NEXT:     ABIVersion: 0
+# X86-64-NEXT:     Unused: (00 00 00 00 00 00 00)
+# X86-64-NEXT:   }
+# X86-64-NEXT:   Type: Executable (0x2)
+# X86-64-NEXT:   Machine: EM_X86_64 (0x3E)
+# X86-64-NEXT:   Version: 1
+# X86-64-NEXT:   Entry: 0x11000
+# X86-64-NEXT:   ProgramHeaderOffset: 0x40
+# X86-64-NEXT:   SectionHeaderOffset: 0x1060
+# X86-64-NEXT:   Flags [ (0x0)
+# X86-64-NEXT:   ]
+# X86-64-NEXT:   HeaderSize: 64
+# X86-64-NEXT:   ProgramHeaderEntrySize: 56
+# X86-64-NEXT:   ProgramHeaderCount: 1
+# X86-64-NEXT:   SectionHeaderEntrySize: 64
+# X86-64-NEXT:   SectionHeaderCount: 6
+# X86-64-NEXT:    StringTableSectionIndex: 5
+# X86-64-NEXT: }
+
+# RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tx86
+# RUN: lld -flavor gnu2 -m elf_i386 %tx86 -o %t2x86
+# RUN: llvm-readobj -file-headers %t2x86 | FileCheck --check-prefix=X86 %s
+# X86:      ElfHeader {
+# X86-NEXT:   Ident {
+# X86-NEXT:     Magic: (7F 45 4C 46)
+# X86-NEXT:     Class: 32-bit (0x1)
+# X86-NEXT:     DataEncoding: LittleEndian (0x1)
+# X86-NEXT:     FileVersion: 1
+# X86-NEXT:     OS/ABI: SystemV (0x0)
+# X86-NEXT:     ABIVersion: 0
+# X86-NEXT:     Unused: (00 00 00 00 00 00 00)
+# X86-NEXT:   }
+# X86-NEXT:   Type: Executable (0x2)
+# X86-NEXT:   Machine: EM_386 (0x3)
+# X86-NEXT:   Version: 1
+# X86-NEXT:   Entry: 0x11000
+# X86-NEXT:   ProgramHeaderOffset: 0x34
+# X86-NEXT:   SectionHeaderOffset: 0x104C
+# X86-NEXT:   Flags [ (0x0)
+# X86-NEXT:   ]
+# X86-NEXT:   HeaderSize: 52
+# X86-NEXT:   ProgramHeaderEntrySize: 32
+# X86-NEXT:   ProgramHeaderCount: 1
+# X86-NEXT:   SectionHeaderEntrySize: 40
+# X86-NEXT:   SectionHeaderCount: 6
+# X86-NEXT:    StringTableSectionIndex: 5
+# X86-NEXT: }
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %tppc64
+# RUN: lld -flavor gnu2 -m elf64ppc %tppc64 -o %t2ppc64
+# RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
+# PPC64:      ElfHeader {
+# PPC64-NEXT:   Ident {
+# PPC64-NEXT:     Magic: (7F 45 4C 46)
+# PPC64-NEXT:     Class: 64-bit (0x2)
+# PPC64-NEXT:     DataEncoding: BigEndian (0x2)
+# PPC64-NEXT:     FileVersion: 1
+# PPC64-NEXT:     OS/ABI: SystemV (0x0)
+# PPC64-NEXT:     ABIVersion: 0
+# PPC64-NEXT:     Unused: (00 00 00 00 00 00 00)
+# PPC64-NEXT:   }
+# PPC64-NEXT:   Type: Executable (0x2)
+# PPC64-NEXT:   Machine: EM_PPC64 (0x15)
+# PPC64-NEXT:   Version: 1
+# PPC64-NEXT:   Entry: 0x11000
+# PPC64-NEXT:   ProgramHeaderOffset: 0x40
+# PPC64-NEXT:   SectionHeaderOffset: 0x1060
+# PPC64-NEXT:   Flags [ (0x0)
+# PPC64-NEXT:   ]
+# PPC64-NEXT:   HeaderSize: 64
+# PPC64-NEXT:   ProgramHeaderEntrySize: 56
+# PPC64-NEXT:   ProgramHeaderCount: 1
+# PPC64-NEXT:   SectionHeaderEntrySize: 64
+# PPC64-NEXT:   SectionHeaderCount: 6
+# PPC64-NEXT:    StringTableSectionIndex: 5
+# PPC64-NEXT: }
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux %s -o %tppc
+# RUN: lld -flavor gnu2 -m elf32ppc %tppc -o %t2ppc
+# RUN: llvm-readobj -file-headers %t2ppc | FileCheck --check-prefix=PPC %s
+# PPC:      ElfHeader {
+# PPC-NEXT:   Ident {
+# PPC-NEXT:     Magic: (7F 45 4C 46)
+# PPC-NEXT:     Class: 32-bit (0x1)
+# PPC-NEXT:     DataEncoding: BigEndian (0x2)
+# PPC-NEXT:     FileVersion: 1
+# PPC-NEXT:     OS/ABI: SystemV (0x0)
+# PPC-NEXT:     ABIVersion: 0
+# PPC-NEXT:     Unused: (00 00 00 00 00 00 00)
+# PPC-NEXT:   }
+# PPC-NEXT:   Type: Executable (0x2)
+# PPC-NEXT:   Machine: EM_PPC (0x14)
+# PPC-NEXT:   Version: 1
+# PPC-NEXT:   Entry: 0x11000
+# PPC-NEXT:   ProgramHeaderOffset: 0x34
+# PPC-NEXT:   SectionHeaderOffset: 0x104C
+# PPC-NEXT:   Flags [ (0x0)
+# PPC-NEXT:   ]
+# PPC-NEXT:   HeaderSize: 52
+# PPC-NEXT:   ProgramHeaderEntrySize: 32
+# PPC-NEXT:   ProgramHeaderCount: 1
+# PPC-NEXT:   SectionHeaderEntrySize: 40
+# PPC-NEXT:   SectionHeaderCount: 6
+# PPC-NEXT:    StringTableSectionIndex: 5
+# PPC-NEXT: }
+
+# REQUIRES: x86,ppc
+
+.globl _start;
+_start:
Index: test/elf2/got.s
===================================================================
--- test/elf2/got.s
+++ test/elf2/got.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: lld -flavor gnu2 -shared %t2.o -o %t2.so
-// RUN: lld -flavor gnu2 %t.o %t2.so -o %t
+// RUN: lld -flavor gnu2 -m elf_x86_64 -shared %t2.o -o %t2.so
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86
Index: test/elf2/incompatible.s
===================================================================
--- test/elf2/incompatible.s
+++ test/elf2/incompatible.s
@@ -1,26 +1,34 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %ta.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tb.o
-// RUN: lld -flavor gnu2 -shared %tb.o -o %ti686.so
+// RUN: lld -flavor gnu2 -m elf_i386 -shared %tb.o -o %ti686.so
 // RUN: llvm-mc -filetype=obj -triple=arm-unknown-linux %s -o %tc.o
 
-// RUN: not lld -flavor gnu2 %ta.o %tb.o -o %t 2>&1 | \
-// RUN:   FileCheck --check-prefix=A-AND-B %s
-// A-AND-B: a.o is incompatible with {{.*}}b.o
+// RUN: not lld -flavor gnu2 -m elf64ppc %ta.o -o %t 2>&1 | \
+// RUN:   FileCheck --check-prefix=A-ONLY %s
+// A-ONLY: a.o is incompatible with target architecture
 
-// RUN: not lld -flavor gnu2 %tb.o %tc.o -o %t 2>&1 | \
-// RUN:   FileCheck --check-prefix=B-AND-C %s
-// B-AND-C: b.o is incompatible with {{.*}}c.o
+// RUN: not lld -flavor gnu2 -m elf64ppc %tb.o -o %t 2>&1 | \
+// RUN:   FileCheck --check-prefix=B-ONLY %s
+// B-ONLY: b.o is incompatible with target architecture
 
-// RUN: not lld -flavor gnu2 %ta.o %ti686.so -o %t 2>&1 | \
-// RUN:   FileCheck --check-prefix=A-AND-SO %s
-// A-AND-SO: a.o is incompatible with {{.*}}i686.so
+// RUN: not lld -flavor gnu2 -m elf64ppc %tc.o -o %t 2>&1 | \
+// RUN:   FileCheck --check-prefix=C-ONLY %s
+// C-ONLY: c.o is incompatible with target architecture
 
-// RUN: not lld -flavor gnu2 %tc.o %ti686.so -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf64ppc %tc.o %ti686.so -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=C-AND-SO %s
-// C-AND-SO: c.o is incompatible with {{.*}}i686.so
+// C-AND-SO: c.o is incompatible with target architecture
 
-// RUN: not lld -flavor gnu2 %ti686.so %tc.o -o %t 2>&1 | \
+// RUN: not lld -flavor gnu2 -m elf_i386 %tc.o %ti686.so -o %t 2>&1 | \
+// RUN:   FileCheck --check-prefix=C-AND-SO-I386 %s
+// C-AND-SO-I386: c.o is incompatible with target architecture
+
+// RUN: not lld -flavor gnu2 -m elf64ppc %ti686.so %tc.o -o %t 2>&1 | \
 // RUN:   FileCheck --check-prefix=SO-AND-C %s
-// SO-AND-C: i686.so is incompatible with {{.*}}c.o
+// SO-AND-C: i686.so is incompatible with target architecture
+
+// RUN: not lld -flavor gnu2 -m elf_i386 %ti686.so %tc.o -o %t 2>&1 | \
+// RUN:   FileCheck --check-prefix=SO-AND-C-I386 %s
+// SO-AND-C-I386: c.o is incompatible with target architecture
 
 // REQUIRES: x86,arm
Index: test/elf2/invalid-elf.test
===================================================================
--- test/elf2/invalid-elf.test
+++ test/elf2/invalid-elf.test
@@ -1,19 +1,19 @@
-RUN: not lld -flavor gnu2 %p/Inputs/invalid-data-encoding.elf -o %t2 2>&1 | \
+RUN: not lld -flavor gnu2 -m elf_x86_64 %p/Inputs/invalid-data-encoding.elf -o %t2 2>&1 | \
 RUN:   FileCheck --check-prefix=INVALID-DATA-ENC %s
 INVALID-DATA-ENC: Invalid data encoding
 
-RUN: not lld -flavor gnu2 %p/Inputs/invalid-file-class.elf -o %t2 2>&1 | \
+RUN: not lld -flavor gnu2 -m elf_x86_64 %p/Inputs/invalid-file-class.elf -o %t2 2>&1 | \
 RUN:   FileCheck --check-prefix=INVALID-FILE-CLASS %s
 INVALID-FILE-CLASS: Invalid file class
 
-RUN: not lld -flavor gnu2 %p/Inputs/invalid-symtab-sh_info.elf -o %t2 2>&1 | \
+RUN: not lld -flavor gnu2 -m elf_x86_64 %p/Inputs/invalid-symtab-sh_info.elf -o %t2 2>&1 | \
 RUN:   FileCheck --check-prefix=INVALID-SYMTAB-SHINFO %s
 INVALID-SYMTAB-SHINFO: Invalid sh_info in symbol table
 
-RUN: not lld -flavor gnu2 %p/Inputs/invalid-binding.elf -o %t2 2>&1 | \
+RUN: not lld -flavor gnu2 -m elf_x86_64 %p/Inputs/invalid-binding.elf -o %t2 2>&1 | \
 RUN:   FileCheck --check-prefix=INVALID-BINDING %s
 INVALID-BINDING: unexpected binding
 
-RUN: not lld -flavor gnu2 %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \
+RUN: not lld -flavor gnu2 -m elf_x86_64 %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \
 RUN:   FileCheck --check-prefix=INVALID-SECTION-INDEX %s
 INVALID-SECTION-INDEX: Invalid section index
Index: test/elf2/invalid-relocations.test
===================================================================
--- test/elf2/invalid-relocations.test
+++ test/elf2/invalid-relocations.test
@@ -1,5 +1,5 @@
 # RUN: yaml2obj -format elf %s -o %t
-# RUN: not lld -flavor gnu2 %t -o %tout 2>&1 | FileCheck %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t -o %tout 2>&1 | FileCheck %s
 
 FileHeader:
   Class:           ELFCLASS64
Index: test/elf2/local-dynamic.s
===================================================================
--- test/elf2/local-dynamic.s
+++ test/elf2/local-dynamic.s
@@ -1,6 +1,6 @@
 // Check that local symbols are not inserted into dynamic table.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -shared -o %t1.so
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -shared -o %t1.so
 // RUN: llvm-readobj -t -dyn-symbols %t1.so | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/local.s
===================================================================
--- test/elf2/local.s
+++ test/elf2/local.s
@@ -1,6 +1,6 @@
 // Check that symbol table is correctly populated with local symbols.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t1
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t1
 // RUN: llvm-readobj -t -s %t1 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/many-sections.s
===================================================================
--- test/elf2/many-sections.s
+++ test/elf2/many-sections.s
@@ -11,7 +11,7 @@
 // CHECK-NEXT: Section: dm (0xFF00)
 
 
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
 
 // Test that _start is in the correct section.
Index: test/elf2/output-section.s
===================================================================
--- test/elf2/output-section.s
+++ test/elf2/output-section.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-readobj -t %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/plt.s
===================================================================
--- test/elf2/plt.s
+++ test/elf2/plt.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: lld -flavor gnu2 -shared %t2.o -o %t2.so
-// RUN: lld -flavor gnu2 %t.o %t2.so -o %t
+// RUN: lld -flavor gnu2 -m elf_x86_64 -shared %t2.o -o %t2.so
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86
Index: test/elf2/program-header-layout.s
===================================================================
--- test/elf2/program-header-layout.s
+++ test/elf2/program-header-layout.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: lld -flavor gnu2 %t -o %t2
+# RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 # RUN: llvm-readobj -sections -program-headers %t2 | FileCheck %s
 # REQUIRES: x86
 
Index: test/elf2/relocation-32S-error.s
===================================================================
--- test/elf2/relocation-32S-error.s
+++ test/elf2/relocation-32S-error.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: not lld -flavor gnu2 %t -o %t2 2>&1 | FileCheck %s
+// RUN: not lld -flavor gnu2 -m elf_x86_64 %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: x86
 
 .global _start
Index: test/elf2/relocation-absolute.s
===================================================================
--- test/elf2/relocation-absolute.s
+++ test/elf2/relocation-absolute.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %tabs %t -o %tout
+// RUN: lld -flavor gnu2 -m elf_x86_64 %tabs %t -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/relocation-common.s
===================================================================
--- test/elf2/relocation-common.s
+++ test/elf2/relocation-common.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %tout
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %tout
 // RUN: llvm-objdump -t -d %tout | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/relocation-errors.s
===================================================================
--- test/elf2/relocation-errors.s
+++ test/elf2/relocation-errors.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/abs.s -o %tabs
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: not lld -flavor gnu2 %tabs %t -o %t2 2>&1 | FileCheck %s
+// RUN: not lld -flavor gnu2 -m elf_x86_64 %tabs %t -o %t2 2>&1 | FileCheck %s
 // REQUIRES: x86
 
 .global _start
Index: test/elf2/relocation-i686.s
===================================================================
--- test/elf2/relocation-i686.s
+++ test/elf2/relocation-i686.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_i386 %t -o %t2
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/relocation-local.s
===================================================================
--- test/elf2/relocation-local.s
+++ test/elf2/relocation-local.s
@@ -1,6 +1,6 @@
 // Test that relocation of local symbols is working.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-objdump -s -d %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/relocation-undefined-weak.s
===================================================================
--- test/elf2/relocation-undefined-weak.s
+++ test/elf2/relocation-undefined-weak.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %tout
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %tout
 // RUN: llvm-readobj -sections %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix DISASM
 // REQUIRES: x86
Index: test/elf2/relocation.s
===================================================================
--- test/elf2/relocation.s
+++ test/elf2/relocation.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-objdump -s -d %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/resolution.s
===================================================================
--- test/elf2/resolution.s
+++ test/elf2/resolution.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution.s -o %t2
-// RUN: lld -flavor gnu2 -discard-all %t %t2 -o %t3
+// RUN: lld -flavor gnu2 -m elf_x86_64 -discard-all %t %t2 -o %t3
 // RUN: llvm-readobj -t %t3 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/section-align-0.test
===================================================================
--- test/elf2/section-align-0.test
+++ test/elf2/section-align-0.test
@@ -1,5 +1,5 @@
 # RUN: yaml2obj -format elf %s -o %t
-# RUN: lld -flavor gnu2 %t -o %tout
+# RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %tout
 
 # Verify that lld can handle sections with an alignment of zero.
 
Index: test/elf2/shared.s
===================================================================
--- test/elf2/shared.s
+++ test/elf2/shared.s
@@ -1,8 +1,8 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
-// RUN: lld -flavor gnu2 -shared %t2.o -o %t2.so
+// RUN: lld -flavor gnu2 -m elf_i386 -shared %t2.o -o %t2.so
 // RUN: llvm-readobj -s %t2.so | FileCheck --check-prefix=SO %s
-// RUN: lld -flavor gnu2 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -rpath foo -rpath bar %t.o %t2.so -o %t
+// RUN: lld -flavor gnu2 -m elf_i386 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -rpath foo -rpath bar %t.o %t2.so -o %t
 // RUN: llvm-readobj --program-headers --dynamic-table -t -s -dyn-symbols -section-data -hash-table %t | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/string-table.s
===================================================================
--- test/elf2/string-table.s
+++ test/elf2/string-table.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/symbols.s
===================================================================
--- test/elf2/symbols.s
+++ test/elf2/symbols.s
@@ -1,5 +1,5 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: lld -flavor gnu2 %t -o %t2
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t -o %t2
 // RUN: llvm-readobj -symbols -sections %t2 | FileCheck %s
 // REQUIRES: x86
 
Index: test/elf2/undef-start.s
===================================================================
--- test/elf2/undef-start.s
+++ test/elf2/undef-start.s
@@ -1,4 +1,4 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not lld -flavor gnu2 %t -o %t2 2>&1 | FileCheck %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t -o %t2 2>&1 | FileCheck %s
 # CHECK: undefined symbol: _start
 # REQUIRES: x86
Index: test/elf2/undef.s
===================================================================
--- test/elf2/undef.s
+++ test/elf2/undef.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not lld -flavor gnu2 %t -o %t2 2>&1 | FileCheck %s
+# RUN: not lld -flavor gnu2 -m elf_x86_64 %t -o %t2 2>&1 | FileCheck %s
 # CHECK: undefined symbol: foo
 # REQUIRES: x86
 
Index: test/elf2/visibility.s
===================================================================
--- test/elf2/visibility.s
+++ test/elf2/visibility.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/visibility.s -o %t2
-// RUN: lld -flavor gnu2 %t %t2 -o %t3
+// RUN: lld -flavor gnu2 -m elf_x86_64 %t %t2 -o %t3
 // RUN: llvm-readobj -t %t3 | FileCheck %s
 // REQUIRES: x86