Incorporate the ATxmega patch from WinAVR.

Silense an assembler warning that triggered too frequently on
legitimate code (binutils bug 5523).

Make $DATA_ORIGIN a configurable value within the linker script
templates.

7 files changed, 735 insertions, 17 deletions

diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 3dea391f5c10..d344a31695ce 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	binutils
 PORTVERSION=	2.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
diff --git a/devel/avr-binutils/files/patch-bug5523 b/devel/avr-binutils/files/patch-bug5523
new file mode 100644
index 000000000000..59986b7dbaca
--- /dev/null
+++ b/devel/avr-binutils/files/patch-bug5523
@@ -0,0 +1,30 @@
+Committed
+Binutils 2.19.
+Backport patch to fix Binutils bug #5523. 
+--------------------------------------------------------------------------------
+Index: gas/config/tc-avr.c
+===================================================================
+RCS file: /cvs/src/src/gas/config/tc-avr.c,v
+retrieving revision 1.48
+diff -c -3 -p -r1.48 tc-avr.c
+*** gas/config/tc-avr.c	16 Nov 2007 17:39:22 -0000	1.48
+--- gas/config/tc-avr.c	7 Jan 2008 16:43:30 -0000
+*************** avr_ldi_expression (expressionS *exp)
+*** 618,624 ****
+  		      break;
+  
+  		    default:
+! 		      as_warn (_("expression dangerous with linker stubs"));
+  		    }
+  		}
+  	      return reloc_to_return;
+--- 618,626 ----
+  		      break;
+  
+  		    default:
+! 		      /* PR 5523: Do not generate a warning here,
+! 			 legitimate code can trigger this case.  */
+! 		      break;
+  		    }
+  		}
+  	      return reloc_to_return;
diff --git a/devel/avr-binutils/files/patch-data-origin b/devel/avr-binutils/files/patch-data-origin
new file mode 100644
index 000000000000..e46644e15feb
--- /dev/null
+++ b/devel/avr-binutils/files/patch-data-origin
@@ -0,0 +1,97 @@
+Not committed.
+Patch by Anatoly Sokolov
+--------------------------------------------------------------------------------
+Index: ld/emulparams/avr1.sh
+===================================================================
+RCS file: /cvs/src/src/ld/emulparams/avr1.sh,v
+retrieving revision 1.2
+diff -u -r1.2 avr1.sh
+--- ld/emulparams/avr1.sh	24 May 2006 07:36:11 -0000	1.2
++++ ld/emulparams/avr1.sh	29 Feb 2008 23:39:37 -0000
+@@ -7,5 +7,6 @@
+ TEMPLATE_NAME=elf32
+ 
+ TEXT_LENGTH=8K
++DATA_ORIGIN=0x800060
+ DATA_LENGTH=0
+ EXTRA_EM_FILE=avrelf
+Index: ld/emulparams/avr2.sh
+===================================================================
+RCS file: /cvs/src/src/ld/emulparams/avr2.sh,v
+retrieving revision 1.2
+diff -u -r1.2 avr2.sh
+--- ld/emulparams/avr2.sh	24 May 2006 07:36:11 -0000	1.2
++++ ld/emulparams/avr2.sh	29 Feb 2008 23:39:37 -0000
+@@ -7,5 +7,6 @@
+ TEMPLATE_NAME=elf32
+ 
+ TEXT_LENGTH=8K
++DATA_ORIGIN=0x800060
+ DATA_LENGTH=0xffa0
+ EXTRA_EM_FILE=avrelf
+Index: ld/emulparams/avr3.sh
+===================================================================
+RCS file: /cvs/src/src/ld/emulparams/avr3.sh,v
+retrieving revision 1.2
+diff -u -r1.2 avr3.sh
+--- ld/emulparams/avr3.sh	24 May 2006 07:36:11 -0000	1.2
++++ ld/emulparams/avr3.sh	29 Feb 2008 23:39:37 -0000
+@@ -7,5 +7,6 @@
+ TEMPLATE_NAME=elf32
+ 
+ TEXT_LENGTH=128K
++DATA_ORIGIN=0x800060
+ DATA_LENGTH=0xffa0
+ EXTRA_EM_FILE=avrelf
+Index: ld/emulparams/avr4.sh
+===================================================================
+RCS file: /cvs/src/src/ld/emulparams/avr4.sh,v
+retrieving revision 1.2
+diff -u -r1.2 avr4.sh
+--- ld/emulparams/avr4.sh	24 May 2006 07:36:11 -0000	1.2
++++ ld/emulparams/avr4.sh	29 Feb 2008 23:39:37 -0000
+@@ -7,5 +7,6 @@
+ TEMPLATE_NAME=elf32
+ 
+ TEXT_LENGTH=8K
++DATA_ORIGIN=0x800060
+ DATA_LENGTH=0xffa0
+ EXTRA_EM_FILE=avrelf
+Index: ld/emulparams/avr5.sh
+===================================================================
+RCS file: /cvs/src/src/ld/emulparams/avr5.sh,v
+retrieving revision 1.2
+diff -u -r1.2 avr5.sh
+--- ld/emulparams/avr5.sh	24 May 2006 07:36:11 -0000	1.2
++++ ld/emulparams/avr5.sh	29 Feb 2008 23:39:37 -0000
+@@ -7,5 +7,6 @@
+ TEMPLATE_NAME=elf32
+ 
+ TEXT_LENGTH=128K
++DATA_ORIGIN=0x800060
+ DATA_LENGTH=0xffa0
+ EXTRA_EM_FILE=avrelf
+Index: ld/emulparams/avr6.sh
+===================================================================
+RCS file: /cvs/src/src/ld/emulparams/avr6.sh,v
+retrieving revision 1.1
+diff -u -r1.1 avr6.sh
+--- ld/emulparams/avr6.sh	24 May 2006 07:36:11 -0000	1.1
++++ ld/emulparams/avr6.sh	29 Feb 2008 23:39:37 -0000
+@@ -7,5 +7,6 @@
+ TEMPLATE_NAME=elf32
+ 
+ TEXT_LENGTH=1024K
+-DATA_LENGTH=0xffa0
++DATA_ORIGIN=0x800200
++DATA_LENGTH=0xfe00
+ EXTRA_EM_FILE=avrelf
+--- ld/scripttempl/avr.sc.orig	2008-02-19 16:36:36.382765500 -0700
++++ ld/scripttempl/avr.sc	2008-02-19 16:41:07.653804500 -0700
+@@ -5,5 +5,5 @@ OUTPUT_ARCH(${ARCH})
+ MEMORY
+ {
+   text   (rx)   : ORIGIN = 0, LENGTH = $TEXT_LENGTH
+-  data   (rw!x) : ORIGIN = 0x800060, LENGTH = $DATA_LENGTH
++  data   (rw!x) : ORIGIN = $DATA_ORIGIN, LENGTH = $DATA_LENGTH
+   eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
diff --git a/devel/avr-binutils/files/patch-newdevices b/devel/avr-binutils/files/patch-newdevices
index 4fd65f592205..29bc9b68086a 100644
--- a/devel/avr-binutils/files/patch-newdevices
+++ b/devel/avr-binutils/files/patch-newdevices
@@ -1,15 +1,28 @@
 --- gas/config/tc-avr.c.orig	Mon Aug  6 21:59:55 2007
 +++ gas/config/tc-avr.c	Wed Dec 19 12:08:45 2007
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,10 @@
  {
    {"avr1",       AVR_ISA_TINY1,   bfd_mach_avr1},
    {"avr2",       AVR_ISA_TINY2,   bfd_mach_avr2},
 -  {"avr3",       AVR_ISA_M103,    bfd_mach_avr3},
-+  {"avr3",       AVR_ISA_USB162,  bfd_mach_avr3},
++  {"avr3",       AVR_ISA_AVR3,    bfd_mach_avr3},
++  {"avr31",      AVR_ISA_M103,    bfd_mach_avr3},
++  {"avr35",      AVR_ISA_USB162,  bfd_mach_avr3},
    {"avr4",       AVR_ISA_M8,      bfd_mach_avr4},
-   {"avr5",       AVR_ISA_ALL,     bfd_mach_avr5},
+-  {"avr5",       AVR_ISA_ALL,     bfd_mach_avr5},
++  {"avr5",       AVR_ISA_M323,    bfd_mach_avr5},
++  {"avr51",      AVR_ISA_M128,    bfd_mach_avr5},
    {"avr6",       AVR_ISA_ALL,     bfd_mach_avr6},
-@@ -97,22 +97,31 @@
+@@ -84,7 +84,7 @@ static struct mcu_type_s mcu_types[] =
+   {"at90s8515",  AVR_ISA_2xxx,    bfd_mach_avr2},
+   {"at90s8535",  AVR_ISA_2xxx,    bfd_mach_avr2},
+   {"at90c8534",  AVR_ISA_2xxx,    bfd_mach_avr2},
+-  {"at86rf401",  AVR_ISA_2xxx,    bfd_mach_avr2},
++  {"at86rf401",  AVR_ISA_RF401,   bfd_mach_avr2},
+   {"attiny13",   AVR_ISA_TINY2,   bfd_mach_avr2},
+   {"attiny2313", AVR_ISA_TINY2,   bfd_mach_avr2},
+   {"attiny261",  AVR_ISA_TINY2,   bfd_mach_avr2},
+@@ -97,22 +97,32 @@
    {"attiny25",   AVR_ISA_TINY2,   bfd_mach_avr2},
    {"attiny45",   AVR_ISA_TINY2,   bfd_mach_avr2},
    {"attiny85",   AVR_ISA_TINY2,   bfd_mach_avr2},
@@ -23,6 +36,7 @@
    {"at76c711",   AVR_ISA_M603,    bfd_mach_avr3},
 +  {"at90usb82",  AVR_ISA_USB162,  bfd_mach_avr3},
 +  {"at90usb162", AVR_ISA_USB162,  bfd_mach_avr3},
++  {"attiny167",  AVR_ISA_TINY3,   bfd_mach_avr3},
    {"atmega48",   AVR_ISA_PWMx,    bfd_mach_avr4},
 +  {"atmega48p",  AVR_ISA_PWMx,    bfd_mach_avr4},
    {"atmega8",    AVR_ISA_M8,      bfd_mach_avr4},
@@ -72,7 +86,7 @@
    {"atmega645",  AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega649",  AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega6450", AVR_ISA_M323,    bfd_mach_avr5},
-@@ -150,8 +163,8 @@
+@@ -150,8 +163,11 @@
    {"at90can32" , AVR_ISA_M323,    bfd_mach_avr5},
    {"at90can64" , AVR_ISA_M323,    bfd_mach_avr5},
    {"at90can128", AVR_ISA_M128,    bfd_mach_avr5},
@@ -80,6 +94,9 @@
 -  {"at90usb162", AVR_ISA_M323,    bfd_mach_avr5},
 +  {"at90pwm216", AVR_ISA_M323,    bfd_mach_avr5},
 +  {"at90pwm316", AVR_ISA_M323,    bfd_mach_avr5},
++  {"atmega32c1", AVR_ISA_M323,    bfd_mach_avr5},
++  {"atmega32m1", AVR_ISA_M323,    bfd_mach_avr5},
++  {"atmega32u4", AVR_ISA_M323,    bfd_mach_avr5},
    {"at90usb646", AVR_ISA_M323,    bfd_mach_avr5},
    {"at90usb647", AVR_ISA_M323,    bfd_mach_avr5},
    {"at90usb1286",AVR_ISA_M128,    bfd_mach_avr5},
@@ -95,7 +112,7 @@
  Instruction set avr3 is for the classic AVR core with up to 128K program
  memory space (MCU types: atmega103, atmega603, at43usb320, at43usb355,
 -at76c711).
-+at76c711, at90usb82, at90usb162).
++at76c711, at90usb82, at90usb162, attiny167).
  
 -Instruction set avr4 is for the enhanced AVR core with up to 8K program
 -memory space (MCU types: atmega48, atmega8, atmega83, atmega85, atmega88,
@@ -121,18 +138,28 @@
 +atmega3250p, atmega3290, atmega3290p, atmega406, atmega64, atmega640,
 +atmega644, atmega644p, atmega128, atmega1280, atmega1281, atmega1284p, atmega645,
 +atmega649, atmega6450, atmega6490, atmega16hva, at90can32, at90can64,
-+at90can128, at90pwm216, at90pwm316, at90usb646,
++at90can128, at90pwm216, at90pwm316, atmega32c1, atmega32m1, atmega32u4, at90usb646,
  at90usb647, at90usb1286, at90usb1287, at94k).
  
  Instruction set avr6 is for the enhanced AVR core with 256K program
 --- include/opcode/avr.h.orig	Fri Apr  7 17:18:08 2006
 +++ include/opcode/avr.h	Wed Dec 19 12:10:04 2007
-@@ -40,6 +40,8 @@
+@@ -40,12 +40,18 @@
+ #define AVR_ISA_TINY1 (AVR_ISA_1200 | AVR_ISA_LPM)
+ #define AVR_ISA_PWMx  (AVR_ISA_M8   | AVR_ISA_BRK)
+ #define AVR_ISA_2xxx  (AVR_ISA_TINY1 | AVR_ISA_SRAM)
++#define AVR_ISA_RF401 (AVR_ISA_2xxx | AVR_ISA_MOVW | AVR_ISA_LPMX)
+ #define AVR_ISA_TINY2 (AVR_ISA_2xxx | AVR_ISA_MOVW | AVR_ISA_LPMX | \
+                        AVR_ISA_SPM  | AVR_ISA_BRK)
++#define AVR_ISA_TINY3 (AVR_ISA_TINY2 | AVR_ISA_MEGA)
+ #define AVR_ISA_M8    (AVR_ISA_2xxx | AVR_ISA_MUL | AVR_ISA_MOVW | \
                         AVR_ISA_LPMX | AVR_ISA_SPM)
  #define AVR_ISA_M603  (AVR_ISA_2xxx | AVR_ISA_MEGA)
  #define AVR_ISA_M103  (AVR_ISA_M603 | AVR_ISA_ELPM)
 +#define AVR_ISA_USB162 (AVR_ISA_M603 | AVR_ISA_MOVW | \
 +			AVR_ISA_LPMX | AVR_ISA_SPM)
++#define AVR_ISA_AVR3 (AVR_ISA_M603 | AVR_ISA_MOVW | \
++                       AVR_ISA_LPMX | AVR_ISA_SPM  | AVR_ISA_ELPM)
  #define AVR_ISA_M161  (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \
                         AVR_ISA_LPMX | AVR_ISA_SPM)
  #define AVR_ISA_94K   (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | AVR_ISA_LPMX)
diff --git a/devel/avr-binutils/files/patch-newsections b/devel/avr-binutils/files/patch-newsections
index bfbb691a4a8d..a9390104a7c2 100644
--- a/devel/avr-binutils/files/patch-newsections
+++ b/devel/avr-binutils/files/patch-newsections
@@ -5,10 +5,10 @@
  MEMORY
  {
 -  text   (rx)   : ORIGIN = 0, LENGTH = $TEXT_LENGTH
--  data   (rw!x) : ORIGIN = 0x800060, LENGTH = $DATA_LENGTH
+-  data   (rw!x) : ORIGIN = $DATA_ORIGIN, LENGTH = $DATA_LENGTH
 -  eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
 +  text      (rx)   : ORIGIN = 0, LENGTH = $TEXT_LENGTH
-+  data      (rw!x) : ORIGIN = 0x800060, LENGTH = $DATA_LENGTH
++  data      (rw!x) : ORIGIN = $DATA_ORIGIN, LENGTH = $DATA_LENGTH
 +  eeprom    (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
 +  fuse      (rw!x) : ORIGIN = 0x820000, LENGTH = 1K
 +  lock      (rw!x) : ORIGIN = 0x830000, LENGTH = 1K
diff --git a/devel/avr-binutils/files/patch-xmega b/devel/avr-binutils/files/patch-xmega
new file mode 100644
index 000000000000..19953e59daf1
--- /dev/null
+++ b/devel/avr-binutils/files/patch-xmega
@@ -0,0 +1,565 @@
+Not committed
+--------------------------------------------------------------------------------
+--- opcodes/avr-dis.c.orig	2007-08-06 13:58:38.000000000 -0600
++++ opcodes/avr-dis.c	2008-04-09 16:37:17.233737600 -0600
+@@ -50,7 +50,7 @@ static const char * comment_start = "0x"
+ 
+ static int
+ avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constraint,
+-             char *buf, char *comment, int regs, int *sym, bfd_vma *sym_addr)
++             char *opcode_str, char *buf, char *comment, int regs, int *sym, bfd_vma *sym_addr)
+ {
+   int ok = 1;
+   *sym = 0;
+@@ -118,8 +118,18 @@ avr_operand (unsigned int insn, unsigned
+ 
+     case 'z':
+       *buf++ = 'Z';
+-      if (insn & 0x1)
+-	*buf++ = '+';
++
++      /* Check for post-increment. */
++      char *s;
++      for (s = opcode_str; *s; ++s)
++        {
++          if (*s == '+')
++            {
++              *buf++ = '+';
++              break;
++            }
++        }
++
+       *buf = '\0';
+       if (AVR_UNDEF_P (insn))
+ 	sprintf (comment, _("undefined"));
+@@ -226,6 +236,10 @@ avr_operand (unsigned int insn, unsigned
+ 	sprintf (comment, "%d", x);
+       }
+       break;
++
++    case 'E':
++      sprintf (buf, "%d", (insn >> 4) & 15);
++      break;
+       
+     case '?':
+       *buf = '\0';
+@@ -331,7 +345,8 @@ print_insn_avr (bfd_vma addr, disassembl
+ 
+   if (opcode->name)
+     {
+-      char *op = opcode->constraints;
++      char *constraints = opcode->constraints;
++      char *opcode_str = opcode->opcode;
+ 
+       insn2 = 0;
+       ok = 1;
+@@ -342,14 +357,14 @@ print_insn_avr (bfd_vma addr, disassembl
+ 	  cmd_len = 4;
+ 	}
+ 
+-      if (*op && *op != '?')
++      if (*constraints && *constraints != '?')
+ 	{
+-	  int regs = REGISTER_P (*op);
++	  int regs = REGISTER_P (*constraints);
+ 
+-	  ok = avr_operand (insn, insn2, addr, *op, op1, comment1, 0, &sym_op1, &sym_addr1);
++	  ok = avr_operand (insn, insn2, addr, *constraints, opcode_str, op1, comment1, 0, &sym_op1, &sym_addr1);
+ 
+-	  if (ok && *(++op) == ',')
+-	    ok = avr_operand (insn, insn2, addr, *(++op), op2,
++	  if (ok && *(++constraints) == ',')
++	    ok = avr_operand (insn, insn2, addr, *(++constraints), opcode_str, op2,
+ 			      *comment1 ? comment2 : comment1, regs, &sym_op2, &sym_addr2);
+ 	}
+     }
+--- gas/config/tc-avr.c.orig	2008-04-09 14:03:00.411627300 -0600
++++ gas/config/tc-avr.c	2008-04-09 16:35:42.382096600 -0600
+@@ -27,20 +27,21 @@
+ 
+ struct avr_opcodes_s
+ {
+-  char *        name;
+-  char *        constraints;
+-  int           insn_size;		/* In words.  */
+-  int           isa;
++  char *name;
++  char *constraints;
++  char *opcode;
++  int insn_size;		/* In words.  */
++  int isa;
+   unsigned int  bin_opcode;
+ };
+ 
+ #define AVR_INSN(NAME, CONSTR, OPCODE, SIZE, ISA, BIN) \
+-{#NAME, CONSTR, SIZE, ISA, BIN},
++{#NAME, CONSTR, OPCODE, SIZE, ISA, BIN},
+ 
+ struct avr_opcodes_s avr_opcodes[] =
+ {
+   #include "opcode/avr.h"
+-  {NULL, NULL, 0, 0, 0}
++  {NULL, NULL, NULL, 0, 0, 0}
+ };
+ 
+ const char comment_chars[] = ";";
+@@ -64,6 +65,13 @@ static struct mcu_type_s mcu_types[] =
+   {"avr51",      AVR_ISA_M128,    bfd_mach_avr5},
+-  {"avr6",       AVR_ISA_ALL,     bfd_mach_avr6},
++  {"avr6",       AVR_ISA_M256,    bfd_mach_avr6},
++  {"avrxmega1",  AVR_ISA_XMEGA,   bfd_mach_avrxmega1},
++  {"avrxmega2",  AVR_ISA_XMEGA,   bfd_mach_avrxmega2},
++  {"avrxmega3",  AVR_ISA_XMEGA,   bfd_mach_avrxmega3},
++  {"avrxmega4",  AVR_ISA_XMEGA,   bfd_mach_avrxmega4},
++  {"avrxmega5",  AVR_ISA_XMEGA,   bfd_mach_avrxmega5},
++  {"avrxmega6",  AVR_ISA_XMEGA,   bfd_mach_avrxmega6},
++  {"avrxmega7",  AVR_ISA_XMEGA,   bfd_mach_avrxmega7},
+   {"at90s1200",  AVR_ISA_1200,    bfd_mach_avr1},
+   {"attiny10",   AVR_ISA_TINY1,   bfd_mach_avr1}, /* XXX -> tn11 */
+   {"attiny11",   AVR_ISA_TINY1,   bfd_mach_avr1},
+   {"attiny12",   AVR_ISA_TINY1,   bfd_mach_avr1},
+@@ -169,8 +180,10 @@ static struct mcu_type_s mcu_types[] =
+   {"at90usb1286",AVR_ISA_M128,    bfd_mach_avr5},
+   {"at90usb1287",AVR_ISA_M128,    bfd_mach_avr5},
+   {"at94k",      AVR_ISA_94K,     bfd_mach_avr5},
+-  {"atmega2560", AVR_ISA_ALL,     bfd_mach_avr6},
+-  {"atmega2561", AVR_ISA_ALL,     bfd_mach_avr6},
++  {"atmega2560", AVR_ISA_M256,    bfd_mach_avr6},
++  {"atmega2561", AVR_ISA_M256,    bfd_mach_avr6},
++  {"atxmega64a1", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
++  {"atxmega128a1", AVR_ISA_XMEGA, bfd_mach_avrxmega3},
+   {NULL, 0, 0}
+ };
+ 
+@@ -804,7 +817,12 @@ avr_operand (struct avr_opcodes_s *opcod
+       if (*str == '+')
+ 	{
+ 	  ++str;
+-	  op_mask |= 1;
++          char *s;
++          for (s = opcode->opcode; *s; ++s)
++            {
++              if (*s == '+')
++                op_mask |= (1 << (15 - (s - opcode->opcode)));
++            }
+ 	}
+ 
+       /* attiny26 can do "lpm" and "lpm r,Z" but not "lpm r,Z+".  */
+@@ -921,6 +939,16 @@ avr_operand (struct avr_opcodes_s *opcod
+       }
+       break;
+ 
++    case 'E':
++      {
++	unsigned int x;
++
++	x = avr_get_constant (str, 15);
++	str = input_line_pointer;
++	op_mask |= (x << 4);
++      }
++      break;
++    
+     case '?':
+       break;
+ 
+--- include/opcode/avr.h.orig	2008-04-09 14:03:00.411627300 -0600
++++ include/opcode/avr.h	2008-04-09 16:34:28.329060900 -0600
+@@ -30,6 +30,8 @@
+ #define AVR_ISA_BRK   0x0400 /* device has BREAK (on-chip debug) */
+ #define AVR_ISA_EIND  0x0800 /* device has >128K program memory (none yet) */
+ #define AVR_ISA_MOVW  0x1000 /* device has MOVW */
++#define AVR_ISA_SPMX  0x2000 /* device has SPM Z[+] */
++#define AVR_ISA_DES   0x4000 /* device has DES */
+ 
+ #define AVR_ISA_TINY1 (AVR_ISA_1200 | AVR_ISA_LPM)
+ #define AVR_ISA_PWMx  (AVR_ISA_M8   | AVR_ISA_BRK)
+@@ -53,6 +55,8 @@
+ #define AVR_ISA_94K   (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | AVR_ISA_LPMX)
+ #define AVR_ISA_M323  (AVR_ISA_M161 | AVR_ISA_BRK)
+ #define AVR_ISA_M128  (AVR_ISA_M323 | AVR_ISA_ELPM | AVR_ISA_ELPMX)
++#define AVR_ISA_M256  (AVR_ISA_M128 | AVR_ISA_EIND)
++#define AVR_ISA_XMEGA (AVR_ISA_M256 | AVR_ISA_SPMX | AVR_ISA_DES)
+ 
+ #define AVR_ISA_ALL   0xFFFF
+ 
+@@ -98,6 +102,7 @@
+    L - signed pc relative offset from -2048 to 2047
+    h - absolute code address (call, jmp)
+    S - immediate value from 0 to 7 (S = s << 4)
++   E - immediate value from 0 to 15, shifted left by 4 (des)
+    ? - use this opcode entry if no parameters, else use next opcode entry
+ 
+    Order is important - some binary opcodes have more than one name,
+@@ -158,7 +163,8 @@ AVR_INSN (reti, "",    "1001010100011000
+ AVR_INSN (sleep,"",    "1001010110001000", 1, AVR_ISA_1200, 0x9588)
+ AVR_INSN (break,"",    "1001010110011000", 1, AVR_ISA_BRK,  0x9598)
+ AVR_INSN (wdr,  "",    "1001010110101000", 1, AVR_ISA_1200, 0x95a8)
+-AVR_INSN (spm,  "",    "1001010111101000", 1, AVR_ISA_SPM,  0x95e8)
++AVR_INSN (spm,  "?",   "1001010111101000", 1, AVR_ISA_SPM,  0x95e8)
++AVR_INSN (spm,  "z",   "10010101111+1000", 1, AVR_ISA_SPMX, 0x95e8)
+ 
+ AVR_INSN (adc,  "r,r", "000111rdddddrrrr", 1, AVR_ISA_1200, 0x1c00)
+ AVR_INSN (add,  "r,r", "000011rdddddrrrr", 1, AVR_ISA_1200, 0x0c00)
+@@ -272,3 +278,6 @@ AVR_INSN (st,   "e,r", "100!001rrrrree-+
+ AVR_INSN (eicall, "",  "1001010100011001", 1, AVR_ISA_EIND, 0x9519)
+ AVR_INSN (eijmp, "",   "1001010000011001", 1, AVR_ISA_EIND, 0x9419)
+ 
++/* DES instruction for encryption and decryption */
++AVR_INSN (des,  "E",   "10010100EEEE1011", 1, AVR_ISA_DES,  0x940B)
++
+Index: bfd/archures.c
+===================================================================
+RCS file: /cvs/src/src/bfd/archures.c,v
+retrieving revision 1.130
+diff -a -u -p -r1.130 archures.c
+--- bfd/archures.c	4 Feb 2008 19:15:50 -0000	1.130
++++ bfd/archures.c	14 Feb 2008 18:01:43 -0000
+@@ -352,6 +352,13 @@ DESCRIPTION
+ .#define bfd_mach_avr4		4
+ .#define bfd_mach_avr5		5
+ .#define bfd_mach_avr6		6
++.#define bfd_mach_avrxmega1 101
++.#define bfd_mach_avrxmega2 102
++.#define bfd_mach_avrxmega3 103
++.#define bfd_mach_avrxmega4 104
++.#define bfd_mach_avrxmega5 105
++.#define bfd_mach_avrxmega6 106
++.#define bfd_mach_avrxmega7 107
+ .  bfd_arch_bfin,        {* ADI Blackfin *}
+ .#define bfd_mach_bfin          1
+ .  bfd_arch_cr16,       {* National Semiconductor CompactRISC (ie CR16). *}
+Index: bfd/cpu-avr.c
+===================================================================
+RCS file: /cvs/src/src/bfd/cpu-avr.c,v
+retrieving revision 1.12
+diff -a -u -p -r1.12 cpu-avr.c
+--- bfd/cpu-avr.c	3 Jul 2007 14:26:40 -0000	1.12
++++ bfd/cpu-avr.c	14 Feb 2008 18:01:43 -0000
+@@ -86,7 +86,29 @@ static const bfd_arch_info_type arch_inf
+   N (22, bfd_mach_avr5, "avr:5", FALSE, & arch_info_struct[5]),
+ 
+   /* ATmega256x.  */
+-  N (22, bfd_mach_avr6, "avr:6", FALSE, NULL)
++  N (22, bfd_mach_avr6, "avr:6", FALSE, & arch_info_struct[6]),
++  
++  /* Xmega 1 */
++  N (24, bfd_mach_avrxmega1, "avr:101", FALSE, & arch_info_struct[7]),
++
++  /* Xmega 2 */
++  N (24, bfd_mach_avrxmega2, "avr:102", FALSE, & arch_info_struct[8]),
++  
++  /* Xmega 3 */
++  N (24, bfd_mach_avrxmega3, "avr:103", FALSE, & arch_info_struct[9]),
++  
++  /* Xmega 4 */
++  N (24, bfd_mach_avrxmega4, "avr:104", FALSE, & arch_info_struct[10]),
++  
++  /* Xmega 5 */
++  N (24, bfd_mach_avrxmega5, "avr:105", FALSE, & arch_info_struct[11]),
++  
++  /* Xmega 6 */
++  N (24, bfd_mach_avrxmega6, "avr:106", FALSE, & arch_info_struct[12]),
++  
++  /* Xmega 7 */
++  N (24, bfd_mach_avrxmega7, "avr:107", FALSE, NULL)
++  
+ };
+ 
+ const bfd_arch_info_type bfd_avr_arch =
+Index: include/elf/avr.h
+===================================================================
+RCS file: /cvs/src/src/include/elf/avr.h,v
+retrieving revision 1.8
+diff -a -u -p -r1.8 avr.h
+--- include/elf/avr.h	24 May 2006 07:36:11 -0000	1.8
++++ include/elf/avr.h	14 Feb 2008 18:01:44 -0000
+@@ -35,7 +35,14 @@
+ #define E_AVR_MACH_AVR3 3
+ #define E_AVR_MACH_AVR4 4
+ #define E_AVR_MACH_AVR5 5
+-#define E_AVR_MACH_AVR6 6 
++#define E_AVR_MACH_AVR6 6
++#define E_AVR_MACH_XMEGA1 101
++#define E_AVR_MACH_XMEGA2 102
++#define E_AVR_MACH_XMEGA3 103
++#define E_AVR_MACH_XMEGA4 104
++#define E_AVR_MACH_XMEGA5 105
++#define E_AVR_MACH_XMEGA6 106
++#define E_AVR_MACH_XMEGA7 107
+ 
+ /* Relocations.  */
+ START_RELOC_NUMBERS (elf_avr_reloc_type)
+Index: ld/Makefile.am
+===================================================================
+RCS file: /cvs/src/src/ld/Makefile.am,v
+retrieving revision 1.244
+diff -a -u -p -r1.244 Makefile.am
+--- ld/Makefile.am	24 Oct 2007 04:56:47 -0000	1.244
++++ ld/Makefile.am	14 Feb 2008 18:01:45 -0000
+@@ -138,6 +138,13 @@ ALL_EMULATIONS = \
+ 	eavr4.o \
+ 	eavr5.o \
+ 	eavr6.o \
++	eavrxmega1.o \
++	eavrxmega2.o \
++	eavrxmega3.o \
++	eavrxmega4.o \
++	eavrxmega5.o \
++	eavrxmega6.o \
++	eavrxmega7.o \
+ 	ecoff_i860.o \
+ 	ecoff_sparc.o \
+ 	eelf32_spu.o \
+@@ -622,6 +629,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
+   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
+   ${GEN_DEPENDS}
+ 	${GENSCRIPTS} avr6 "$(tdir_avr2)"
++eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
++eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
++eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
++eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
++eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
++eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
++eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
+ ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
+   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
+Index: ld/Makefile.in
+===================================================================
+RCS file: /cvs/src/src/ld/Makefile.in,v
+retrieving revision 1.262
+diff -a -u -p -r1.262 Makefile.in
+--- ld/Makefile.in	24 Oct 2007 04:56:47 -0000	1.262
++++ ld/Makefile.in	14 Feb 2008 18:01:45 -0000
+@@ -385,6 +385,13 @@ ALL_EMULATIONS = \
+ 	eavr4.o \
+ 	eavr5.o \
+ 	eavr6.o \
++	eavrxmega1.o \
++	eavrxmega2.o \
++	eavrxmega3.o \
++	eavrxmega4.o \
++	eavrxmega5.o \
++	eavrxmega6.o \
++	eavrxmega7.o \
+ 	ecoff_i860.o \
+ 	ecoff_sparc.o \
+ 	eelf32_spu.o \
+@@ -1448,6 +1455,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
+   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
+   ${GEN_DEPENDS}
+ 	${GENSCRIPTS} avr6 "$(tdir_avr2)"
++eavrxmega1.c: $(srcdir)/emulparams/avrxmega1.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega1 "$(tdir_avr2)"
++eavrxmega2.c: $(srcdir)/emulparams/avrxmega2.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega2 "$(tdir_avr2)"
++eavrxmega3.c: $(srcdir)/emulparams/avrxmega3.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega3 "$(tdir_avr2)"
++eavrxmega4.c: $(srcdir)/emulparams/avrxmega4.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega4 "$(tdir_avr2)"
++eavrxmega5.c: $(srcdir)/emulparams/avrxmega5.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega5 "$(tdir_avr2)"
++eavrxmega6.c: $(srcdir)/emulparams/avrxmega6.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega6 "$(tdir_avr2)"
++eavrxmega7.c: $(srcdir)/emulparams/avrxmega7.sh \
++  $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
++  ${GEN_DEPENDS}
++	${GENSCRIPTS} avrxmega7 "$(tdir_avr2)"
+ ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
+   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
+Index: ld/configure.tgt
+===================================================================
+RCS file: /cvs/src/src/ld/configure.tgt,v
+retrieving revision 1.217
+diff -a -u -p -r1.217 configure.tgt
+--- ld/configure.tgt	1 Feb 2008 17:58:48 -0000	1.217
++++ ld/configure.tgt	14 Feb 2008 18:01:45 -0000
+@@ -107,7 +107,7 @@ xscale-*-coff)		targ_emul=armcoff ;;
+ xscale-*-elf)		targ_emul=armelf
+ 			;;
+ avr-*-*)		targ_emul=avr2
+-			targ_extra_emuls="avr1 avr3 avr4 avr5 avr6"
++			targ_extra_emuls="avr1 avr3 avr4 avr5 avr6 avrxmega1 avrxmega2 avrxmega3 avrxmega4 avrxmega5 avrxmega6 avrxmega7"
+ 			;;
+ bfin-*-elf)		targ_emul=elf32bfin;
+ 			targ_extra_emuls="elf32bfinfd"
+Index: ld/emultempl/avrelf.em
+===================================================================
+RCS file: /cvs/src/src/ld/emultempl/avrelf.em,v
+retrieving revision 1.5
+diff -a -u -p -r1.5 avrelf.em
+--- ld/emultempl/avrelf.em	17 Aug 2007 13:50:48 -0000	1.5
++++ ld/emultempl/avrelf.em	14 Feb 2008 18:01:45 -0000
+@@ -71,8 +71,15 @@ avr_elf_${EMULATION_NAME}_before_allocat
+ 
+   gld${EMULATION_NAME}_before_allocation ();
+ 
+-  /* We only need stubs for the avr6 family.  */
+-  if (strcmp ("${EMULATION_NAME}","avr6"))
++  /* We only need stubs for the avr6 and avrxmega* family.  */
++  if (strcmp ("${EMULATION_NAME}","avr6") 
++      && strcmp ("${EMULATION_NAME}","avrxmega1") 
++      && strcmp ("${EMULATION_NAME}","avrxmega2")
++      && strcmp ("${EMULATION_NAME}","avrxmega3")
++      && strcmp ("${EMULATION_NAME}","avrxmega4")
++      && strcmp ("${EMULATION_NAME}","avrxmega5")
++      && strcmp ("${EMULATION_NAME}","avrxmega6")
++      && strcmp ("${EMULATION_NAME}","avrxmega7") )
+     avr_no_stubs = TRUE;
+ 
+   avr_elf_set_global_bfd_parameters ();
+--- /dev/null	2008-02-14 11:03:14.488602600 -0700
++++ ld/emulparams/avrxmega1.sh	2008-02-14 09:08:29.531250000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:101
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- /dev/null	2008-02-14 11:03:18.394502600 -0700
++++ ld/emulparams/avrxmega2.sh	2008-02-14 09:08:29.546875000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:102
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- /dev/null	2008-02-14 11:03:22.050425000 -0700
++++ ld/emulparams/avrxmega3.sh	2008-02-14 09:08:29.546875000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:103
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- /dev/null	2008-02-14 11:03:25.784465400 -0700
++++ ld/emulparams/avrxmega4.sh	2008-02-14 09:08:29.546875000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:104
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- /dev/null	2008-02-14 11:03:25.784465400 -0700
++++ ld/emulparams/avrxmega5.sh	2008-02-14 09:08:29.546875000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:105
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- /dev/null	2008-02-14 11:03:25.784465400 -0700
++++ ld/emulparams/avrxmega6.sh	2008-02-14 09:08:29.546875000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:106
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- /dev/null	2008-02-14 11:03:25.784465400 -0700
++++ ld/emulparams/avrxmega7.sh	2008-02-14 09:08:29.546875000 -0700
+@@ -0,0 +1,12 @@
++ARCH=avr:107
++MACHINE=
++SCRIPT_NAME=avr
++OUTPUT_FORMAT="elf32-avr"
++MAXPAGESIZE=1
++EMBEDDED=yes
++TEMPLATE_NAME=elf32
++
++TEXT_LENGTH=1024K
++DATA_ORIGIN=0x802000
++DATA_LENGTH=0xffa0
++EXTRA_EM_FILE=avrelf
+--- bfd/bfd-in2.h~	2007-08-06 21:59:15.000000000 +0200
++++ bfd/bfd-in2.h	2008-07-22 17:55:46.000000000 +0200
+@@ -2017,6 +2017,13 @@
+ #define bfd_mach_avr4          4
+ #define bfd_mach_avr5          5
+ #define bfd_mach_avr6          6
++#define bfd_mach_avrxmega1 101
++#define bfd_mach_avrxmega2 102
++#define bfd_mach_avrxmega3 103
++#define bfd_mach_avrxmega4 104
++#define bfd_mach_avrxmega5 105
++#define bfd_mach_avrxmega6 106
++#define bfd_mach_avrxmega7 107
+   bfd_arch_bfin,        /* ADI Blackfin */
+ #define bfd_mach_bfin          1
+   bfd_arch_cr16,       /* National Semiconductor CompactRISC (ie CR16). */
diff --git a/devel/avr-binutils/pkg-descr b/devel/avr-binutils/pkg-descr
index b275ea71ba7f..4e1e878472cb 100644
--- a/devel/avr-binutils/pkg-descr
+++ b/devel/avr-binutils/pkg-descr
@@ -10,12 +10,11 @@ http://www.sax.de/~joerg/README.coff-avr-patch
 In addition to the stock binutils-2.18 distribution, support for the
 following AVR devices has been added by a private patch:
 
-  ATtiny43U
-  ATtiny48/88
-  AT90PWM2B/PWM3B
-  AT90PWM216/PWM316
+  ATtiny43U, ATtiny48/88, ATtiny167
+  AT90PWM2B/PWM3B, AT90PWM216/PWM316
+  ATmega32C1, ATmega32M1, ATmega32U4
   ATmega48P/88P/168P/328P
-  ATmega32HVB
-  ATmega1284P
+  ATmega32HVB, ATmega1284P
+  ATxmega64A1, ATxmega128A1
 
 WWW: http://www.sourceware.org/binutils/