packages: crossavr-binutils/crossavr-binutils.spec, crossavr-binutils/cross...

bszx bszx at pld-linux.org
Sat Jun 18 22:33:06 CEST 2011


Author: bszx                         Date: Sat Jun 18 20:33:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.21

---- Files affected:
packages/crossavr-binutils:
   crossavr-binutils.spec (1.36 -> 1.37) , crossavr-binutils-xmega.patch (1.2 -> 1.3) , crossavr-binutils-avr-size.patch (1.2 -> 1.3) , crossavr-binutils-avr-coff.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/crossavr-binutils/crossavr-binutils.spec
diff -u packages/crossavr-binutils/crossavr-binutils.spec:1.36 packages/crossavr-binutils/crossavr-binutils.spec:1.37
--- packages/crossavr-binutils/crossavr-binutils.spec:1.36	Wed Feb  2 17:12:02 2011
+++ packages/crossavr-binutils/crossavr-binutils.spec	Sat Jun 18 22:33:00 2011
@@ -6,17 +6,16 @@
 Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - AVR binutils
 Summary(tr.UTF-8):	GNU geliştirme araçları - AVR binutils
 Name:		crossavr-binutils
-Version:	2.20.1
+Version:	2.21
 Release:	1
 License:	GPL
 Group:		Development/Tools
 Source0:	ftp://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
-# Source0-md5:	9cdfb9d6ec0578c166d3beae5e15c4e5
+# Source0-md5:	c84c5acc9d266f1a7044b51c85a823f5
 Patch0:		%{name}-avr-size.patch
 Patch1:		%{name}-avr-coff.patch
 Patch2:		%{name}-new-sections.patch
 Patch3:		%{name}-xmega.patch
-Patch4:		%{name}-new-devices.patch
 URL:		http://sources.redhat.com/binutils/
 BuildRequires:	automake
 BuildRequires:	bash
@@ -60,10 +59,9 @@
 %prep
 %setup -q -n binutils-%{version}
 %patch0 -p0
-%patch1 -p0
+%patch1 -p1
 %patch2 -p0
-%patch3 -p0
-%patch4 -p0
+%patch3 -p1
 
 %build
 cp /usr/share/automake/config.sub .
@@ -137,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2011/06/18 20:33:00  bszx
+- updated to 2.21
+
 Revision 1.36  2011/02/02 16:12:02  sparky
 - BR: perl-tools-pod
 

================================================================
Index: packages/crossavr-binutils/crossavr-binutils-xmega.patch
diff -u packages/crossavr-binutils/crossavr-binutils-xmega.patch:1.2 packages/crossavr-binutils/crossavr-binutils-xmega.patch:1.3
--- packages/crossavr-binutils/crossavr-binutils-xmega.patch:1.2	Thu Oct  7 19:21:14 2010
+++ packages/crossavr-binutils/crossavr-binutils-xmega.patch	Sat Jun 18 22:33:00 2011
@@ -1,7 +1,7 @@
-diff -Nur ../binutils-2.20.orig/bfd/archures.c ./bfd/archures.c
---- ../binutils-2.20.orig/bfd/archures.c	2009-09-10 13:47:11.000000000 +0200
-+++ ./bfd/archures.c	2010-03-04 11:34:08.000000000 +0100
-@@ -368,6 +368,13 @@
+diff -uNdr binutils-2.21-orig.2/bfd/archures.c binutils-2.21/bfd/archures.c
+--- binutils-2.21-orig.2/bfd/archures.c	2010-07-23 16:52:46.000000000 +0200
++++ binutils-2.21/bfd/archures.c	2011-06-17 18:29:41.000000000 +0200
+@@ -373,6 +373,13 @@
  .#define bfd_mach_avr5		5
  .#define bfd_mach_avr51		51
  .#define bfd_mach_avr6		6
@@ -15,10 +15,10 @@
  .  bfd_arch_bfin,        {* ADI Blackfin *}
  .#define bfd_mach_bfin          1
  .  bfd_arch_cr16,       {* National Semiconductor CompactRISC (ie CR16). *}
-diff -Nur ../binutils-2.20.orig/bfd/bfd-in2.h ./bfd/bfd-in2.h
---- ../binutils-2.20.orig/bfd/bfd-in2.h	2009-09-10 13:47:11.000000000 +0200
-+++ ./bfd/bfd-in2.h	2010-03-04 11:34:08.000000000 +0100
-@@ -2035,6 +2035,13 @@
+diff -uNdr binutils-2.21-orig.2/bfd/bfd-in2.h binutils-2.21/bfd/bfd-in2.h
+--- binutils-2.21-orig.2/bfd/bfd-in2.h	2010-11-03 03:31:02.000000000 +0100
++++ binutils-2.21/bfd/bfd-in2.h	2011-06-17 18:29:41.000000000 +0200
+@@ -2053,6 +2053,13 @@
  #define bfd_mach_avr5          5
  #define bfd_mach_avr51         51
  #define bfd_mach_avr6          6
@@ -32,9 +32,9 @@
    bfd_arch_bfin,        /* ADI Blackfin */
  #define bfd_mach_bfin          1
    bfd_arch_cr16,       /* National Semiconductor CompactRISC (ie CR16). */
-diff -Nur ../binutils-2.20.orig/bfd/cpu-avr.c ./bfd/cpu-avr.c
---- ../binutils-2.20.orig/bfd/cpu-avr.c	2009-09-02 09:18:36.000000000 +0200
-+++ ./bfd/cpu-avr.c	2010-03-04 11:34:08.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/bfd/cpu-avr.c binutils-2.21/bfd/cpu-avr.c
+--- binutils-2.21-orig.2/bfd/cpu-avr.c	2009-09-02 09:18:36.000000000 +0200
++++ binutils-2.21/bfd/cpu-avr.c	2011-06-17 18:29:41.000000000 +0200
 @@ -133,7 +133,29 @@
    N (22, bfd_mach_avr51, "avr:51", FALSE, & arch_info_struct[9]),
  
@@ -66,10 +66,10 @@
  };
  
  const bfd_arch_info_type bfd_avr_arch =
-diff -Nur ../binutils-2.20.orig/bfd/elf32-avr.c ./bfd/elf32-avr.c
---- ../binutils-2.20.orig/bfd/elf32-avr.c	2009-09-02 09:18:36.000000000 +0200
-+++ ./bfd/elf32-avr.c	2010-03-04 11:34:08.000000000 +0100
-@@ -1328,6 +1328,34 @@
+diff -uNdr binutils-2.21-orig.2/bfd/elf32-avr.c binutils-2.21/bfd/elf32-avr.c
+--- binutils-2.21-orig.2/bfd/elf32-avr.c	2010-10-25 17:54:13.000000000 +0200
++++ binutils-2.21/bfd/elf32-avr.c	2011-06-17 18:29:41.000000000 +0200
+@@ -1340,6 +1340,34 @@
      case bfd_mach_avr6:
        val = E_AVR_MACH_AVR6;
        break;
@@ -104,7 +104,7 @@
      }
  
    elf_elfheader (abfd)->e_machine = EM_AVR;
-@@ -1390,6 +1418,34 @@
+@@ -1402,6 +1430,34 @@
  	case E_AVR_MACH_AVR6:
  	  e_set = bfd_mach_avr6;
  	  break;
@@ -139,9 +139,9 @@
  	}
      }
    return bfd_default_set_arch_mach (abfd, bfd_arch_avr,
-diff -Nur ../binutils-2.20.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
---- ../binutils-2.20.orig/gas/config/tc-avr.c	2010-03-04 11:19:26.000000000 +0100
-+++ ./gas/config/tc-avr.c	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/gas/config/tc-avr.c binutils-2.21/gas/config/tc-avr.c
+--- binutils-2.21-orig.2/gas/config/tc-avr.c	2010-06-28 16:06:57.000000000 +0200
++++ binutils-2.21/gas/config/tc-avr.c	2011-06-17 18:29:41.000000000 +0200
 @@ -27,20 +27,21 @@
  
  struct avr_opcodes_s
@@ -184,8 +184,8 @@
    {"at90s1200",  AVR_ISA_1200,    bfd_mach_avr1},
    {"attiny11",   AVR_ISA_AVR1,    bfd_mach_avr1},
    {"attiny12",   AVR_ISA_AVR1,    bfd_mach_avr1},
-@@ -241,6 +249,21 @@
-   {"m3001b",     AVR_ISA_AVR51,   bfd_mach_avr51},
+@@ -237,6 +245,21 @@
+   {"at90usb1287",AVR_ISA_AVR51,   bfd_mach_avr51},
    {"atmega2560", AVR_ISA_AVR6,    bfd_mach_avr6},
    {"atmega2561", AVR_ISA_AVR6,    bfd_mach_avr6},
 +  {"atxmega16a4", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
@@ -206,7 +206,7 @@
    {NULL, 0, 0}
  };
  
-@@ -418,6 +441,11 @@
+@@ -413,6 +436,11 @@
  	"                   avr5  - enhanced AVR core with up to 64K program memory\n"
  	"                   avr51 - enhanced AVR core with up to 128K program memory\n"
  	"                   avr6  - enhanced AVR core with up to 256K program memory\n"
@@ -218,7 +218,7 @@
  	"                   or immediate microcontroller name.\n"));
    fprintf (stream,
        _("  -mall-opcodes    accept all AVR opcodes, even if not supported by MCU\n"
-@@ -845,7 +873,12 @@
+@@ -840,7 +868,12 @@
        if (*str == '+')
  	{
  	  ++str;
@@ -232,7 +232,7 @@
  	}
  
        /* attiny26 can do "lpm" and "lpm r,Z" but not "lpm r,Z+".  */
-@@ -962,6 +995,16 @@
+@@ -957,6 +990,16 @@
        }
        break;
  
@@ -249,10 +249,10 @@
      case '?':
        break;
  
-diff -Nur ../binutils-2.20.orig/gas/doc/c-avr.texi ./gas/doc/c-avr.texi
---- ../binutils-2.20.orig/gas/doc/c-avr.texi	2010-03-04 11:19:26.000000000 +0100
-+++ ./gas/doc/c-avr.texi	2010-03-04 11:34:09.000000000 +0100
-@@ -86,6 +86,27 @@
+diff -uNdr binutils-2.21-orig.2/gas/doc/c-avr.texi binutils-2.21/gas/doc/c-avr.texi
+--- binutils-2.21-orig.2/gas/doc/c-avr.texi	2010-04-09 05:48:54.000000000 +0200
++++ binutils-2.21/gas/doc/c-avr.texi	2011-06-17 18:29:41.000000000 +0200
+@@ -85,6 +85,27 @@
  Instruction set avr6 is for the enhanced AVR core with a 3-byte PC (MCU types:
  atmega2560, atmega2561).
  
@@ -280,9 +280,9 @@
  @cindex @code{-mall-opcodes} command line option, AVR
  @item -mall-opcodes
  Accept all AVR opcodes, even if not supported by @code{-mmcu}.
-diff -Nur ../binutils-2.20.orig/include/elf/avr.h ./include/elf/avr.h
---- ../binutils-2.20.orig/include/elf/avr.h	2008-08-09 07:35:13.000000000 +0200
-+++ ./include/elf/avr.h	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/include/elf/avr.h binutils-2.21/include/elf/avr.h
+--- binutils-2.21-orig.2/include/elf/avr.h	2010-04-15 12:26:08.000000000 +0200
++++ binutils-2.21/include/elf/avr.h	2011-06-17 18:29:41.000000000 +0200
 @@ -40,6 +40,13 @@
  #define E_AVR_MACH_AVR5 5
  #define E_AVR_MACH_AVR51 51
@@ -297,10 +297,10 @@
  
  /* Relocations.  */
  START_RELOC_NUMBERS (elf_avr_reloc_type)
-diff -Nur ../binutils-2.20.orig/include/opcode/avr.h ./include/opcode/avr.h
---- ../binutils-2.20.orig/include/opcode/avr.h	2008-08-09 07:35:13.000000000 +0200
-+++ ./include/opcode/avr.h	2010-03-04 11:34:09.000000000 +0100
-@@ -30,6 +30,8 @@
+diff -uNdr binutils-2.21-orig.2/include/opcode/avr.h binutils-2.21/include/opcode/avr.h
+--- binutils-2.21-orig.2/include/opcode/avr.h	2010-04-15 12:26:09.000000000 +0200
++++ binutils-2.21/include/opcode/avr.h	2011-06-17 18:29:41.000000000 +0200
+@@ -31,6 +31,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 */
@@ -309,7 +309,7 @@
  
  #define AVR_ISA_TINY1 (AVR_ISA_1200 | AVR_ISA_LPM)
  #define AVR_ISA_2xxx  (AVR_ISA_TINY1 | AVR_ISA_SRAM)
-@@ -48,6 +50,8 @@
+@@ -49,6 +51,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)
@@ -318,7 +318,7 @@
  
  #define AVR_ISA_AVR1   AVR_ISA_TINY1
  #define AVR_ISA_AVR2   AVR_ISA_2xxx
-@@ -108,6 +112,7 @@
+@@ -109,6 +113,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)
@@ -326,7 +326,7 @@
     ? - use this opcode entry if no parameters, else use next opcode entry
  
     Order is important - some binary opcodes have more than one name,
-@@ -168,7 +173,8 @@
+@@ -169,7 +174,8 @@
  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)
@@ -336,20 +336,20 @@
  
  AVR_INSN (adc,  "r,r", "000111rdddddrrrr", 1, AVR_ISA_1200, 0x1c00)
  AVR_INSN (add,  "r,r", "000011rdddddrrrr", 1, AVR_ISA_1200, 0x0c00)
-@@ -282,3 +288,6 @@
+@@ -283,3 +289,6 @@
  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)
 +
-diff -Nur ../binutils-2.20.orig/ld/Makefile.am ./ld/Makefile.am
---- ../binutils-2.20.orig/ld/Makefile.am	2009-09-01 22:56:51.000000000 +0200
-+++ ./ld/Makefile.am	2010-03-04 11:34:09.000000000 +0100
-@@ -148,6 +148,13 @@
- 	eavr5.o \
- 	eavr51.o \
- 	eavr6.o \
+diff -uNdr binutils-2.21-orig.2/ld/Makefile.am binutils-2.21/ld/Makefile.am
+--- binutils-2.21-orig.2/ld/Makefile.am	2010-11-03 04:22:01.000000000 +0100
++++ binutils-2.21/ld/Makefile.am	2011-06-17 18:32:58.000000000 +0200
+@@ -162,6 +162,13 @@
+ 	eavr5.c \
+ 	eavr51.c \
+ 	eavr6.c \
 +	eavrxmega1.o \
 +	eavrxmega2.o \
 +	eavrxmega3.o \
@@ -357,10 +357,10 @@
 +	eavrxmega5.o \
 +	eavrxmega6.o \
 +	eavrxmega7.o \
- 	ecoff_i860.o \
- 	ecoff_sparc.o \
- 	eelf32_spu.o \
-@@ -727,6 +734,34 @@
+ 	ecoff_i860.c \
+ 	ecoff_sparc.c \
+ 	eelf32_spu.c \
+@@ -760,6 +767,34 @@
    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
  	${GENSCRIPTS} avr6 "$(tdir_avr2)"
@@ -395,13 +395,13 @@
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
-diff -Nur ../binutils-2.20.orig/ld/Makefile.in ./ld/Makefile.in
---- ../binutils-2.20.orig/ld/Makefile.in	2009-09-07 14:10:24.000000000 +0200
-+++ ./ld/Makefile.in	2010-03-04 11:34:09.000000000 +0100
-@@ -434,6 +434,13 @@
- 	eavr5.o \
- 	eavr51.o \
- 	eavr6.o \
+diff -uNdr binutils-2.21-orig.2/ld/Makefile.in binutils-2.21/ld/Makefile.in
+--- binutils-2.21-orig.2/ld/Makefile.in	2010-11-05 11:34:22.000000000 +0100
++++ binutils-2.21/ld/Makefile.in	2011-06-17 18:33:50.000000000 +0200
+@@ -462,6 +462,13 @@
+ 	eavr5.c \
+ 	eavr51.c \
+ 	eavr6.c \
 +	eavrxmega1.o \
 +	eavrxmega2.o \
 +	eavrxmega3.o \
@@ -409,10 +409,10 @@
 +	eavrxmega5.o \
 +	eavrxmega6.o \
 +	eavrxmega7.o \
- 	ecoff_i860.o \
- 	ecoff_sparc.o \
- 	eelf32_spu.o \
-@@ -2068,6 +2075,34 @@
+ 	ecoff_i860.c \
+ 	ecoff_sparc.c \
+ 	eelf32_spu.c \
+@@ -2183,6 +2190,34 @@
    $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
  	${GENSCRIPTS} avr6 "$(tdir_avr2)"
@@ -447,10 +447,10 @@
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
-diff -Nur ../binutils-2.20.orig/ld/configure.tgt ./ld/configure.tgt
---- ../binutils-2.20.orig/ld/configure.tgt	2009-08-06 19:38:03.000000000 +0200
-+++ ./ld/configure.tgt	2010-03-04 11:34:09.000000000 +0100
-@@ -110,7 +110,7 @@
+diff -uNdr binutils-2.21-orig.2/ld/configure.tgt binutils-2.21/ld/configure.tgt
+--- binutils-2.21-orig.2/ld/configure.tgt	2010-12-01 12:03:47.000000000 +0100
++++ binutils-2.21/ld/configure.tgt	2011-06-17 18:29:41.000000000 +0200
+@@ -111,7 +111,7 @@
  xscale-*-elf)		targ_emul=armelf
  			;;
  avr-*-*)		targ_emul=avr2
@@ -459,9 +459,9 @@
  			;;
  bfin-*-elf)		targ_emul=elf32bfin;
  			targ_extra_emuls="elf32bfinfd"
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega1.sh ./ld/emulparams/avrxmega1.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega1.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega1.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega1.sh binutils-2.21/ld/emulparams/avrxmega1.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega1.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega1.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:101
 +MACHINE=
@@ -475,9 +475,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega2.sh ./ld/emulparams/avrxmega2.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega2.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega2.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega2.sh binutils-2.21/ld/emulparams/avrxmega2.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega2.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega2.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:102
 +MACHINE=
@@ -491,9 +491,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega3.sh ./ld/emulparams/avrxmega3.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega3.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega3.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega3.sh binutils-2.21/ld/emulparams/avrxmega3.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega3.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega3.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:103
 +MACHINE=
@@ -507,9 +507,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega4.sh ./ld/emulparams/avrxmega4.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega4.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega4.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega4.sh binutils-2.21/ld/emulparams/avrxmega4.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega4.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega4.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:104
 +MACHINE=
@@ -523,9 +523,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega5.sh ./ld/emulparams/avrxmega5.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega5.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega5.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega5.sh binutils-2.21/ld/emulparams/avrxmega5.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega5.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega5.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:105
 +MACHINE=
@@ -539,9 +539,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega6.sh ./ld/emulparams/avrxmega6.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega6.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega6.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega6.sh binutils-2.21/ld/emulparams/avrxmega6.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega6.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega6.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:106
 +MACHINE=
@@ -555,9 +555,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emulparams/avrxmega7.sh ./ld/emulparams/avrxmega7.sh
---- ../binutils-2.20.orig/ld/emulparams/avrxmega7.sh	1970-01-01 01:00:00.000000000 +0100
-+++ ./ld/emulparams/avrxmega7.sh	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emulparams/avrxmega7.sh binutils-2.21/ld/emulparams/avrxmega7.sh
+--- binutils-2.21-orig.2/ld/emulparams/avrxmega7.sh	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/ld/emulparams/avrxmega7.sh	2011-06-17 18:29:41.000000000 +0200
 @@ -0,0 +1,12 @@
 +ARCH=avr:107
 +MACHINE=
@@ -571,9 +571,9 @@
 +DATA_ORIGIN=0x802000
 +DATA_LENGTH=0xffa0
 +EXTRA_EM_FILE=avrelf
-diff -Nur ../binutils-2.20.orig/ld/emultempl/avrelf.em ./ld/emultempl/avrelf.em
---- ../binutils-2.20.orig/ld/emultempl/avrelf.em	2009-09-02 09:25:35.000000000 +0200
-+++ ./ld/emultempl/avrelf.em	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/ld/emultempl/avrelf.em binutils-2.21/ld/emultempl/avrelf.em
+--- binutils-2.21-orig.2/ld/emultempl/avrelf.em	2009-11-26 14:45:25.000000000 +0100
++++ binutils-2.21/ld/emultempl/avrelf.em	2011-06-17 18:29:41.000000000 +0200
 @@ -71,8 +71,10 @@
  
    gld${EMULATION_NAME}_before_allocation ();
@@ -587,9 +587,9 @@
      avr_no_stubs = TRUE;
  
    avr_elf_set_global_bfd_parameters ();
-diff -Nur ../binutils-2.20.orig/opcodes/avr-dis.c ./opcodes/avr-dis.c
---- ../binutils-2.20.orig/opcodes/avr-dis.c	2008-11-06 13:03:24.000000000 +0100
-+++ ./opcodes/avr-dis.c	2010-03-04 11:34:09.000000000 +0100
+diff -uNdr binutils-2.21-orig.2/opcodes/avr-dis.c binutils-2.21/opcodes/avr-dis.c
+--- binutils-2.21-orig.2/opcodes/avr-dis.c	2008-11-06 13:03:24.000000000 +0100
++++ binutils-2.21/opcodes/avr-dis.c	2011-06-17 18:29:41.000000000 +0200
 @@ -50,7 +50,7 @@
  
  static int

================================================================
Index: packages/crossavr-binutils/crossavr-binutils-avr-size.patch
diff -u packages/crossavr-binutils/crossavr-binutils-avr-size.patch:1.2 packages/crossavr-binutils/crossavr-binutils-avr-size.patch:1.3
--- packages/crossavr-binutils/crossavr-binutils-avr-size.patch:1.2	Sun Apr  5 13:48:28 2009
+++ packages/crossavr-binutils/crossavr-binutils-avr-size.patch	Sat Jun 18 22:33:00 2011
@@ -347,9 +347,9 @@
 +  int rammax = 0;
 +  int eeprommax = 0;
 +  asection *section; 
-+  bfd_size_type datasize = 0;
-+  bfd_size_type textsize = 0;
-+  bfd_size_type bsssize = 0;
++  bfd_size_type avr_datasize = 0;
++  bfd_size_type avr_textsize = 0;
++  bfd_size_type avr_bsssize = 0;
 +  bfd_size_type bootloadersize = 0;
 +  bfd_size_type noinitsize = 0;
 +  bfd_size_type eepromsize = 0;
@@ -364,11 +364,11 @@
 +  }
 +
 +  if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
-+    datasize = bfd_section_size (file, section);
++    avr_datasize = bfd_section_size (file, section);
 +  if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
-+    textsize = bfd_section_size (file, section);
++    avr_textsize = bfd_section_size (file, section);
 +  if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
-+    bsssize = bfd_section_size (file, section);
++    avr_bsssize = bfd_section_size (file, section);
 +  if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
 +    bootloadersize = bfd_section_size (file, section);
 +  if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
@@ -376,8 +376,8 @@
 +  if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
 +    eepromsize = bfd_section_size (file, section);
 +  
-+  bfd_size_type text = textsize + datasize + bootloadersize;
-+  bfd_size_type data = datasize + bsssize + noinitsize;
++  bfd_size_type text = avr_textsize + avr_datasize + bootloadersize;
++  bfd_size_type data = avr_datasize + avr_bsssize + noinitsize;
 +  bfd_size_type eeprom = eepromsize;
 +  
 +  printf ("AVR Memory Usage\n"

================================================================
Index: packages/crossavr-binutils/crossavr-binutils-avr-coff.patch
diff -u packages/crossavr-binutils/crossavr-binutils-avr-coff.patch:1.2 packages/crossavr-binutils/crossavr-binutils-avr-coff.patch:1.3
--- packages/crossavr-binutils/crossavr-binutils-avr-coff.patch:1.2	Thu Oct  7 19:21:14 2010
+++ packages/crossavr-binutils/crossavr-binutils-avr-coff.patch	Sat Jun 18 22:33:00 2011
@@ -1,7 +1,7 @@
-diff -Nruw bfd/Makefile.am bfd/Makefile.am
---- bfd/Makefile.am	2009-10-16 17:17:44.000000000 +0530
-+++ bfd/Makefile.am	2010-02-11 10:59:11.320193800 +0530
-@@ -228,6 +228,8 @@
+diff -uNdr binutils-2.21-orig.0/bfd/Makefile.am binutils-2.21/bfd/Makefile.am
+--- binutils-2.21-orig.0/bfd/Makefile.am	2010-12-08 09:37:33.000000000 +0100
++++ binutils-2.21/bfd/Makefile.am	2011-06-17 18:17:52.000000000 +0200
+@@ -232,6 +232,8 @@
  	coff-apollo.lo \
  	coff-arm.lo \
  	coff-aux.lo \
@@ -10,7 +10,7 @@
  	coff-go32.lo \
  	coff-h8300.lo \
  	coff-h8500.lo \
-@@ -411,6 +413,8 @@
+@@ -413,6 +415,8 @@
  	coff-apollo.c \
  	coff-arm.c \
  	coff-aux.c \
@@ -19,10 +19,10 @@
  	coff-go32.c \
  	coff-h8300.c \
  	coff-h8500.c \
-diff -Nruw bfd/Makefile.in bfd/Makefile.in
---- bfd/Makefile.in	2009-10-16 17:17:48.000000000 +0530
-+++ bfd/Makefile.in	2010-02-11 11:13:52.698455300 +0530
-@@ -524,6 +524,8 @@
+diff -uNdr binutils-2.21-orig.0/bfd/Makefile.in binutils-2.21/bfd/Makefile.in
+--- binutils-2.21-orig.0/bfd/Makefile.in	2010-12-08 09:37:36.000000000 +0100
++++ binutils-2.21/bfd/Makefile.in	2011-06-17 18:17:52.000000000 +0200
+@@ -532,6 +532,8 @@
  	coff-apollo.lo \
  	coff-arm.lo \
  	coff-aux.lo \
@@ -31,7 +31,7 @@
  	coff-go32.lo \
  	coff-h8300.lo \
  	coff-h8500.lo \
-@@ -707,6 +709,8 @@
+@@ -713,6 +715,8 @@
  	coff-apollo.c \
  	coff-arm.c \
  	coff-aux.c \
@@ -40,9 +40,9 @@
  	coff-go32.c \
  	coff-h8300.c \
  	coff-h8500.c \
-diff -Nruw bfd/coff-avr.c bfd/coff-avr.c
---- bfd/coff-avr.c	1970-01-01 05:30:00.000000000 +0530
-+++ bfd/coff-avr.c	2010-02-10 17:35:58.222099600 +0530
+diff -uNdr binutils-2.21-orig.0/bfd/coff-avr.c binutils-2.21/bfd/coff-avr.c
+--- binutils-2.21-orig.0/bfd/coff-avr.c	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/bfd/coff-avr.c	2011-06-17 18:17:52.000000000 +0200
 @@ -0,0 +1,613 @@
 +/* BFD back-end for Atmel AVR COFF files.
 +   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003
@@ -657,9 +657,9 @@
 +
 +  COFF_SWAP_TABLE
 +};
-diff -Nruw bfd/coff-ext-avr.c bfd/coff-ext-avr.c
---- bfd/coff-ext-avr.c	1970-01-01 05:30:00.000000000 +0530
-+++ bfd/coff-ext-avr.c	2010-02-10 17:35:58.222099600 +0530
+diff -uNdr binutils-2.21-orig.0/bfd/coff-ext-avr.c binutils-2.21/bfd/coff-ext-avr.c
+--- binutils-2.21-orig.0/bfd/coff-ext-avr.c	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.21/bfd/coff-ext-avr.c	2011-06-17 18:17:52.000000000 +0200
 @@ -0,0 +1,428 @@
 +/* BFD back-end for Atmel AVR "extended" COFF files.
 +   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003
@@ -1089,15 +1089,15 @@
 +
 +  COFF_SWAP_TABLE
 +};
-diff -Nruw bfd/coffcode.h bfd/coffcode.h
---- bfd/coffcode.h	2009-09-10 17:17:12.000000000 +0530
-+++ bfd/coffcode.h	2010-02-10 17:35:58.253349600 +0530
+diff -uNdr binutils-2.21-orig.0/bfd/coffcode.h binutils-2.21/bfd/coffcode.h
+--- binutils-2.21-orig.0/bfd/coffcode.h	2010-11-04 17:03:22.000000000 +0100
++++ binutils-2.21/bfd/coffcode.h	2011-06-17 18:17:52.000000000 +0200
 @@ -1,3 +1,4 @@
 +
  /* Support for the generic parts of most COFF variants, for BFD.
     Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-@@ -1910,6 +1911,17 @@
+    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@@ -1934,6 +1935,17 @@
    coff->relocbase = 0;
    coff->local_toc_sym_map = 0;
  
@@ -1115,7 +1115,7 @@
  /*  make_abs_section(abfd);*/
  
    return TRUE;
-@@ -1934,17 +1946,6 @@
+@@ -1958,17 +1970,6 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossavr-binutils/crossavr-binutils.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossavr-binutils/crossavr-binutils-xmega.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossavr-binutils/crossavr-binutils-avr-size.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossavr-binutils/crossavr-binutils-avr-coff.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list