[PATCH] D34833: [LLD] [COFF] Add initial support for linking ARM64 binaries

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 104733.
mstorsjo edited the summary of this revision.
mstorsjo added a comment.
Herald added a subscriber: javed.absar.

Added a testcase, sorted the ARM64 declaration alphabetically.

The test case checks the pe32+ magic value, which llvm-readobj doesn't output (yet), but I'll send a separate patch for that.


https://reviews.llvm.org/D34833

Files:
  COFF/Config.h
  test/COFF/Inputs/arm64-executable.obj.yaml
  test/COFF/arm64-magic.test


Index: test/COFF/arm64-magic.test
===================================================================
--- /dev/null
+++ test/COFF/arm64-magic.test
@@ -0,0 +1,5 @@
+# RUN: yaml2obj < %p/Inputs/arm64-executable.obj.yaml > %t.obj
+# RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
+# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+
+CHECK: Magic: 523
Index: test/COFF/Inputs/arm64-executable.obj.yaml
===================================================================
--- /dev/null
+++ test/COFF/Inputs/arm64-executable.obj.yaml
@@ -0,0 +1,29 @@
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_ARM64
+  Characteristics: []
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_PURGEABLE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    SectionData:     'e0031f2ac0035fd6'
+symbols:
+  - Name:            .text
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          8
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          1
+  - Name:            mainCRTStartup
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
Index: COFF/Config.h
===================================================================
--- COFF/Config.h
+++ COFF/Config.h
@@ -31,6 +31,7 @@
 
 // Short aliases.
 static const auto AMD64 = llvm::COFF::IMAGE_FILE_MACHINE_AMD64;
+static const auto ARM64 = llvm::COFF::IMAGE_FILE_MACHINE_ARM64;
 static const auto ARMNT = llvm::COFF::IMAGE_FILE_MACHINE_ARMNT;
 static const auto I386 = llvm::COFF::IMAGE_FILE_MACHINE_I386;
 
@@ -73,7 +74,7 @@
 // Global configuration.
 struct Configuration {
   enum ManifestKind { SideBySide, Embed, No };
-  bool is64() { return Machine == AMD64; }
+  bool is64() { return Machine == AMD64 || Machine == ARM64; }
 
   llvm::COFF::MachineTypes Machine = IMAGE_FILE_MACHINE_UNKNOWN;
   bool Verbose = false;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34833.104733.patch
Type: text/x-patch
Size: 2228 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170629/c785c3e4/attachment.bin>