[lld] r326894 - [ELF] - Revert r326892, r326893.

[George Rimar via llvm-commits]

Author: grimar
Date: Wed Mar  7 04:33:00 2018
New Revision: 326894

URL: http://llvm.org/viewvc/llvm-project?rev=326894&view=rev
Log:
[ELF] - Revert r326892, r326893.

Bots are still unhappy:
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/26259

Removed:
    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=326894&r1=326893&r2=326894&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Wed Mar  7 04:33:00 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)
-    expandMemoryRegion(Ctx->LMARegion, Size, Ctx->LMARegion->Name,
-                       Ctx->OutSec->Name);
+    Ctx->LMARegion->CurPos += Size;
 }
 
 void LinkerScript::setDot(Expr E, const Twine &Loc, bool InSec) {

Removed: lld/trunk/test/ELF/linkerscript/lma-overflow.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/lma-overflow.test?rev=326893&view=auto
==============================================================================
--- lld/trunk/test/ELF/linkerscript/lma-overflow.test (original)
+++ lld/trunk/test/ELF/linkerscript/lma-overflow.test (removed)
@@ -1,16 +0,0 @@
-# REQUIRES: x86
-
-# 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
-
-MEMORY {
-  ram (rwx) : org = 0x1000, len = 0x300
-  flash (rwx) : org = 0x1000, len = 0x100
-}
-SECTIONS {
-  .foo : {
-    *(.foo)
-    . += 0x200;
-  } > ram AT>flash
-}