diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index 297ca18..276ea93 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -1122,8 +1122,9 @@ aarch64_simd_expand_args (rtx target, int icode, int have_retval,
 	    case SIMD_ARG_CONSTANT:
 	      if (!(*insn_data[icode].operand[argc + have_retval].predicate)
 		  (op[argc], mode[argc]))
-		error ("incompatible type for argument %d, "
-		       "expected 'const int'", argc + 1);
+		error_at (DECL_SOURCE_LOCATION (exp),
+		       "incompatible type for argument %d, "
+		       "expected %<const int%>", argc + 1);
 	      break;
 
 	    case SIMD_ARG_STOP:
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 34d0475..00ea574 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -4436,7 +4436,7 @@ aarch64_parse_extension (char *str)
 
       if (len == 0)
 	{
-	  error ("missing architectural extension");
+	  error ("missing feature modifier after %qs", "+no");
 	  return;
 	}
 
@@ -4457,7 +4457,7 @@ aarch64_parse_extension (char *str)
       if (opt->name == NULL)
 	{
 	  /* Extension not found in list.  */
-	  error ("unknown architectural extension `%s'", str);
+	  error ("unknown feature modifier %qs", str);
 	  return;
 	}
 
@@ -4488,7 +4488,7 @@ aarch64_parse_arch (void)
 
   if (len == 0)
     {
-      error ("missing arch name `%s'\n", str);
+      error ("missing arch name in -march=%qs", str);
       return;
     }
 
@@ -4512,7 +4512,7 @@ aarch64_parse_arch (void)
     }
 
   /* ARCH name not found in list.  */
-  error ("unknown value (%s) for -march", str);
+  error ("unknown value %qs for -march", str);
   return;
 }
 
@@ -4537,7 +4537,7 @@ aarch64_parse_cpu (void)
 
   if (len == 0)
     {
-      error ("missing cpu name in `%s'", str);
+      error ("missing cpu name in -mcpu=%qs", str);
       return;
     }
 
@@ -4560,7 +4560,7 @@ aarch64_parse_cpu (void)
     }
 
   /* CPU name not found in list.  */
-  error ("unknown value (%s) for -mcpu", str);
+  error ("unknown value %qs for -mcpu", str);
   return;
 }
 
@@ -4584,7 +4584,7 @@ aarch64_parse_tune (void)
     }
 
   /* CPU name not found in list.  */
-  error ("unknown value (%s) for -mtune", str);
+  error ("unknown value %qs for -mtune", str);
   return;
 }