COFF: ARM: Set correct entry point address.

llvm-svn: 243199

diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h
index c532f70..ae718d3 100644 (file)
--- a/lld/COFF/Config.h
+++ b/lld/COFF/Config.h
@@ -31,7 +31,7 @@ class Undefined;
 
 // Short aliases.
 static const auto AMD64 = llvm::COFF::IMAGE_FILE_MACHINE_AMD64;
-static const auto ARM = llvm::COFF::IMAGE_FILE_MACHINE_ARM;
+static const auto ARMNT = llvm::COFF::IMAGE_FILE_MACHINE_ARMNT;
 static const auto I386 = llvm::COFF::IMAGE_FILE_MACHINE_I386;
 
 // Represents an /export option.

diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp
index 405eb40..a66c1de 100644 (file)
--- a/lld/COFF/Writer.cpp
+++ b/lld/COFF/Writer.cpp
@@ -440,6 +440,9 @@ template <typename PEHeaderTy> void Writer::writeHeader() {
   if (!Config->NoEntry) {
     Defined *Entry = cast<Defined>(Config->Entry->repl());
     PE->AddressOfEntryPoint = Entry->getRVA();
+    // Pointer to thumb code must have the LSB set, so adjust it.
+    if (Config->MachineType == ARMNT)
+      PE->AddressOfEntryPoint |= 1;
   }
   PE->SizeOfStackReserve = Config->StackReserve;
   PE->SizeOfStackCommit = Config->StackCommit;

diff --git a/lld/test/COFF/Inputs/armnt-executable.obj.yaml b/lld/test/COFF/Inputs/armnt-executable.obj.yaml
new file mode 100644 (file)
index 0000000..33b2c88
--- /dev/null
+++ b/lld/test/COFF/Inputs/armnt-executable.obj.yaml
@@ -0,0 +1,29 @@
+---
+header:
+  Machine:         IMAGE_FILE_MACHINE_ARMNT
+  Characteristics: []
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_PURGEABLE, IMAGE_SCN_MEM_16BIT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    SectionData:     '7047'
+symbols:
+  - Name:            .text
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          2
+      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
+...

diff --git a/lld/test/COFF/Inputs/armnt-executable.s b/lld/test/COFF/Inputs/armnt-executable.s
new file mode 100644 (file)
index 0000000..7e1a8ce
--- /dev/null
+++ b/lld/test/COFF/Inputs/armnt-executable.s
@@ -0,0 +1,13 @@
+# void mainCRTStartup() {}
+       .syntax unified
+       .thumb
+       .text
+       .def mainCRTStartup
+               .scl 2
+               .type 32
+       .endef
+       .global mainCRTStartup
+       .align 2
+       .thumb_func
+mainCRTStartup:
+       bx lr

diff --git a/lld/test/COFF/armnt-entry-point.test b/lld/test/COFF/armnt-entry-point.test
new file mode 100644 (file)
index 0000000..628e1a1
--- /dev/null
+++ b/lld/test/COFF/armnt-entry-point.test
@@ -0,0 +1,5 @@
+# RUN: yaml2obj < %p/Inputs/armnt-executable.obj.yaml > %t.obj
+# RUN: lld -flavor link2 /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
+# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+
+CHECK: AddressOfEntryPoint: 0x1001