diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2363216b73b..ac6ab859a54 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-22  Steve Ellcey  <sellcey@cavium.com>
+
+	PR target/83335
+	* config/aarch64/aarch64.c (aarch64_print_address_internal):
+	Change gcc_assert call to output_operand_lossage.
+
 2018-02-22  Steve Ellcey  <sellcey@cavium.com>
 
 	* doc/extend.texi (__builtin_extend_pointer): Document builtin.
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 33c90ef02dc..ec501b78bdb 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -7059,7 +7059,8 @@ aarch64_print_address_internal (FILE *f, machine_mode mode, rtx x,
   unsigned int size;
 
   /* Check all addresses are Pmode - including ILP32.  */
-  gcc_assert (GET_MODE (x) == Pmode);
+  if (GET_MODE (x) != Pmode)
+    output_operand_lossage ("invalid address mode");
 
   if (aarch64_classify_address (&addr, x, mode, true, type))
     switch (addr.type)