[PATCH] D46598: Add support for LTO plugin option obj-path

[Rumeet Dhindsa via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rLLD331817: Add support for LTO plugin option obj-path (authored by rdhindsa, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D46598?vs=145791&id=145805#toc

Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D46598

Files:
  ELF/Config.h
  ELF/Driver.cpp
  ELF/LTO.cpp
  test/ELF/lto/thinlto.ll


Index: test/ELF/lto/thinlto.ll
===================================================================
--- test/ELF/lto/thinlto.ll
+++ test/ELF/lto/thinlto.ll
@@ -49,11 +49,6 @@
 ; RUN: not ls %t2.o.thinlto.bc
 ; RUN: not ls %t4.o.thinlto.bc
 
-; Ensure lld generates one regular LTO file via splitting for ThinLTO builds
-; RUN: rm -f %t.lto.o
-; RUN: ld.lld -save-temps --plugin-opt=thinlto-index-only -shared %t.o %t2.o -o %t
-; RUN: llvm-readobj -h %t.lto.o | FileCheck %s --check-prefix=FORMAT
-
 ; First force single-threaded mode
 ; RUN: rm -f %t.lto.o %t1.lto.o
 ; RUN: ld.lld -save-temps --thinlto-jobs=1 -shared %t.o %t2.o -o %t
@@ -71,6 +66,12 @@
 ; stable on the final output file itself.
 ; RUN: ld.lld -shared %t.o %t2.o -o %t2
 
+; Test to ensure that thinlto-index-only with obj-path creates the file.
+; RUN: rm -f %t5.o
+; RUN: ld.lld --plugin-opt=thinlto-index-only --plugin-opt=obj-path=%t5.o -shared %t.o %t2.o -o %t4
+; RUN: llvm-readobj -h %t5.o | FileCheck %s --check-prefix=FORMAT
+; RUN: llvm-nm %t5.o | count 0
+
 ; NM: T f
 ; NM1: T f
 ; NM1-NOT: U g
Index: ELF/Config.h
===================================================================
--- ELF/Config.h
+++ ELF/Config.h
@@ -86,6 +86,7 @@
   llvm::StringRef Init;
   llvm::StringRef LTOAAPipeline;
   llvm::StringRef LTONewPmPasses;
+  llvm::StringRef LTOObjPath;
   llvm::StringRef LTOSampleProfile;
   llvm::StringRef MapFile;
   llvm::StringRef OutputFile;
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -796,6 +796,8 @@
       Config->LTODebugPassManager = true;
     } else if (S.startswith("sample-profile=")) {
       Config->LTOSampleProfile = S.substr(15);
+    } else if (S.startswith("obj-path=")) {
+      Config->LTOObjPath = S.substr(9);
     } else if (S == "thinlto-index-only") {
       Config->ThinLTOIndexOnly = true;
     } else if (S.startswith("thinlto-index-only=")) {
Index: ELF/LTO.cpp
===================================================================
--- ELF/LTO.cpp
+++ ELF/LTO.cpp
@@ -279,8 +279,8 @@
         openFile(Path + ".imports");
     }
 
-    if (Config->SaveTemps)
-      saveBuffer(Buff[0], Config->OutputFile + ".lto.o");
+    if (!Config->LTOObjPath.empty())
+      saveBuffer(Buff[0], Config->LTOObjPath);
 
     // ThinLTO with index only option is required to generate only the index
     // files. After that, we exit from linker and ThinLTO backend runs in a


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46598.145805.patch
Type: text/x-patch
Size: 2468 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180508/c8ac4313/attachment.bin>