[PATCH] D53645: Include input section name and output section name in an error message.

[Rui Ueyama via Phabricator via llvm-commits]

ruiu created this revision.
ruiu added a reviewer: ivanlozano.
Herald added subscribers: arichardson, emaste.
Herald added a reviewer: espindola.

Include input section name and output section name in an error message.


https://reviews.llvm.org/D53645

Files:
  lld/ELF/Writer.cpp
  lld/test/ELF/execute-only-mixed-data.s


Index: lld/test/ELF/execute-only-mixed-data.s
===================================================================
--- lld/test/ELF/execute-only-mixed-data.s
+++ lld/test/ELF/execute-only-mixed-data.s
@@ -16,7 +16,7 @@
 // RUN: }" > %t.lds
 // RUN: ld.lld -T%t.lds %t.o -o %t -execute-only 2>&1
 
-// CHECK: -execute-only does not support intermingling data and code
+// CHECK: cannot place {{.*}}:(.rodata.foo) into .text: -execute-only does not support intermingling data and code
 
     br lr
 
Index: lld/ELF/Writer.cpp
===================================================================
--- lld/ELF/Writer.cpp
+++ lld/ELF/Writer.cpp
@@ -1661,7 +1661,9 @@
       if (OS->Flags & SHF_EXECINSTR)
         for (InputSection *IS : getInputSections(OS))
           if (!(IS->Flags & SHF_EXECINSTR))
-            error("-execute-only does not support intermingling data and code");
+            error(
+                "cannot place " + toString(IS) + " into " + toString(OS->Name) +
+                ": -execute-only does not support intermingling data and code");
 
   // Prefer command line supplied address over other constraints.
   for (OutputSection *Sec : OutputSections) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53645.170877.patch
Type: text/x-patch
Size: 1179 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181024/f1abb10d/attachment.bin>