[PATCH] D50065: [LLD] Only increase LMARegion if different from MemRegion

[Konstantin Schwarz via Phabricator via llvm-commits]

kschwarz updated this revision to Diff 158276.
kschwarz added a comment.

Address review comments.

This patch was split from https://reviews.llvm.org/D50052, which adds at6.test and at7.test


https://reviews.llvm.org/D50065

Files:
  ELF/LinkerScript.cpp
  test/ELF/linkerscript/Inputs/at8.s
  test/ELF/linkerscript/at8.test


Index: test/ELF/linkerscript/at8.test
===================================================================
--- /dev/null
+++ test/ELF/linkerscript/at8.test
@@ -0,0 +1,30 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/at8.s -o %t.o
+# RUN: ld.lld %t.o --script %s -o %t
+# RUN: llvm-readelf -sections -program-headers %t | FileCheck %s
+
+MEMORY {
+  RAM    : ORIGIN = 0x20000000, LENGTH = 0x200
+}
+
+SECTIONS {
+    .text : { *(.text) } > RAM AT> RAM
+    .sec : { *(.sec) } > RAM
+}
+
+# Make sure the memory for the .text section is only reserved once.
+# Previously, the location counter for both MemRegion and LMARegion
+# was increased unconditionally.
+
+
+# CHECK: Name              Type            Address          Off
+# CHECK: .text             PROGBITS        0000000020000000 001000
+# CHECK: .sec             PROGBITS        0000000020000001 001001
+
+# CHECK: Program Headers:
+
+# CHECK:      Type  Offset   VirtAddr           PhysAddr
+# CHECK-NEXT: LOAD  0x001000 0x0000000020000000 0x0000000020000000
+# CHECK-NEXT: LOAD  0x001001 0x0000000020000001 0x0000000020000001
+
+# CHECK-NOT: LOAD
Index: test/ELF/linkerscript/Inputs/at8.s
===================================================================
--- /dev/null
+++ test/ELF/linkerscript/Inputs/at8.s
@@ -0,0 +1,8 @@
+.global _start
+.text
+_start:
+nop
+
+
+.section .sec, "aw"
+.word 4
Index: ELF/LinkerScript.cpp
===================================================================
--- ELF/LinkerScript.cpp
+++ ELF/LinkerScript.cpp
@@ -116,7 +116,8 @@
   if (Ctx->MemRegion)
     expandMemoryRegion(Ctx->MemRegion, Size, Ctx->MemRegion->Name,
                        Ctx->OutSec->Name);
-  if (Ctx->LMARegion)
+  // Only expand the LMARegion if it is different from MemRegion
+  if (Ctx->LMARegion && Ctx->MemRegion != Ctx->LMARegion)
     expandMemoryRegion(Ctx->LMARegion, Size, Ctx->LMARegion->Name,
                        Ctx->OutSec->Name);
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D50065.158276.patch
Type: text/x-patch
Size: 1959 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180731/35864497/attachment.bin>