diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 65cd3f97cddf..c8b59b4814b4 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-19  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* unwind-dw2.c (_Unwind_GetGR) [DWARF_ZERO_REG]: Compare
+	regno instead of index to DWARF_ZERO_REG.
+
 2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* config/visium/lib2funcs.c (__set_trampoline_parity): Replace
diff --git a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
index bd88df963957..e6130af2fb54 100644
--- a/libgcc/unwind-dw2.c
+++ b/libgcc/unwind-dw2.c
@@ -225,7 +225,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int regno)
   _Unwind_Context_Reg_Val val;
 
 #ifdef DWARF_ZERO_REG
-  if (index == DWARF_ZERO_REG)
+  if (regno == DWARF_ZERO_REG)
     return 0;
 #endif