Index: lld/trunk/ELF/Driver.cpp
===================================================================
--- lld/trunk/ELF/Driver.cpp
+++ lld/trunk/ELF/Driver.cpp
@@ -50,6 +50,8 @@
     return {ELF32LEKind, EM_386};
   if (S == "elf_x86_64")
     return {ELF64LEKind, EM_X86_64};
+  if (S == "aarch64linux")
+    return {ELF64LEKind, EM_AARCH64};
   error("Unknown emulation: " + S);
 }
 
Index: lld/trunk/test/ELF/emulation.s
===================================================================
--- lld/trunk/test/ELF/emulation.s
+++ lld/trunk/test/ELF/emulation.s
@@ -141,7 +141,31 @@
 # MIPSEL-NEXT:   Flags [ (0x0)
 # MIPSEL-NEXT:   ]
 
-# REQUIRES: x86,ppc,mips
+# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %taarch64
+# RUN: ld.lld -m aarch64linux %taarch64 -o %t2aarch64
+# RUN: llvm-readobj -file-headers %t2aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: ld.lld %taarch64 -o %t3aarch64
+# RUN: llvm-readobj -file-headers %t3aarch64 | FileCheck --check-prefix=AARCH64 %s
+# AARCH64:      ElfHeader {
+# AARCH64-NEXT:   Ident {
+# AARCH64-NEXT:     Magic: (7F 45 4C 46)
+# AARCH64-NEXT:     Class: 64-bit (0x2)
+# AARCH64-NEXT:     DataEncoding: LittleEndian (0x1)
+# AARCH64-NEXT:     FileVersion: 1
+# AARCH64-NEXT:     OS/ABI: SystemV (0x0)
+# AARCH64-NEXT:     ABIVersion: 0
+# AARCH64-NEXT:     Unused: (00 00 00 00 00 00 00)
+# AARCH64-NEXT:   }
+# AARCH64-NEXT:   Type: Executable (0x2)
+# AARCH64-NEXT:   Machine: EM_AARCH64 (0xB7)
+# AARCH64-NEXT:   Version: 1
+# AARCH64-NEXT:   Entry:
+# AARCH64-NEXT:   ProgramHeaderOffset: 0x40
+# AARCH64-NEXT:   SectionHeaderOffset:
+# AARCH64-NEXT:   Flags [ (0x0)
+# AARCH64-NEXT:   ]
+
+# REQUIRES: x86,ppc,mips,aarch64
 
 .globl _start;
 _start: