diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 3198df8fd6f..7483f30fc1a 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7203,6 +7203,7 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = {
   {"all", AARCH64_ANY, NULL},
   {"cortex-a53",	AARCH64_ARCH_V8, "Cortex-A53"},
   {"cortex-a57",	AARCH64_ARCH_V8, "Cortex-A57"},
+  {"thunderx",		AARCH64_ARCH_V8, "Cavium ThunderX"},
   {"xgene-1", AARCH64_ARCH_V8, "APM X-Gene 1"},
   {"generic", AARCH64_ARCH_V8, NULL},
 
diff --git a/gas/doc/c-aarch64.texi b/gas/doc/c-aarch64.texi
index 1f4ce4cc854..f3d4e41a4ac 100644
--- a/gas/doc/c-aarch64.texi
+++ b/gas/doc/c-aarch64.texi
@@ -57,6 +57,7 @@ message if an attempt is made to assemble an instruction which will not execute
 on the target processor.  The following processor names are recognized:
 @code{cortex-a53},
 @code{cortex-a57},
+@code{thunderx},
 and
 @code{xgene-1}.
 The special name @code{all} may be used to allow the assembler to accept