diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 4fa80397cbfa7..145bff5007466 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2269,6 +2269,12 @@ template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
   define("__preinit_array_start", "__preinit_array_end", ctx.out.preinitArray);
   define("__init_array_start", "__init_array_end", ctx.out.initArray);
   define("__fini_array_start", "__fini_array_end", ctx.out.finiArray);
+  // Define __eh_frame_* symbols, libunwind needs these symbols.
+  // Define them only if the corresponding output section exists.
+  if (OutputSection *sec = findSection(ctx, ".eh_frame"))
+    define("__eh_frame_start", "__eh_frame_end", sec);
+  if (OutputSection *sec = findSection(ctx, ".eh_frame_hdr"))
+    define("__eh_frame_hdr_start", "__eh_frame_hdr_end", sec);
 
   // As a special case, don't unnecessarily retain .ARM.exidx, which would
   // create an empty PT_ARM_EXIDX.
diff --git a/lld/test/ELF/eh-frame-syms.s b/lld/test/ELF/eh-frame-syms.s
new file mode 100644
index 0000000000000..074221ade4fb6
--- /dev/null
+++ b/lld/test/ELF/eh-frame-syms.s
@@ -0,0 +1,25 @@
+## Verify that lld defines __eh_frame_start/end and __eh_frame_hdr_start/end symbols
+
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -eh-frame-hdr -o %t
+# RUN: llvm-readelf -s %t | FileCheck %s --check-prefix=SYM
+
+# SYM: __eh_frame_start
+# SYM: __eh_frame_end
+# SYM: __eh_frame_hdr_start
+# SYM: __eh_frame_hdr_end
+
+.text
+.globl _start
+.type _start, @function
+_start:
+  nop
+
+# Emit references so the link will fail if these are not defined
+check_symbol:
+  .quad __eh_frame_start
+  .quad __eh_frame_end
+  .quad __eh_frame_hdr_start
+  .quad __eh_frame_hdr_end