[lld] r326895 - [ELF] - Recommit r326892, r326893 "[ELF] - Report LMA region overflows."

George Rimar via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 7 04:44:18 PST 2018


Author: grimar
Date: Wed Mar  7 04:44:18 2018
New Revision: 326895

URL: http://llvm.org/viewvc/llvm-project?rev=326895&view=rev
Log:
[ELF] - Recommit r326892,r326893 "[ELF] - Report LMA region overflows."

With fix: add missing "RUN:" prefix to test case.

Original commit message:
We do not report LMA region overflows currently.
Both GNU linkers do that. The patch implements it.

Differential revision: https://reviews.llvm.org/D44094

Added:
    lld/trunk/test/ELF/linkerscript/lma-overflow.test
      - copied, changed from r326893, lld/trunk/test/ELF/linkerscript/lma-overflow.test
Modified:
    lld/trunk/ELF/LinkerScript.cpp

Modified: lld/trunk/ELF/LinkerScript.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=326895&r1=326894&r2=326895&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Wed Mar  7 04:44:18 2018
@@ -117,9 +117,9 @@ void LinkerScript::expandOutputSection(u
   if (Ctx->MemRegion)
     expandMemoryRegion(Ctx->MemRegion, Size, Ctx->MemRegion->Name,
                        Ctx->OutSec->Name);
-  // FIXME: check LMA region overflow too.
   if (Ctx->LMARegion)
-    Ctx->LMARegion->CurPos += Size;
+    expandMemoryRegion(Ctx->LMARegion, Size, Ctx->LMARegion->Name,
+                       Ctx->OutSec->Name);
 }
 
 void LinkerScript::setDot(Expr E, const Twine &Loc, bool InSec) {

Copied: lld/trunk/test/ELF/linkerscript/lma-overflow.test (from r326893, lld/trunk/test/ELF/linkerscript/lma-overflow.test)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/lma-overflow.test?p2=lld/trunk/test/ELF/linkerscript/lma-overflow.test&p1=lld/trunk/test/ELF/linkerscript/lma-overflow.test&r1=326893&r2=326895&rev=326895&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/lma-overflow.test (original)
+++ lld/trunk/test/ELF/linkerscript/lma-overflow.test Wed Mar  7 04:44:18 2018
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 
-# echo '.section .foo,"a"; .quad 1' | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
+# RUN: echo '.section .foo,"a"; .quad 1' | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
 # RUN: not ld.lld -o %t %t.o --script %s 2>&1 | FileCheck %s
 # CHECK: error: section '.foo' will not fit in region 'flash': overflowed by 264 bytes
 




More information about the llvm-commits mailing list