From: Georg-Johann Lay <avr@gjlay.de>
Date: Mon, 17 Jul 2017 09:23:10 +0000 (+0100)
Subject: Update assembler documentation on some AVR cores.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f27dadca0ad18d5a0ba032c3d3f6a60ea55d887b;p=binutils-gdb.git

Update assembler documentation on some AVR cores.

	PR 21472
	* config/tc-avr.c (mcu_types): Add entries for: attiny212,
	attiny214, attiny412, attiny414, attiny814, attiny1614,
	attiny1616, attiny1617, attiny3214, attiny3216, attiny3217.
	(md_show_usage): Adjust doc for "avrxmega3".
	* doc/c-avr.texi (AVR options) [-mmcu=]: Adjust doc for avrxmega3.
	Add MCUs: attiny212, attiny214, attiny412, attiny414, attiny416,
	attiny417, attiny814, attiny816, attiny817, attiny1614,
	attiny1616, attiny1617, attiny3214, attiny3216, attiny3217.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9bf66e33dc8..a976fc60d73 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2017-07-17  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR 21472
+	* config/tc-avr.c (mcu_types): Add entries for: attiny212,
+	attiny214, attiny412, attiny414, attiny814, attiny1614,
+	attiny1616, attiny1617, attiny3214, attiny3216, attiny3217.
+	(md_show_usage): Adjust doc for "avrxmega3".
+	* doc/c-avr.texi (AVR options) [-mmcu=]: Adjust doc for avrxmega3.
+	Add MCUs: attiny212, attiny214, attiny412, attiny414, attiny416,
+	attiny417, attiny814, attiny816, attiny817, attiny1614,
+	attiny1616, attiny1617, attiny3214, attiny3216, attiny3217.
+
 2017-07-13  Jim Wilson  <jim.wilson@linaro.org>
 
 	* config/tc-arch64.c (aarch64_cpus): Add AARCH64_FEATURE_RDMA to
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 7e3f7191067..067657b7d43 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -402,10 +402,21 @@ static struct mcu_type_s mcu_types[] =
   {"atxmega16e5", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
   {"atxmega8e5",  AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
   {"atxmega32x1", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
+  {"attiny212",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny214",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny412",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny414",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
   {"attiny416",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
   {"attiny417",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny814",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
   {"attiny816",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
   {"attiny817",   AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny1614",  AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny1616",  AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny1617",  AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny3214",  AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny3216",  AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
+  {"attiny3217",  AVR_ISA_XMEGA,  bfd_mach_avrxmega3},
   {"atxmega64a3", AVR_ISA_XMEGA,  bfd_mach_avrxmega4},
   {"atxmega64a3u",AVR_ISA_XMEGAU, bfd_mach_avrxmega4},
   {"atxmega64a4u",AVR_ISA_XMEGAU, bfd_mach_avrxmega4},
@@ -661,7 +672,7 @@ md_show_usage (FILE *stream)
 	"                   avr51 - enhanced AVR core with up to 128K program memory\n"
 	"                   avr6  - enhanced AVR core with up to 256K program memory\n"
 	"                   avrxmega2 - XMEGA, > 8K, < 64K FLASH, < 64K RAM\n"
-	"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
+	"                   avrxmega3 - XMEGA, RAM + FLASH < 64K, Flash visible in RAM\n"
 	"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
 	"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
 	"                   avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
diff --git a/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
index e419964aee7..cb9cbe0090a 100644
--- a/gas/doc/c-avr.texi
+++ b/gas/doc/c-avr.texi
@@ -97,9 +97,12 @@ atxmega16a4, atxmega16a4u, atxmega16c4, atxmega16d4, atxmega16x1,
 atxmega32a4, atxmega32a4u, atxmega32c4, atxmega32d4, atxmega16e5,
 atxmega8e5, atxmega32e5, atxmega32x1).
 
-Instruction set avrxmega3 is for the XMEGA AVR core with 8K to 64K
-program memory space and greater than 64K data space (MCU types:
-none).
+Instruction set avrxmega3 is for the XMEGA AVR core with up to 64K
+of combined program memory and RAM, and with program memory
+visible in the RAM address space (MCU types:
+attiny212, attiny214, attiny412, attiny414, attiny416, attiny417,
+attiny814, attiny816, attiny817, attiny1614, attiny1616, attiny1617,
+attiny3214, attiny3216, attiny3217).
 
 Instruction set avrxmega4 is for the XMEGA AVR core with up to 64K
 program memory space and less than 64K data space (MCU types: