diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0044469e970d14714e5d290210ebcac99abf194b..d41f6245233adcb6264b8abf3ef11a0593482bf2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2016-11-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+2016-11-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Alan Hayward  <alan.hayward@arm.com>
+	    David Sherwood  <david.sherwood@arm.com>
+
+	* dwarf2out.c (mem_loc_descriptor): Fix GET_MODE_CLASS/
+	GET_MODE_SIZE typo.
+
 2016-11-14  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	* config/rs6000/rs6000.c (rs6000_expand_vector_set): Add support
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 58a5e1ad2ff7ae3f8bbb76c28601e7c25a6869e7..a7344ca01363e594879297fb13f83fc328d93faf 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -14976,7 +14976,7 @@ mem_loc_descriptor (rtx rtl, machine_mode mode,
       if ((!dwarf_strict || dwarf_version >= 5)
 	  && SCALAR_INT_MODE_P (mode))
 	{
-	  if (GET_MODE_CLASS (mode) > DWARF2_ADDR_SIZE)
+	  if (GET_MODE_SIZE (mode) > DWARF2_ADDR_SIZE)
 	    {
 	      op = DW_OP_div;
 	      goto do_binop;