Index: ELF/Relocations.cpp
===================================================================
--- ELF/Relocations.cpp
+++ ELF/Relocations.cpp
@@ -374,7 +374,7 @@
   // Copy relocation against zero-sized symbol doesn't make sense.
   uintX_t SymSize = SS->template getSize<ELFT>();
   if (SymSize == 0)
-    fatal("cannot create a copy relocation for " + SS->getName());
+    fatal("cannot create a copy relocation for symbol " + SS->getName());
 
   uintX_t Alignment = getAlignment(SS);
   uintX_t Off = alignTo(Out<ELFT>::Bss->getSize(), Alignment);
@@ -422,12 +422,16 @@
   // only memory. We can hack around it if we are producing an executable and
   // the refered symbol can be preemepted to refer to the executable.
   if (Config->Shared || (Config->Pic && !isRelExpr(Expr))) {
-    error("can't create dynamic relocation " + getRelName(Type) +
-          " against readonly segment");
+    if (!Body.isLocal())
+      error("can't create dynamic relocation " + getRelName(Type) +
+            " against symbol " + Body.getName());
+    else
+      error("can't create dynamic relocation " + getRelName(Type) +
+            " against readonly segment");
     return Expr;
   }
   if (Body.getVisibility() != STV_DEFAULT) {
-    error("cannot preempt symbol");
+    error("cannot preempt symbol " + Body.getName());
     return Expr;
   }
   if (Body.isObject()) {
@@ -461,7 +465,7 @@
     Body.NeedsCopyOrPltAddr = true;
     return toPlt(Expr);
   }
-  error("symbol is missing type");
+  error("symbol " + Body.getName() + " is missing type");
 
   return Expr;
 }
Index: test/ELF/aarch64-fpic-add_abs_lo12_nc.s
===================================================================
--- test/ELF/aarch64-fpic-add_abs_lo12_nc.s
+++ test/ELF/aarch64-fpic-add_abs_lo12_nc.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
-// CHECK: can't create dynamic relocation R_AARCH64_ADD_ABS_LO12_NC against readonly segment
+// CHECK: can't create dynamic relocation R_AARCH64_ADD_ABS_LO12_NC against symbol dat
 
   add x0, x0, :lo12:dat
 .data
Index: test/ELF/aarch64-fpic-adr_prel_lo21.s
===================================================================
--- test/ELF/aarch64-fpic-adr_prel_lo21.s
+++ test/ELF/aarch64-fpic-adr_prel_lo21.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
-// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_LO21 against readonly segment
+// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_LO21 against symbol dat
 
   adr x0, dat
 .data
Index: test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
===================================================================
--- test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
+++ test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
-// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_PG_HI21 against readonly segment
+// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol dat
 
   adrp x0, dat
 .data
Index: test/ELF/aarch64-fpic-ldst32_abs_lo12_nc.s
===================================================================
--- test/ELF/aarch64-fpic-ldst32_abs_lo12_nc.s
+++ test/ELF/aarch64-fpic-ldst32_abs_lo12_nc.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
-// CHECK: can't create dynamic relocation R_AARCH64_LDST32_ABS_LO12_NC against readonly segment
+// CHECK: can't create dynamic relocation R_AARCH64_LDST32_ABS_LO12_NC against symbol dat
 
   ldr s4, [x0, :lo12:dat]
 .data
Index: test/ELF/aarch64-fpic-ldst64_abs_lo12_nc.s
===================================================================
--- test/ELF/aarch64-fpic-ldst64_abs_lo12_nc.s
+++ test/ELF/aarch64-fpic-ldst64_abs_lo12_nc.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
-// CHECK: can't create dynamic relocation R_AARCH64_LDST64_ABS_LO12_NC against readonly segment
+// CHECK: can't create dynamic relocation R_AARCH64_LDST64_ABS_LO12_NC against symbol dat
 
   ldr x0, [x0, :lo12:dat]
 .data
Index: test/ELF/aarch64-fpic-ldst8_abs_lo12_nc.s
===================================================================
--- test/ELF/aarch64-fpic-ldst8_abs_lo12_nc.s
+++ test/ELF/aarch64-fpic-ldst8_abs_lo12_nc.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
-// CHECK: can't create dynamic relocation R_AARCH64_LDST8_ABS_LO12_NC against readonly segment
+// CHECK: can't create dynamic relocation R_AARCH64_LDST8_ABS_LO12_NC against symbol dat
 
   ldrsb x0, [x1, :lo12:dat]
 .data
Index: test/ELF/copy-errors.s
===================================================================
--- test/ELF/copy-errors.s
+++ test/ELF/copy-errors.s
@@ -9,7 +9,7 @@
 
 
 call bar
-// CHECK: cannot preempt symbol
+// CHECK: cannot preempt symbol bar
 
 call zed
-// CHECK: symbol is missing type
+// CHECK: symbol zed is missing type
Index: test/ELF/copy-in-shared.s
===================================================================
--- test/ELF/copy-in-shared.s
+++ test/ELF/copy-in-shared.s
@@ -7,4 +7,4 @@
 
 .quad foo
 
-// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
+// CHECK: can't create dynamic relocation R_X86_64_64 against symbol foo
Index: test/ELF/copy-rel-corrupted.s
===================================================================
--- test/ELF/copy-rel-corrupted.s
+++ test/ELF/copy-rel-corrupted.s
@@ -3,7 +3,7 @@
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: not ld.lld %t.o %t2.so -o %t.exe 2>&1 | FileCheck %s
 
-// CHECK: cannot create a copy relocation for x
+// CHECK: cannot create a copy relocation for symbol x
 
 .global _start
 _start:
Index: test/ELF/copy-rel-pie-error.s
===================================================================
--- test/ELF/copy-rel-pie-error.s
+++ test/ELF/copy-rel-pie-error.s
@@ -3,8 +3,8 @@
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: not ld.lld %t.o %t2.so -o %t.exe -pie 2>&1 | FileCheck %s
 
-// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
-// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
+// CHECK: can't create dynamic relocation R_X86_64_64 against symbol bar
+// CHECK: can't create dynamic relocation R_X86_64_64 against symbol foo
 
 .global _start
 _start:
Index: test/ELF/eh-frame-dyn-rel.s
===================================================================
--- test/ELF/eh-frame-dyn-rel.s
+++ test/ELF/eh-frame-dyn-rel.s
@@ -7,4 +7,4 @@
         .cfi_personality 0x8c, foo
         .cfi_endproc
 
-// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
+// CHECK: can't create dynamic relocation R_X86_64_64 against symbol foo