From 5773c09eb1a8433678cf2d25cc407506bf8843fd Mon Sep 17 00:00:00 2001 From: ckuethe Date: Wed, 9 Dec 2009 16:55:51 +0000 Subject: [PATCH] based on the freebsd port, update to binutils 2.19.1. adds support for a whole bunch of new devices. --- devel/avr/binutils/Makefile | 6 +- devel/avr/binutils/distinfo | 10 +- .../binutils/patches/patch-bfd_Makefile_am | 16 +- .../binutils/patches/patch-bfd_Makefile_in | 20 +- .../avr/binutils/patches/patch-bfd_archures_c | 10 +- .../avr/binutils/patches/patch-bfd_bfd-in2_h | 10 +- .../avr/binutils/patches/patch-bfd_coff-avr_c | 12 +- .../binutils/patches/patch-bfd_coff-ext-avr_c | 12 +- .../avr/binutils/patches/patch-bfd_coffcode_h | 28 +-- .../avr/binutils/patches/patch-bfd_coffgen_c | 6 +- .../avr/binutils/patches/patch-bfd_coffswap_h | 6 +- .../avr/binutils/patches/patch-bfd_config_bfd | 8 +- .../avr/binutils/patches/patch-bfd_configure | 8 +- .../binutils/patches/patch-bfd_configure_in | 8 +- .../avr/binutils/patches/patch-bfd_cpu-avr_c | 26 +-- .../patches/patch-bfd_doc_archures_texi | 17 ++ .../binutils/patches/patch-bfd_elf32-avr_c | 86 ++++++++ .../avr/binutils/patches/patch-bfd_targets_c | 8 +- .../patches/patch-binutils_Makefile_am | 10 +- .../patches/patch-binutils_Makefile_in | 12 +- .../binutils/patches/patch-binutils_bucomm_c | 8 +- .../binutils/patches/patch-binutils_bucomm_h | 8 +- .../binutils/patches/patch-binutils_budbg_h | 6 +- .../binutils/patches/patch-binutils_debug_c | 6 +- .../binutils/patches/patch-binutils_debug_h | 6 +- .../patches/patch-binutils_doc_objcopy_1 | 8 +- .../binutils/patches/patch-binutils_objcopy_c | 24 +-- .../binutils/patches/patch-binutils_rdcoff_c | 6 +- .../binutils/patches/patch-binutils_wrcoff_c | 6 +- .../binutils/patches/patch-etc_Makefile_in | 4 +- .../patches/patch-gas_config_tc-avr_c | 172 +++++----------- devel/avr/binutils/patches/patch-gas_doc_as_1 | 186 ++++++++++++++++++ .../binutils/patches/patch-gas_doc_c-avr_texi | 76 ++++--- .../binutils/patches/patch-include_coff_avr_h | 6 +- .../patches/patch-include_coff_internal_h | 6 +- .../binutils/patches/patch-include_elf_avr_h | 14 +- .../patches/patch-include_opcode_avr_h | 34 +--- .../avr/binutils/patches/patch-ld_Makefile_am | 12 +- .../avr/binutils/patches/patch-ld_Makefile_in | 12 +- .../binutils/patches/patch-ld_configure_tgt | 10 +- .../patches/patch-ld_emulparams_avr1_sh | 4 +- .../patches/patch-ld_emulparams_avr2_sh | 4 +- .../patches/patch-ld_emulparams_avr3_sh | 4 +- .../patches/patch-ld_emulparams_avr4_sh | 4 +- .../patches/patch-ld_emulparams_avr5_sh | 4 +- .../patches/patch-ld_emulparams_avr6_sh | 4 +- .../patches/patch-ld_emulparams_avrxmega1_sh | 6 +- .../patches/patch-ld_emulparams_avrxmega2_sh | 6 +- .../patches/patch-ld_emulparams_avrxmega3_sh | 6 +- .../patches/patch-ld_emulparams_avrxmega4_sh | 6 +- .../patches/patch-ld_emulparams_avrxmega5_sh | 6 +- .../patches/patch-ld_emulparams_avrxmega6_sh | 6 +- .../patches/patch-ld_emulparams_avrxmega7_sh | 6 +- .../patches/patch-ld_emultempl_avrelf_em | 15 +- .../binutils/patches/patch-ld_genscripts_sh | 50 ----- .../patches/patch-ld_scripttempl_avr_sc | 6 +- .../patches/patch-libiberty_Makefile_in | 8 +- .../patches/patch-opcodes_Makefile_in | 8 +- .../binutils/patches/patch-opcodes_avr-dis_c | 6 +- devel/avr/binutils/pkg/PLIST | 22 ++- 60 files changed, 635 insertions(+), 475 deletions(-) create mode 100644 devel/avr/binutils/patches/patch-bfd_doc_archures_texi create mode 100644 devel/avr/binutils/patches/patch-bfd_elf32-avr_c create mode 100644 devel/avr/binutils/patches/patch-gas_doc_as_1 delete mode 100644 devel/avr/binutils/patches/patch-ld_genscripts_sh diff --git a/devel/avr/binutils/Makefile b/devel/avr/binutils/Makefile index 1051b6763f2..98e5227c018 100644 --- a/devel/avr/binutils/Makefile +++ b/devel/avr/binutils/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 2009/12/09 16:34:06 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.7 2009/12/09 16:55:51 ckuethe Exp $ COMMENT= Atmel AVR 8-bit RISC microcontrollers' GNU binutils -VER= 2.18 +VER= 2.19.1 DISTNAME= binutils-${VER} -PKGNAME= avr-binutils-${VER}p1 +PKGNAME= avr-binutils-${VER} EXTRACT_SUFX= .tar.bz2 HOMEPAGE= http://www.gnu.org/software/binutils/ diff --git a/devel/avr/binutils/distinfo b/devel/avr/binutils/distinfo index 395b8208191..8b64700d9a0 100644 --- a/devel/avr/binutils/distinfo +++ b/devel/avr/binutils/distinfo @@ -1,5 +1,5 @@ -MD5 (binutils-2.18.tar.bz2) = nSLuTa+joZRFfK9HBvnPAQ== -RMD160 (binutils-2.18.tar.bz2) = eNB0dWZ8Vey/kGjbuQNio0RbKpk= -SHA1 (binutils-2.18.tar.bz2) = /eyS6d/GwyFVhp85EPRwQceOInc= -SHA256 (binutils-2.18.tar.bz2) = SHozpFLw7c8fi7j8I9/1x6gu3sPz+LZWMrbJRelh7ps= -SIZE (binutils-2.18.tar.bz2) = 14962245 +MD5 (binutils-2.19.1.tar.bz2) = CajFghot/bsgZlvAvWgHkQ== +RMD160 (binutils-2.19.1.tar.bz2) = MwCJr3y1xrOZT+vozSrxWSGLwBI= +SHA1 (binutils-2.19.1.tar.bz2) = iMkeNs3pNDPkxMKy40F3d6rYRSY= +SHA256 (binutils-2.19.1.tar.bz2) = PoIltNes4KIDnedS4R/Wki07iaclmiksNHORxHiHOfY= +SIZE (binutils-2.19.1.tar.bz2) = 16245771 diff --git a/devel/avr/binutils/patches/patch-bfd_Makefile_am b/devel/avr/binutils/patches/patch-bfd_Makefile_am index 9a8fabebb08..9cb796e7e0b 100644 --- a/devel/avr/binutils/patches/patch-bfd_Makefile_am +++ b/devel/avr/binutils/patches/patch-bfd_Makefile_am @@ -1,6 +1,6 @@ -$OpenBSD: patch-bfd_Makefile_am,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/Makefile.am.orig Tue Aug 28 13:20:14 2007 -+++ bfd/Makefile.am Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-bfd_Makefile_am,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/Makefile.am.orig Mon Feb 2 02:44:34 2009 ++++ bfd/Makefile.am Sun Dec 6 21:48:52 2009 @@ -208,6 +208,8 @@ BFD32_BACKENDS = \ coff-apollo.lo \ coff-arm.lo \ @@ -10,7 +10,7 @@ $OpenBSD: patch-bfd_Makefile_am,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ coff-h8300.lo \ coff-h8500.lo \ coff-i386.lo \ -@@ -387,6 +389,8 @@ BFD32_BACKENDS_CFILES = \ +@@ -389,6 +391,8 @@ BFD32_BACKENDS_CFILES = \ coff-apollo.c \ coff-arm.c \ coff-aux.c \ @@ -19,7 +19,7 @@ $OpenBSD: patch-bfd_Makefile_am,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ coff-h8300.c \ coff-h8500.c \ coff-i386.c \ -@@ -976,13 +980,13 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libto +@@ -988,13 +992,13 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libto bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ @@ -35,9 +35,9 @@ $OpenBSD: patch-bfd_Makefile_am,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ sed -e "s,@bfd_version@,$$bfd_version," \ -@@ -1186,6 +1190,12 @@ coff-aux.lo: coff-aux.c $(INCDIR)/filenames.h $(INCDIR - coff-m68k.c $(INCDIR)/hashtab.h $(INCDIR)/coff/m68k.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ +@@ -1198,6 +1202,12 @@ coff-aux.lo: coff-aux.c $(INCDIR)/filenames.h $(INCDIR + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(INCDIR)/coff/external.h \ + coff-m68k.c $(INCDIR)/hashtab.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h +coff-avr.lo: coff-avr.c $(INCDIR)/filenames.h $(INCDIR)/coff/avr.h \ + $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ diff --git a/devel/avr/binutils/patches/patch-bfd_Makefile_in b/devel/avr/binutils/patches/patch-bfd_Makefile_in index 26b5bec367b..77deb24490f 100644 --- a/devel/avr/binutils/patches/patch-bfd_Makefile_in +++ b/devel/avr/binutils/patches/patch-bfd_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_Makefile_in,v 1.2 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/Makefile.in.orig Tue Aug 28 13:20:12 2007 -+++ bfd/Makefile.in Sat Sep 27 20:20:27 2008 -@@ -458,6 +458,8 @@ BFD32_BACKENDS = \ +$OpenBSD: patch-bfd_Makefile_in,v 1.3 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/Makefile.in.orig Mon Feb 2 02:44:39 2009 ++++ bfd/Makefile.in Sun Dec 6 21:48:53 2009 +@@ -462,6 +462,8 @@ BFD32_BACKENDS = \ coff-apollo.lo \ coff-arm.lo \ coff-aux.lo \ @@ -10,7 +10,7 @@ $OpenBSD: patch-bfd_Makefile_in,v 1.2 2008/10/01 04:46:19 ckuethe Exp $ coff-h8300.lo \ coff-h8500.lo \ coff-i386.lo \ -@@ -637,6 +639,8 @@ BFD32_BACKENDS_CFILES = \ +@@ -643,6 +645,8 @@ BFD32_BACKENDS_CFILES = \ coff-apollo.c \ coff-arm.c \ coff-aux.c \ @@ -19,7 +19,7 @@ $OpenBSD: patch-bfd_Makefile_in,v 1.2 2008/10/01 04:46:19 ckuethe Exp $ coff-h8300.c \ coff-h8500.c \ coff-i386.c \ -@@ -1206,7 +1210,8 @@ installdirs-am: +@@ -1222,7 +1226,8 @@ installdirs-am: for dir in "$(DESTDIR)$(bfdlibdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done @@ -29,7 +29,7 @@ $OpenBSD: patch-bfd_Makefile_in,v 1.2 2008/10/01 04:46:19 ckuethe Exp $ install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive -@@ -1556,13 +1561,13 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) +@@ -1572,13 +1577,13 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ @@ -45,9 +45,9 @@ $OpenBSD: patch-bfd_Makefile_in,v 1.2 2008/10/01 04:46:19 ckuethe Exp $ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ sed -e "s,@bfd_version@,$$bfd_version," \ -@@ -1766,6 +1771,12 @@ coff-aux.lo: coff-aux.c $(INCDIR)/filenames.h $(INCDIR - coff-m68k.c $(INCDIR)/hashtab.h $(INCDIR)/coff/m68k.h \ - $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ +@@ -1782,6 +1787,12 @@ coff-aux.lo: coff-aux.c $(INCDIR)/filenames.h $(INCDIR + $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(INCDIR)/coff/external.h \ + coff-m68k.c $(INCDIR)/hashtab.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h +coff-avr.lo: coff-avr.c $(INCDIR)/filenames.h $(INCDIR)/coff/avr.h \ + $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ diff --git a/devel/avr/binutils/patches/patch-bfd_archures_c b/devel/avr/binutils/patches/patch-bfd_archures_c index ca1ca2196a8..1ccdf5af888 100644 --- a/devel/avr/binutils/patches/patch-bfd_archures_c +++ b/devel/avr/binutils/patches/patch-bfd_archures_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-bfd_archures_c,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/archures.c.orig Mon Aug 6 12:59:14 2007 -+++ bfd/archures.c Sat Sep 27 20:20:27 2008 -@@ -346,6 +346,13 @@ DESCRIPTION - .#define bfd_mach_avr4 4 +$OpenBSD: patch-bfd_archures_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/archures.c.orig Fri Aug 8 22:35:12 2008 ++++ bfd/archures.c Sun Dec 6 21:48:53 2009 +@@ -357,6 +357,13 @@ DESCRIPTION .#define bfd_mach_avr5 5 + .#define bfd_mach_avr51 51 .#define bfd_mach_avr6 6 +.#define bfd_mach_avrxmega1 101 +.#define bfd_mach_avrxmega2 102 diff --git a/devel/avr/binutils/patches/patch-bfd_bfd-in2_h b/devel/avr/binutils/patches/patch-bfd_bfd-in2_h index e81da470f76..d65bc82dd33 100644 --- a/devel/avr/binutils/patches/patch-bfd_bfd-in2_h +++ b/devel/avr/binutils/patches/patch-bfd_bfd-in2_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-bfd_bfd-in2_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/bfd-in2.h.orig Mon Aug 6 12:59:15 2007 -+++ bfd/bfd-in2.h Sat Sep 27 20:20:27 2008 -@@ -2017,6 +2017,13 @@ enum bfd_architecture - #define bfd_mach_avr4 4 +$OpenBSD: patch-bfd_bfd-in2_h,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/bfd-in2.h.orig Wed Aug 20 16:28:57 2008 ++++ bfd/bfd-in2.h Sun Dec 6 21:48:53 2009 +@@ -1979,6 +1979,13 @@ enum bfd_architecture #define bfd_mach_avr5 5 + #define bfd_mach_avr51 51 #define bfd_mach_avr6 6 +#define bfd_mach_avrxmega1 101 +#define bfd_mach_avrxmega2 102 diff --git a/devel/avr/binutils/patches/patch-bfd_coff-avr_c b/devel/avr/binutils/patches/patch-bfd_coff-avr_c index 9521d154135..79647372427 100644 --- a/devel/avr/binutils/patches/patch-bfd_coff-avr_c +++ b/devel/avr/binutils/patches/patch-bfd_coff-avr_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_coff-avr_c,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/coff-avr.c.orig Sat Sep 27 20:20:27 2008 -+++ bfd/coff-avr.c Sat Sep 27 20:20:27 2008 -@@ -0,0 +1,609 @@ +$OpenBSD: patch-bfd_coff-avr_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/coff-avr.c.orig Sun Dec 6 21:48:53 2009 ++++ bfd/coff-avr.c Sun Dec 6 21:48:53 2009 +@@ -0,0 +1,613 @@ +/* BFD back-end for Atmel AVR COFF files. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003 + Free Software Foundation, Inc. @@ -361,6 +361,10 @@ $OpenBSD: patch-bfd_coff-avr_c,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ + +#define coff_rtype_to_howto coff_avr_rtype_to_howto + ++#ifndef bfd_pe_print_pdata ++#define bfd_pe_print_pdata NULL ++#endif ++ +#include "coffcode.h" + +static const bfd_target * diff --git a/devel/avr/binutils/patches/patch-bfd_coff-ext-avr_c b/devel/avr/binutils/patches/patch-bfd_coff-ext-avr_c index 556ae0bcd71..dba6768f0ed 100644 --- a/devel/avr/binutils/patches/patch-bfd_coff-ext-avr_c +++ b/devel/avr/binutils/patches/patch-bfd_coff-ext-avr_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_coff-ext-avr_c,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/coff-ext-avr.c.orig Sat Sep 27 20:20:27 2008 -+++ bfd/coff-ext-avr.c Sat Sep 27 20:20:27 2008 -@@ -0,0 +1,424 @@ +$OpenBSD: patch-bfd_coff-ext-avr_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/coff-ext-avr.c.orig Sun Dec 6 21:48:53 2009 ++++ bfd/coff-ext-avr.c Sun Dec 6 21:48:53 2009 +@@ -0,0 +1,428 @@ +/* BFD back-end for Atmel AVR "extended" COFF files. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003 + Free Software Foundation, Inc. @@ -363,6 +363,10 @@ $OpenBSD: patch-bfd_coff-ext-avr_c,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ + +#define coff_rtype_to_howto coff_ext_avr_rtype_to_howto + ++#ifndef bfd_pe_print_pdata ++#define bfd_pe_print_pdata NULL ++#endif ++ +#include "coffcode.h" + +static const bfd_target * diff --git a/devel/avr/binutils/patches/patch-bfd_coffcode_h b/devel/avr/binutils/patches/patch-bfd_coffcode_h index 231b9985442..3b8c5f96b4f 100644 --- a/devel/avr/binutils/patches/patch-bfd_coffcode_h +++ b/devel/avr/binutils/patches/patch-bfd_coffcode_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/coffcode.h.orig Mon Aug 6 12:59:19 2007 -+++ bfd/coffcode.h Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-bfd_coffcode_h,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/coffcode.h.orig Mon Aug 4 20:03:46 2008 ++++ bfd/coffcode.h Sun Dec 6 21:48:53 2009 @@ -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 -@@ -1769,6 +1770,17 @@ coff_mkobject (bfd * abfd) + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +@@ -1777,6 +1778,17 @@ coff_mkobject (bfd * abfd) coff->relocbase = 0; coff->local_toc_sym_map = 0; @@ -24,7 +24,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ /* make_abs_section(abfd);*/ return TRUE; -@@ -1793,17 +1805,6 @@ coff_mkobject_hook (bfd * abfd, +@@ -1801,17 +1813,6 @@ coff_mkobject_hook (bfd * abfd, coff->sym_filepos = internal_f->f_symptr; @@ -42,7 +42,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ coff->timestamp = internal_f->f_timdat; obj_raw_syment_count (abfd) = -@@ -1930,6 +1931,11 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr) +@@ -1938,6 +1939,11 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr) } break; #endif @@ -54,7 +54,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ #ifdef MC68MAGIC case MC68MAGIC: case M68MAGIC: -@@ -2726,6 +2732,13 @@ coff_set_flags (bfd * abfd, +@@ -2734,6 +2740,13 @@ coff_set_flags (bfd * abfd, return TRUE; #endif @@ -68,7 +68,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ #ifdef PPCMAGIC case bfd_arch_powerpc: *magicp = PPCMAGIC; -@@ -3522,6 +3535,11 @@ coff_write_object_contents (bfd * abfd) +@@ -3530,6 +3543,11 @@ coff_write_object_contents (bfd * abfd) section.s_page = coff_get_section_load_page (current); #endif @@ -80,7 +80,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ #ifdef COFF_WITH_PE section.s_paddr = 0; #endif -@@ -3866,6 +3884,17 @@ coff_write_object_contents (bfd * abfd) +@@ -3874,6 +3892,17 @@ coff_write_object_contents (bfd * abfd) internal_a.magic = ZMAGIC; #endif @@ -98,7 +98,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ #if defined(PPC_PE) #define __A_MAGIC_SET__ internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; -@@ -3933,8 +3962,16 @@ coff_write_object_contents (bfd * abfd) +@@ -3941,8 +3970,16 @@ coff_write_object_contents (bfd * abfd) #endif } @@ -115,7 +115,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ /* Now should write relocs, strings, syms. */ obj_sym_filepos (abfd) = sym_base; -@@ -4120,22 +4157,29 @@ coff_write_object_contents (bfd * abfd) +@@ -4128,22 +4165,29 @@ coff_write_object_contents (bfd * abfd) char * buff; bfd_size_type amount = bfd_coff_aoutsz (abfd); @@ -155,7 +155,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ } #ifdef RS6000COFF_C else -@@ -4491,6 +4535,10 @@ coff_slurp_symbol_table (bfd * abfd) +@@ -4500,6 +4544,10 @@ coff_slurp_symbol_table (bfd * abfd) /* In PE, 0x69 (105) denotes a weak external symbol. */ case C_NT_WEAK: #endif @@ -166,7 +166,7 @@ $OpenBSD: patch-bfd_coffcode_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ switch (coff_classify_symbol (abfd, &src->u.syment)) { case COFF_SYMBOL_GLOBAL: -@@ -4714,7 +4762,9 @@ coff_slurp_symbol_table (bfd * abfd) +@@ -4723,7 +4771,9 @@ coff_slurp_symbol_table (bfd * abfd) && src->u.syment.n_scnum == 0) break; /* Fall through. */ diff --git a/devel/avr/binutils/patches/patch-bfd_coffgen_c b/devel/avr/binutils/patches/patch-bfd_coffgen_c index 7c3695eddc9..dc05fa16be6 100644 --- a/devel/avr/binutils/patches/patch-bfd_coffgen_c +++ b/devel/avr/binutils/patches/patch-bfd_coffgen_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-bfd_coffgen_c,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/coffgen.c.orig Sun Aug 12 18:43:34 2007 -+++ bfd/coffgen.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-bfd_coffgen_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/coffgen.c.orig Wed Aug 13 19:38:22 2008 ++++ bfd/coffgen.c Sun Dec 6 21:48:53 2009 @@ -687,6 +687,20 @@ coff_renumber_symbols (bfd *bfd_ptr, int *first_undef) if (last_file != NULL) last_file->n_value = native_index; diff --git a/devel/avr/binutils/patches/patch-bfd_coffswap_h b/devel/avr/binutils/patches/patch-bfd_coffswap_h index 1c3a5dc519e..bde39a4a1d6 100644 --- a/devel/avr/binutils/patches/patch-bfd_coffswap_h +++ b/devel/avr/binutils/patches/patch-bfd_coffswap_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-bfd_coffswap_h,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/coffswap.h.orig Mon Aug 6 12:59:19 2007 -+++ bfd/coffswap.h Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-bfd_coffswap_h,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/coffswap.h.orig Tue Jul 3 07:26:40 2007 ++++ bfd/coffswap.h Sun Dec 6 21:48:53 2009 @@ -383,7 +383,11 @@ coff_swap_aux_in (bfd *abfd, void * ext1, int type, diff --git a/devel/avr/binutils/patches/patch-bfd_config_bfd b/devel/avr/binutils/patches/patch-bfd_config_bfd index 305cc7bfa7a..3229cdc30ad 100644 --- a/devel/avr/binutils/patches/patch-bfd_config_bfd +++ b/devel/avr/binutils/patches/patch-bfd_config_bfd @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_config_bfd,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/config.bfd.orig Tue Aug 28 10:19:33 2007 -+++ bfd/config.bfd Sat Sep 27 20:20:27 2008 -@@ -327,6 +327,7 @@ case "${targ}" in +$OpenBSD: patch-bfd_config_bfd,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/config.bfd.orig Wed Apr 16 11:02:01 2008 ++++ bfd/config.bfd Sun Dec 6 21:48:53 2009 +@@ -328,6 +328,7 @@ case "${targ}" in avr-*-*) targ_defvec=bfd_elf32_avr_vec diff --git a/devel/avr/binutils/patches/patch-bfd_configure b/devel/avr/binutils/patches/patch-bfd_configure index cfd982a2b9e..da72ff66983 100644 --- a/devel/avr/binutils/patches/patch-bfd_configure +++ b/devel/avr/binutils/patches/patch-bfd_configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_configure,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/configure.orig Tue Aug 28 13:19:51 2007 -+++ bfd/configure Sat Sep 27 20:20:27 2008 -@@ -19034,6 +19034,8 @@ do +$OpenBSD: patch-bfd_configure,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/configure.orig Mon Feb 2 02:44:37 2009 ++++ bfd/configure Sun Dec 6 21:48:53 2009 +@@ -19626,6 +19626,8 @@ do armpe_little_vec) tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;; armpei_big_vec) tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;; armpei_little_vec) tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;; diff --git a/devel/avr/binutils/patches/patch-bfd_configure_in b/devel/avr/binutils/patches/patch-bfd_configure_in index 5bd5484b5b6..04d2a3492f2 100644 --- a/devel/avr/binutils/patches/patch-bfd_configure_in +++ b/devel/avr/binutils/patches/patch-bfd_configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_configure_in,v 1.1 2008/10/01 04:46:19 ckuethe Exp $ ---- bfd/configure.in.orig Tue Aug 28 13:19:56 2007 -+++ bfd/configure.in Sat Sep 27 20:20:27 2008 -@@ -612,6 +612,8 @@ do +$OpenBSD: patch-bfd_configure_in,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/configure.in.orig Mon Feb 2 02:44:34 2009 ++++ bfd/configure.in Sun Dec 6 21:48:53 2009 +@@ -619,6 +619,8 @@ do armpe_little_vec) tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;; armpei_big_vec) tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;; armpei_little_vec) tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;; diff --git a/devel/avr/binutils/patches/patch-bfd_cpu-avr_c b/devel/avr/binutils/patches/patch-bfd_cpu-avr_c index 5184f49386d..99af0290410 100644 --- a/devel/avr/binutils/patches/patch-bfd_cpu-avr_c +++ b/devel/avr/binutils/patches/patch-bfd_cpu-avr_c @@ -1,30 +1,30 @@ -$OpenBSD: patch-bfd_cpu-avr_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- bfd/cpu-avr.c.orig Mon Aug 6 12:59:20 2007 -+++ bfd/cpu-avr.c Sat Sep 27 20:20:27 2008 -@@ -86,7 +86,29 @@ static const bfd_arch_info_type arch_info_struct[] = - N (22, bfd_mach_avr5, "avr:5", FALSE, & arch_info_struct[5]), +$OpenBSD: patch-bfd_cpu-avr_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/cpu-avr.c.orig Fri Aug 8 22:35:12 2008 ++++ bfd/cpu-avr.c Sun Dec 6 21:48:53 2009 +@@ -126,7 +126,29 @@ static const bfd_arch_info_type arch_info_struct[] = + N (22, bfd_mach_avr51, "avr:51", FALSE, & arch_info_struct[9]), - /* ATmega256x. */ + /* 3-Byte PC. */ - N (22, bfd_mach_avr6, "avr:6", FALSE, NULL) -+ N (22, bfd_mach_avr6, "avr:6", FALSE, & arch_info_struct[6]), ++ N (22, bfd_mach_avr6, "avr:6", FALSE, & arch_info_struct[10]), + + /* Xmega 1 */ -+ N (24, bfd_mach_avrxmega1, "avr:101", FALSE, & arch_info_struct[7]), ++ N (24, bfd_mach_avrxmega1, "avr:101", FALSE, & arch_info_struct[11]), + + /* Xmega 2 */ -+ N (24, bfd_mach_avrxmega2, "avr:102", FALSE, & arch_info_struct[8]), ++ N (24, bfd_mach_avrxmega2, "avr:102", FALSE, & arch_info_struct[12]), + + /* Xmega 3 */ -+ N (24, bfd_mach_avrxmega3, "avr:103", FALSE, & arch_info_struct[9]), ++ N (24, bfd_mach_avrxmega3, "avr:103", FALSE, & arch_info_struct[13]), + + /* Xmega 4 */ -+ N (24, bfd_mach_avrxmega4, "avr:104", FALSE, & arch_info_struct[10]), ++ N (24, bfd_mach_avrxmega4, "avr:104", FALSE, & arch_info_struct[14]), + + /* Xmega 5 */ -+ N (24, bfd_mach_avrxmega5, "avr:105", FALSE, & arch_info_struct[11]), ++ N (24, bfd_mach_avrxmega5, "avr:105", FALSE, & arch_info_struct[15]), + + /* Xmega 6 */ -+ N (24, bfd_mach_avrxmega6, "avr:106", FALSE, & arch_info_struct[12]), ++ N (24, bfd_mach_avrxmega6, "avr:106", FALSE, & arch_info_struct[16]), + + /* Xmega 7 */ + N (24, bfd_mach_avrxmega7, "avr:107", FALSE, NULL) diff --git a/devel/avr/binutils/patches/patch-bfd_doc_archures_texi b/devel/avr/binutils/patches/patch-bfd_doc_archures_texi new file mode 100644 index 00000000000..76ae77fa886 --- /dev/null +++ b/devel/avr/binutils/patches/patch-bfd_doc_archures_texi @@ -0,0 +1,17 @@ +$OpenBSD: patch-bfd_doc_archures_texi,v 1.1 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/doc/archures.texi.orig Wed Sep 10 00:50:16 2008 ++++ bfd/doc/archures.texi Sun Dec 6 21:48:53 2009 +@@ -322,6 +322,13 @@ enum bfd_architecture + #define bfd_mach_avr5 5 + #define bfd_mach_avr51 51 + #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/patches/patch-bfd_elf32-avr_c b/devel/avr/binutils/patches/patch-bfd_elf32-avr_c new file mode 100644 index 00000000000..579cf77e9d7 --- /dev/null +++ b/devel/avr/binutils/patches/patch-bfd_elf32-avr_c @@ -0,0 +1,86 @@ +$OpenBSD: patch-bfd_elf32-avr_c,v 1.1 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/elf32-avr.c.orig Tue Dec 23 05:54:49 2008 ++++ bfd/elf32-avr.c Sun Dec 6 21:48:53 2009 +@@ -854,10 +854,11 @@ avr_final_link_relocate (reloc_howto_type * + { + /* Relative distance is too large. */ + +- /* Always apply WRAPAROUND for avr2 and avr4. */ ++ /* Always apply WRAPAROUND for avr2, avr25, and avr4. */ + switch (bfd_get_mach (input_bfd)) + { + case bfd_mach_avr2: ++ case bfd_mach_avr25: + case bfd_mach_avr4: + break; + +@@ -1327,6 +1328,34 @@ bfd_elf_avr_final_write_processing (bfd *abfd, + case bfd_mach_avr6: + val = E_AVR_MACH_AVR6; + break; ++ ++ case bfd_mach_avrxmega1: ++ val = E_AVR_MACH_XMEGA1; ++ break; ++ ++ case bfd_mach_avrxmega2: ++ val = E_AVR_MACH_XMEGA2; ++ break; ++ ++ case bfd_mach_avrxmega3: ++ val = E_AVR_MACH_XMEGA3; ++ break; ++ ++ case bfd_mach_avrxmega4: ++ val = E_AVR_MACH_XMEGA4; ++ break; ++ ++ case bfd_mach_avrxmega5: ++ val = E_AVR_MACH_XMEGA5; ++ break; ++ ++ case bfd_mach_avrxmega6: ++ val = E_AVR_MACH_XMEGA6; ++ break; ++ ++ case bfd_mach_avrxmega7: ++ val = E_AVR_MACH_XMEGA7; ++ break; + } + + elf_elfheader (abfd)->e_machine = EM_AVR; +@@ -1388,6 +1417,34 @@ elf32_avr_object_p (bfd *abfd) + + case E_AVR_MACH_AVR6: + e_set = bfd_mach_avr6; ++ break; ++ ++ case E_AVR_MACH_XMEGA1: ++ e_set = bfd_mach_avrxmega1; ++ break; ++ ++ case E_AVR_MACH_XMEGA2: ++ e_set = bfd_mach_avrxmega2; ++ break; ++ ++ case E_AVR_MACH_XMEGA3: ++ e_set = bfd_mach_avrxmega3; ++ break; ++ ++ case E_AVR_MACH_XMEGA4: ++ e_set = bfd_mach_avrxmega4; ++ break; ++ ++ case E_AVR_MACH_XMEGA5: ++ e_set = bfd_mach_avrxmega5; ++ break; ++ ++ case E_AVR_MACH_XMEGA6: ++ e_set = bfd_mach_avrxmega6; ++ break; ++ ++ case E_AVR_MACH_XMEGA7: ++ e_set = bfd_mach_avrxmega7; + break; + } + } diff --git a/devel/avr/binutils/patches/patch-bfd_targets_c b/devel/avr/binutils/patches/patch-bfd_targets_c index 3ccbbb2b017..ba9f0ae2701 100644 --- a/devel/avr/binutils/patches/patch-bfd_targets_c +++ b/devel/avr/binutils/patches/patch-bfd_targets_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-bfd_targets_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- bfd/targets.c.orig Mon Aug 6 12:59:42 2007 -+++ bfd/targets.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-bfd_targets_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- bfd/targets.c.orig Thu Feb 14 07:20:26 2008 ++++ bfd/targets.c Sun Dec 6 21:48:53 2009 @@ -558,6 +558,8 @@ extern const bfd_target armpe_big_vec; extern const bfd_target armpe_little_vec; extern const bfd_target armpei_big_vec; @@ -10,7 +10,7 @@ $OpenBSD: patch-bfd_targets_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ extern const bfd_target b_out_vec_big_host; extern const bfd_target b_out_vec_little_host; extern const bfd_target bfd_efi_app_ia32_vec; -@@ -876,6 +878,8 @@ static const bfd_target * const _bfd_target_vector[] = +@@ -882,6 +884,8 @@ static const bfd_target * const _bfd_target_vector[] = &armpe_little_vec, &armpei_big_vec, &armpei_little_vec, diff --git a/devel/avr/binutils/patches/patch-binutils_Makefile_am b/devel/avr/binutils/patches/patch-binutils_Makefile_am index 5f7fc20beac..d00c34a4af1 100644 --- a/devel/avr/binutils/patches/patch-binutils_Makefile_am +++ b/devel/avr/binutils/patches/patch-binutils_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_Makefile_am,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/Makefile.am.orig Mon Aug 6 12:55:08 2007 -+++ binutils/Makefile.am Sat Sep 27 20:20:27 2008 -@@ -98,7 +98,7 @@ CFILES = \ +$OpenBSD: patch-binutils_Makefile_am,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/Makefile.am.orig Sun Aug 24 21:38:13 2008 ++++ binutils/Makefile.am Sun Dec 6 21:48:53 2009 +@@ -97,7 +97,7 @@ CFILES = \ resbin.c rescoff.c resrc.c resres.c \ size.c srconv.c stabs.c strings.c sysdump.c \ unwind-ia64.c version.c \ @@ -10,7 +10,7 @@ $OpenBSD: patch-binutils_Makefile_am,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ windmc.c mclex.c GENERATED_CFILES = \ -@@ -106,7 +106,7 @@ GENERATED_CFILES = \ +@@ -105,7 +105,7 @@ GENERATED_CFILES = \ defparse.c deflex.c nlmheader.c rcparse.c mcparse.c DEBUG_SRCS = rddbg.c debug.c stabs.c ieee.c rdcoff.c diff --git a/devel/avr/binutils/patches/patch-binutils_Makefile_in b/devel/avr/binutils/patches/patch-binutils_Makefile_in index 44987b79255..ea514e474c7 100644 --- a/devel/avr/binutils/patches/patch-binutils_Makefile_in +++ b/devel/avr/binutils/patches/patch-binutils_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/Makefile.in.orig Mon Aug 6 13:29:53 2007 -+++ binutils/Makefile.in Sat Sep 27 20:20:27 2008 -@@ -129,7 +129,7 @@ am_nm_new_OBJECTS = nm.$(OBJEXT) $(am__objects_1) +$OpenBSD: patch-binutils_Makefile_in,v 1.3 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/Makefile.in.orig Sun Aug 24 21:38:13 2008 ++++ binutils/Makefile.in Sun Dec 6 21:48:53 2009 +@@ -133,7 +133,7 @@ am_nm_new_OBJECTS = nm.$(OBJEXT) $(am__objects_1) nm_new_OBJECTS = $(am_nm_new_OBJECTS) nm_new_LDADD = $(LDADD) am__objects_2 = rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \ @@ -10,7 +10,7 @@ $OpenBSD: patch-binutils_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ am__objects_3 = $(am__objects_2) wrstabs.$(OBJEXT) am_objcopy_OBJECTS = objcopy.$(OBJEXT) not-strip.$(OBJEXT) \ rename.$(OBJEXT) $(am__objects_3) $(am__objects_1) -@@ -418,7 +418,7 @@ CFILES = \ +@@ -421,7 +421,7 @@ CFILES = \ resbin.c rescoff.c resrc.c resres.c \ size.c srconv.c stabs.c strings.c sysdump.c \ unwind-ia64.c version.c \ @@ -19,7 +19,7 @@ $OpenBSD: patch-binutils_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ windmc.c mclex.c GENERATED_CFILES = \ -@@ -426,7 +426,7 @@ GENERATED_CFILES = \ +@@ -429,7 +429,7 @@ GENERATED_CFILES = \ defparse.c deflex.c nlmheader.c rcparse.c mcparse.c DEBUG_SRCS = rddbg.c debug.c stabs.c ieee.c rdcoff.c diff --git a/devel/avr/binutils/patches/patch-binutils_bucomm_c b/devel/avr/binutils/patches/patch-binutils_bucomm_c index 6cbb0fd3eef..fc29b1a0807 100644 --- a/devel/avr/binutils/patches/patch-binutils_bucomm_c +++ b/devel/avr/binutils/patches/patch-binutils_bucomm_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_bucomm_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/bucomm.c.orig Mon Aug 6 12:55:09 2007 -+++ binutils/bucomm.c Sat Sep 27 20:20:27 2008 -@@ -501,6 +501,32 @@ parse_vma (const char *s, const char *arg) +$OpenBSD: patch-binutils_bucomm_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/bucomm.c.orig Wed Jan 9 02:40:32 2008 ++++ binutils/bucomm.c Sun Dec 6 21:48:53 2009 +@@ -549,6 +549,32 @@ parse_vma (const char *s, const char *arg) return ret; } diff --git a/devel/avr/binutils/patches/patch-binutils_bucomm_h b/devel/avr/binutils/patches/patch-binutils_bucomm_h index 2644c14209d..b4c08a9c7e9 100644 --- a/devel/avr/binutils/patches/patch-binutils_bucomm_h +++ b/devel/avr/binutils/patches/patch-binutils_bucomm_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_bucomm_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/bucomm.h.orig Mon Aug 6 12:55:09 2007 -+++ binutils/bucomm.h Sat Sep 27 20:20:27 2008 -@@ -54,6 +54,8 @@ bfd_vma parse_vma (const char *, const char *); +$OpenBSD: patch-binutils_bucomm_h,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/bucomm.h.orig Thu Aug 30 03:19:03 2007 ++++ binutils/bucomm.h Sun Dec 6 21:48:53 2009 +@@ -57,6 +57,8 @@ bfd_vma parse_vma (const char *, const char *); off_t get_file_size (const char *); diff --git a/devel/avr/binutils/patches/patch-binutils_budbg_h b/devel/avr/binutils/patches/patch-binutils_budbg_h index 6dfefbf3183..15a22218483 100644 --- a/devel/avr/binutils/patches/patch-binutils_budbg_h +++ b/devel/avr/binutils/patches/patch-binutils_budbg_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-binutils_budbg_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/budbg.h.orig Mon Aug 6 12:55:09 2007 -+++ binutils/budbg.h Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_budbg_h,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/budbg.h.orig Thu Jun 12 04:57:40 2008 ++++ binutils/budbg.h Sun Dec 6 21:48:53 2009 @@ -51,8 +51,11 @@ extern bfd_boolean parse_ieee (void *, bfd *, const bf extern bfd_boolean write_ieee_debugging_info (bfd *, void *); diff --git a/devel/avr/binutils/patches/patch-binutils_debug_c b/devel/avr/binutils/patches/patch-binutils_debug_c index 402d96aff57..26cbbc4c3d1 100644 --- a/devel/avr/binutils/patches/patch-binutils_debug_c +++ b/devel/avr/binutils/patches/patch-binutils_debug_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-binutils_debug_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/debug.c.orig Mon Aug 6 12:55:10 2007 -+++ binutils/debug.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_debug_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/debug.c.orig Thu Jul 5 09:54:45 2007 ++++ binutils/debug.c Sun Dec 6 21:48:53 2009 @@ -31,6 +31,7 @@ #include #include "bfd.h" diff --git a/devel/avr/binutils/patches/patch-binutils_debug_h b/devel/avr/binutils/patches/patch-binutils_debug_h index b27ee7d5dda..1e5dbb2ad6e 100644 --- a/devel/avr/binutils/patches/patch-binutils_debug_h +++ b/devel/avr/binutils/patches/patch-binutils_debug_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-binutils_debug_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/debug.h.orig Mon Aug 6 12:55:10 2007 -+++ binutils/debug.h Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_debug_h,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/debug.h.orig Thu Jul 5 09:54:45 2007 ++++ binutils/debug.h Sun Dec 6 21:48:53 2009 @@ -440,6 +440,12 @@ extern bfd_boolean debug_set_filename (void *, const c extern bfd_boolean debug_start_source (void *, const char *); diff --git a/devel/avr/binutils/patches/patch-binutils_doc_objcopy_1 b/devel/avr/binutils/patches/patch-binutils_doc_objcopy_1 index e5828b40f99..138e29a1c8a 100644 --- a/devel/avr/binutils/patches/patch-binutils_doc_objcopy_1 +++ b/devel/avr/binutils/patches/patch-binutils_doc_objcopy_1 @@ -1,6 +1,6 @@ -$OpenBSD: patch-binutils_doc_objcopy_1,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/doc/objcopy.1.orig Mon Aug 6 13:39:33 2007 -+++ binutils/doc/objcopy.1 Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_doc_objcopy_1,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/doc/objcopy.1.orig Wed Sep 10 00:50:26 2008 ++++ binutils/doc/objcopy.1 Sun Dec 6 21:48:53 2009 @@ -193,6 +193,8 @@ objcopy [\fB\-F\fR \fIbfdname\fR|\fB\-\-target=\fR\fIb [\fB\-\-readonly\-text\fR] [\fB\-\-pure\fR] @@ -10,7 +10,7 @@ $OpenBSD: patch-binutils_doc_objcopy_1,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ [\fB\-v\fR|\fB\-\-verbose\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fB\-\-help\fR] [\fB\-\-info\fR] -@@ -807,6 +809,23 @@ This option is used to build a \fI.sym\fR file for a V +@@ -805,6 +807,23 @@ This option is used to build a \fI.sym\fR file for a V It can also be a useful way of reducing the size of a \fB\-\-just\-symbols\fR linker input file. .RE diff --git a/devel/avr/binutils/patches/patch-binutils_objcopy_c b/devel/avr/binutils/patches/patch-binutils_objcopy_c index e268c0abfef..c837068b53d 100644 --- a/devel/avr/binutils/patches/patch-binutils_objcopy_c +++ b/devel/avr/binutils/patches/patch-binutils_objcopy_c @@ -1,15 +1,15 @@ -$OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/objcopy.c.orig Mon Aug 6 12:56:13 2007 -+++ binutils/objcopy.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_objcopy_c,v 1.2 2009/12/09 16:55:51 ckuethe Exp $ +--- binutils/objcopy.c.orig Tue Aug 5 17:42:17 2008 ++++ binutils/objcopy.c Sun Dec 6 21:48:53 2009 @@ -32,6 +32,7 @@ #include "elf-bfd.h" #include #include "libbfd.h" +#include "debug.h" - /* A list of symbols to explicitly strip out, or to keep. A linked - list is good enough for a small number from the command line, but -@@ -272,7 +273,9 @@ enum command_line_switch + struct is_specified_symbol_predicate_data + { +@@ -270,7 +271,9 @@ enum command_line_switch OPTION_PURE, OPTION_IMPURE, OPTION_EXTRACT_SYMBOL, @@ -20,7 +20,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ }; /* Options to handle if running as "strip". */ -@@ -316,10 +319,12 @@ static struct option copy_options[] = +@@ -314,10 +317,12 @@ static struct option copy_options[] = {"adjust-section-vma", required_argument, 0, OPTION_CHANGE_SECTION_ADDRESS}, {"adjust-warnings", no_argument, 0, OPTION_CHANGE_WARNINGS}, {"alt-machine-code", required_argument, 0, OPTION_ALT_MACH_CODE}, @@ -33,7 +33,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ {"change-section-address", required_argument, 0, OPTION_CHANGE_SECTION_ADDRESS}, {"change-section-lma", required_argument, 0, OPTION_CHANGE_SECTION_LMA}, {"change-section-vma", required_argument, 0, OPTION_CHANGE_SECTION_VMA}, -@@ -504,6 +509,8 @@ copy_usage (FILE *stream, int exit_status) +@@ -502,6 +507,8 @@ copy_usage (FILE *stream, int exit_status) --prefix-alloc-sections \n\ Add to start of every allocatable\n\ section name\n\ @@ -42,7 +42,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ -v --verbose List all object files modified\n\ @ Read options from \n\ -V --version Display this program's version number\n\ -@@ -911,6 +918,8 @@ filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms, +@@ -948,6 +955,8 @@ filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms, asymbol **from = isyms, **to = osyms; long src_count = 0, dst_count = 0; int relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0; @@ -51,7 +51,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ for (; src_count < symcount; src_count++) { -@@ -1010,9 +1019,10 @@ filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms, +@@ -1047,9 +1056,10 @@ filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms, || bfd_is_com_section (bfd_get_section (sym))) keep = strip_symbols != STRIP_UNNEEDED; else if ((flags & BSF_DEBUGGING) != 0) /* Debugging symbol. */ @@ -65,7 +65,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ else if (bfd_coff_get_comdat_section (abfd, bfd_get_section (sym))) /* COMDAT sections store special information in local symbols, so we cannot risk stripping any of them. */ -@@ -2588,6 +2598,10 @@ write_debugging_info (bfd *obfd, void *dhandle, +@@ -2659,6 +2669,10 @@ write_debugging_info (bfd *obfd, void *dhandle, return write_ieee_debugging_info (obfd, dhandle); if (bfd_get_flavour (obfd) == bfd_target_coff_flavour @@ -76,7 +76,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ || bfd_get_flavour (obfd) == bfd_target_elf_flavour) { bfd_byte *syms, *strings; -@@ -3287,6 +3301,30 @@ copy_main (int argc, char *argv[]) +@@ -3357,6 +3371,30 @@ copy_main (int argc, char *argv[]) case OPTION_PREFIX_ALLOC_SECTIONS: prefix_alloc_sections_string = optarg; diff --git a/devel/avr/binutils/patches/patch-binutils_rdcoff_c b/devel/avr/binutils/patches/patch-binutils_rdcoff_c index 7510669d142..a694608a5c4 100644 --- a/devel/avr/binutils/patches/patch-binutils_rdcoff_c +++ b/devel/avr/binutils/patches/patch-binutils_rdcoff_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-binutils_rdcoff_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/rdcoff.c.orig Mon Aug 6 12:56:14 2007 -+++ binutils/rdcoff.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_rdcoff_c,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- binutils/rdcoff.c.orig Thu Jul 5 09:54:45 2007 ++++ binutils/rdcoff.c Sun Dec 6 21:48:53 2009 @@ -82,6 +82,9 @@ struct coff_types struct coff_slots *slots; /* Basic types. */ diff --git a/devel/avr/binutils/patches/patch-binutils_wrcoff_c b/devel/avr/binutils/patches/patch-binutils_wrcoff_c index 44e52e4bc5b..c5bbe5360f2 100644 --- a/devel/avr/binutils/patches/patch-binutils_wrcoff_c +++ b/devel/avr/binutils/patches/patch-binutils_wrcoff_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-binutils_wrcoff_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- binutils/wrcoff.c.orig Sat Sep 27 20:20:27 2008 -+++ binutils/wrcoff.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-binutils_wrcoff_c,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- binutils/wrcoff.c.orig Sun Dec 6 21:48:53 2009 ++++ binutils/wrcoff.c Sun Dec 6 21:48:53 2009 @@ -0,0 +1,3410 @@ +/* wrcoff.c -- Generate (AVR) COFF debugging information + Copyright 2003 Free Software Foundation, Inc. diff --git a/devel/avr/binutils/patches/patch-etc_Makefile_in b/devel/avr/binutils/patches/patch-etc_Makefile_in index defacbac76c..3111e303bbd 100644 --- a/devel/avr/binutils/patches/patch-etc_Makefile_in +++ b/devel/avr/binutils/patches/patch-etc_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-etc_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-etc_Makefile_in,v 1.3 2009/12/09 16:55:52 ckuethe Exp $ --- etc/Makefile.in.orig Tue Mar 27 11:09:32 2007 -+++ etc/Makefile.in Sat Sep 27 20:20:27 2008 ++++ etc/Makefile.in Sun Dec 6 21:48:53 2009 @@ -64,7 +64,8 @@ PDFFILES = standards.pdf configure.pdf HTMLFILES = standards.html configure.html diff --git a/devel/avr/binutils/patches/patch-gas_config_tc-avr_c b/devel/avr/binutils/patches/patch-gas_config_tc-avr_c index 1d82eb2529b..5c75fc9ea22 100644 --- a/devel/avr/binutils/patches/patch-gas_config_tc-avr_c +++ b/devel/avr/binutils/patches/patch-gas_config_tc-avr_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-gas_config_tc-avr_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- gas/config/tc-avr.c.orig Mon Aug 6 12:59:55 2007 -+++ gas/config/tc-avr.c Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-gas_config_tc-avr_c,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- gas/config/tc-avr.c.orig Fri Aug 29 09:58:02 2008 ++++ gas/config/tc-avr.c Sun Dec 6 21:48:53 2009 @@ -27,20 +27,21 @@ struct avr_opcodes_s @@ -29,20 +29,10 @@ $OpenBSD: patch-gas_config_tc-avr_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ }; const char comment_chars[] = ";"; -@@ -63,10 +64,20 @@ static struct mcu_type_s mcu_types[] = - { - {"avr1", AVR_ISA_TINY1, bfd_mach_avr1}, - {"avr2", AVR_ISA_TINY2, bfd_mach_avr2}, -- {"avr3", AVR_ISA_M103, 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}, -- {"avr6", AVR_ISA_ALL, bfd_mach_avr6}, -+ {"avr5", AVR_ISA_M323, bfd_mach_avr5}, -+ {"avr51", AVR_ISA_M128, bfd_mach_avr5}, -+ {"avr6", AVR_ISA_M256, bfd_mach_avr6}, +@@ -79,6 +80,13 @@ static struct mcu_type_s mcu_types[] = + {"avr5", AVR_ISA_AVR51, bfd_mach_avr5}, + {"avr51", AVR_ISA_AVR51, bfd_mach_avr51}, + {"avr6", AVR_ISA_AVR6, bfd_mach_avr6}, + {"avrxmega1", AVR_ISA_XMEGA, bfd_mach_avrxmega1}, + {"avrxmega2", AVR_ISA_XMEGA, bfd_mach_avrxmega2}, + {"avrxmega3", AVR_ISA_XMEGA, bfd_mach_avrxmega3}, @@ -51,118 +41,46 @@ $OpenBSD: patch-gas_config_tc-avr_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ + {"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}, -@@ -85,7 +96,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 +108,32 @@ static struct mcu_type_s mcu_types[] = - {"attiny25", AVR_ISA_TINY2, bfd_mach_avr2}, - {"attiny45", AVR_ISA_TINY2, bfd_mach_avr2}, - {"attiny85", AVR_ISA_TINY2, bfd_mach_avr2}, -+ {"attiny43u", AVR_ISA_TINY2, bfd_mach_avr2}, -+ {"attiny48", AVR_ISA_TINY2, bfd_mach_avr2}, -+ {"attiny88", AVR_ISA_TINY2, bfd_mach_avr2}, - {"atmega603", AVR_ISA_M603, bfd_mach_avr3}, /* XXX -> m103 */ - {"atmega103", AVR_ISA_M103, bfd_mach_avr3}, - {"at43usb320", AVR_ISA_M103, bfd_mach_avr3}, - {"at43usb355", AVR_ISA_M603, bfd_mach_avr3}, - {"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}, - {"atmega83", AVR_ISA_M8, bfd_mach_avr4}, /* XXX -> m8535 */ - {"atmega85", AVR_ISA_M8, bfd_mach_avr4}, /* XXX -> m8 */ - {"atmega88", AVR_ISA_PWMx, bfd_mach_avr4}, -+ {"atmega88p", AVR_ISA_PWMx, bfd_mach_avr4}, - {"atmega8515", AVR_ISA_M8, bfd_mach_avr4}, - {"atmega8535", AVR_ISA_M8, bfd_mach_avr4}, - {"atmega8hva", AVR_ISA_PWMx, bfd_mach_avr4}, - {"at90pwm1", AVR_ISA_PWMx, bfd_mach_avr4}, - {"at90pwm2", AVR_ISA_PWMx, bfd_mach_avr4}, -+ {"at90pwm2b", AVR_ISA_PWMx, bfd_mach_avr4}, - {"at90pwm3", AVR_ISA_PWMx, bfd_mach_avr4}, -+ {"at90pwm3b", AVR_ISA_PWMx, bfd_mach_avr4}, - {"atmega16", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega161", AVR_ISA_M161, bfd_mach_avr5}, - {"atmega162", AVR_ISA_M323, bfd_mach_avr5}, -@@ -121,6 +142,7 @@ static struct mcu_type_s mcu_types[] = - {"atmega165", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega165p", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega168", AVR_ISA_M323, bfd_mach_avr5}, -+ {"atmega168p", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega169", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega169p", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega32", AVR_ISA_M323, bfd_mach_avr5}, -@@ -128,12 +150,14 @@ static struct mcu_type_s mcu_types[] = - {"atmega324p", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega325", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega325p", AVR_ISA_M323, bfd_mach_avr5}, -+ {"atmega328p", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega329", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega329p", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega3250", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega3250p",AVR_ISA_M323, bfd_mach_avr5}, - {"atmega3290", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega3290p",AVR_ISA_M323, bfd_mach_avr5}, -+ {"atmega32hvb",AVR_ISA_M323, bfd_mach_avr5}, - {"atmega406", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega64", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega640", AVR_ISA_M323, bfd_mach_avr5}, -@@ -142,6 +166,7 @@ static struct mcu_type_s mcu_types[] = - {"atmega128", AVR_ISA_M128, bfd_mach_avr5}, - {"atmega1280", AVR_ISA_M128, bfd_mach_avr5}, - {"atmega1281", AVR_ISA_M128, bfd_mach_avr5}, -+ {"atmega1284p",AVR_ISA_M128, bfd_mach_avr5}, - {"atmega645", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega649", AVR_ISA_M323, bfd_mach_avr5}, - {"atmega6450", AVR_ISA_M323, bfd_mach_avr5}, -@@ -150,15 +175,20 @@ static struct mcu_type_s mcu_types[] = - {"at90can32" , AVR_ISA_M323, bfd_mach_avr5}, - {"at90can64" , AVR_ISA_M323, bfd_mach_avr5}, - {"at90can128", AVR_ISA_M128, bfd_mach_avr5}, -- {"at90usb82", AVR_ISA_M323, bfd_mach_avr5}, -- {"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}, - {"at90usb1287",AVR_ISA_M128, bfd_mach_avr5}, + {"attiny11", AVR_ISA_AVR1, bfd_mach_avr1}, + {"attiny12", AVR_ISA_AVR1, bfd_mach_avr1}, +@@ -173,6 +181,7 @@ static struct mcu_type_s mcu_types[] = + {"atmega32c1", AVR_ISA_AVR5, bfd_mach_avr5}, + {"atmega32m1", AVR_ISA_AVR5, bfd_mach_avr5}, + {"atmega32u4", AVR_ISA_AVR5, bfd_mach_avr5}, ++ {"atmega32u6", AVR_ISA_AVR5, bfd_mach_avr5}, + {"at90usb646", AVR_ISA_AVR5, bfd_mach_avr5}, + {"at90usb647", AVR_ISA_AVR5, 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}, +@@ -185,6 +194,16 @@ static struct mcu_type_s mcu_types[] = + {"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}, ++ {"atxmega16d4", AVR_ISA_XMEGA, bfd_mach_avrxmega2}, ++ {"atxmega32d4", AVR_ISA_XMEGA, bfd_mach_avrxmega2}, ++ {"atxmega32a4", AVR_ISA_XMEGA, bfd_mach_avrxmega3}, ++ {"atxmega64a3", AVR_ISA_XMEGA, bfd_mach_avrxmega4}, ++ {"atxmega64a1", AVR_ISA_XMEGA, bfd_mach_avrxmega5}, ++ {"atxmega128a3", AVR_ISA_XMEGA, bfd_mach_avrxmega6}, ++ {"atxmega256a3", AVR_ISA_XMEGA, bfd_mach_avrxmega6}, ++ {"atxmega256a3b",AVR_ISA_XMEGA, bfd_mach_avrxmega6}, ++ {"atxmega128a1", AVR_ISA_XMEGA, bfd_mach_avrxmega7}, {NULL, 0, 0} }; -@@ -645,7 +675,9 @@ avr_ldi_expression (expressionS *exp) - break; - - default: -- as_warn (_("expression dangerous with linker stubs")); -+ /* PR 5523: Do not generate a warning here, -+ legitimate code can trigger this case. */ -+ break; - } - } - return reloc_to_return; -@@ -790,7 +822,12 @@ avr_operand (struct avr_opcodes_s *opcode, +@@ -362,6 +381,11 @@ md_show_usage (FILE *stream) + " 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" ++ " avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K 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" ++ " avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n" + " or immediate microcontroller name.\n")); + fprintf (stream, + _(" -mall-opcodes accept all AVR opcodes, even if not supported by MCU\n" +@@ -789,7 +813,12 @@ avr_operand (struct avr_opcodes_s *opcode, if (*str == '+') { ++str; @@ -174,9 +92,9 @@ $OpenBSD: patch-gas_config_tc-avr_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ + op_mask |= (1 << (15 - (s - opcode->opcode))); + } } - break; -@@ -901,6 +938,16 @@ avr_operand (struct avr_opcodes_s *opcode, + /* attiny26 can do "lpm" and "lpm r,Z" but not "lpm r,Z+". */ +@@ -906,6 +935,16 @@ avr_operand (struct avr_opcodes_s *opcode, } break; diff --git a/devel/avr/binutils/patches/patch-gas_doc_as_1 b/devel/avr/binutils/patches/patch-gas_doc_as_1 new file mode 100644 index 00000000000..49fd287e116 --- /dev/null +++ b/devel/avr/binutils/patches/patch-gas_doc_as_1 @@ -0,0 +1,186 @@ +$OpenBSD: patch-gas_doc_as_1,v 1.1 2009/12/09 16:55:52 ckuethe Exp $ +--- gas/doc/as.1.orig Thu Oct 2 01:28:57 2008 ++++ gas/doc/as.1 Sun Dec 6 21:48:53 2009 +@@ -1,15 +1,7 @@ +-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 ++.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) + .\" + .\" Standard preamble: + .\" ======================================================================== +-.de Sh \" Subsection heading +-.br +-.if t .Sp +-.ne 5 +-.PP +-\fB\\$1\fR +-.PP +-.. + .de Sp \" Vertical space (when we can't use .PP) + .if t .sp .5v + .if n .sp +@@ -25,11 +17,11 @@ + .. + .\" Set up some character translations and predefined strings. \*(-- will + .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +-.\" double quote, and \*(R" will give a right double quote. | will give a +-.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to +-.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' +-.\" expand to `' in nroff, nothing in troff, for use with C<>. +-.tr \(*W-|\(bv\*(Tr ++.\" double quote, and \*(R" will give a right double quote. \*(C+ will ++.\" give a nicer C++. Capital omega is used to do unbreakable dashes and ++.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, ++.\" nothing in troff, for use with C<>. ++.tr \(*W- + .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' + .ie n \{\ + . ds -- \(*W- +@@ -48,22 +40,26 @@ + . ds R" '' + 'br\} + .\" ++.\" Escape single quotes in literal strings from groff's Unicode transform. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' ++.\" + .\" If the F register is turned on, we'll generate index entries on stderr for +-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index ++.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index + .\" entries marked with X<> in POD. Of course, you'll have to process the + .\" output yourself in some meaningful fashion. +-.if \nF \{\ ++.ie \nF \{\ + . de IX + . tm Index:\\$1\t\\n%\t"\\$2" + .. + . nr % 0 + . rr F + .\} ++.el \{\ ++. de IX ++.. ++.\} + .\" +-.\" For nroff, turn off justification. Always turn off hyphenation; it makes +-.\" way too many mistakes in technical documents. +-.hy 0 +-.\" + .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). + .\" Fear. Run. Save yourself. No user-serviceable parts. + . \" fudge factors for nroff and troff +@@ -128,7 +124,11 @@ + .\" ======================================================================== + .\" + .IX Title "AS 1" +-.TH AS 1 "2008-10-02" "binutils-2.18.92" "GNU Development Tools" ++.TH AS 1 "2009-12-06" "binutils-2.19.1" "GNU Development Tools" ++.\" For nroff, turn off justification. Always turn off hyphenation; it makes ++.\" way too many mistakes in technical documents. ++.if n .ad l ++.nh + .SH "NAME" + AS \- the portable GNU assembler. + .SH "SYNOPSIS" +@@ -185,7 +185,7 @@ as [\fB\-a\fR[\fBcdghlns\fR][=\fIfile\fR]] [\fB\-\-alt + .PP + \&\fITarget i386 options:\fR + [\fB\-\-32\fR|\fB\-\-64\fR] [\fB\-n\fR] +- [\fB\-march\fR=\fI\s-1CPU\s0\fR[+\fI\s-1EXTENSION\s0\fR...]] [\fB\-mtune\fR=\fI\s-1CPU\s0\fR] ++ [\fB\-march\fR=\fI\s-1CPU\s0\fR[+\fI\s-1EXTENSION\s0\fR...]] [\fB\-mtune\fR=\fI\s-1CPU\s0\fR] + .PP + \&\fITarget i960 options:\fR + [\fB\-ACA\fR|\fB\-ACA_A\fR|\fB\-ACB\fR|\fB\-ACC\fR|\fB\-AKA\fR|\fB\-AKB\fR| +@@ -256,7 +256,7 @@ as [\fB\-a\fR[\fBcdghlns\fR][=\fIfile\fR]] [\fB\-\-alt + \&\fITarget \s-1PDP11\s0 options:\fR + [\fB\-mpic\fR|\fB\-mno\-pic\fR] [\fB\-mall\fR] [\fB\-mno\-extensions\fR] + [\fB\-m\fR\fIextension\fR|\fB\-mno\-\fR\fIextension\fR] +- [\fB\-m\fR\fIcpu\fR] [\fB\-m\fR\fImachine\fR] ++ [\fB\-m\fR\fIcpu\fR] [\fB\-m\fR\fImachine\fR] + .PP + \&\fITarget picoJava options:\fR + [\fB\-mb\fR|\fB\-me\fR] +@@ -346,7 +346,7 @@ The assembler arguments must be separated from each ot + by commas. For example: + .PP + .Vb 1 +-\& gcc -c -g -O -Wa,-alh,-L file.c ++\& gcc \-c \-g \-O \-Wa,\-alh,\-L file.c + .Ve + .PP + This passes two options to the assembler: \fB\-alh\fR (emit a listing to +@@ -365,7 +365,7 @@ assembler.) + Read command-line options from \fIfile\fR. The options read are + inserted in place of the original @\fIfile\fR option. If \fIfile\fR + does not exist, or cannot be read, then the option will be treated +-literally, and not removed. ++literally, and not removed. + .Sp + Options in \fIfile\fR are separated by whitespace. A whitespace + character may be included in an option by surrounding the entire +@@ -428,7 +428,7 @@ Define the symbol \fIsym\fR to be \fIvalue\fR before a + \&\fIvalue\fR must be an integer constant. As in C, a leading \fB0x\fR + indicates a hexadecimal value, and a leading \fB0\fR indicates an octal + value. The value of the symbol can be overridden inside a source file via the +-use of a \f(CW\*(C`.set\*(C'\fR pseudo\-op. ++use of a \f(CW\*(C`.set\*(C'\fR pseudo-op. + .IP "\fB\-f\fR" 4 + .IX Item "-f" + \&\*(L"fast\*(R"\-\-\-skip whitespace and comment preprocessing (assume source is +@@ -665,11 +665,11 @@ is normally the M32R, but this option changes it to th + .IP "\fB\-\-warn\-explicit\-parallel\-conflicts or \-\-Wp\fR" 4 + .IX Item "--warn-explicit-parallel-conflicts or --Wp" + Produce warning messages when questionable parallel constructs are +-encountered. ++encountered. + .IP "\fB\-\-no\-warn\-explicit\-parallel\-conflicts or \-\-Wnp\fR" 4 + .IX Item "--no-warn-explicit-parallel-conflicts or --Wnp" + Do not produce warning messages when questionable parallel constructs are +-encountered. ++encountered. + .PP + The following options are available when as is configured for the + Motorola 68000 series. +@@ -702,7 +702,7 @@ For details about the \s-1PDP\-11\s0 machine dependent + see \fBPDP\-11\-Options\fR. + .IP "\fB\-mpic | \-mno\-pic\fR" 4 + .IX Item "-mpic | -mno-pic" +-Generate position-independent (or position\-dependent) code. The ++Generate position-independent (or position-dependent) code. The + default is \fB\-mpic\fR. + .IP "\fB\-mall\fR" 4 + .IX Item "-mall" +@@ -746,13 +746,13 @@ defined by the configuration option when building the + Specify to use the 16\-bit integer \s-1ABI\s0. + .IP "\fB\-mlong\fR" 4 + .IX Item "-mlong" +-Specify to use the 32\-bit integer \s-1ABI\s0. ++Specify to use the 32\-bit integer \s-1ABI\s0. + .IP "\fB\-mshort\-double\fR" 4 + .IX Item "-mshort-double" +-Specify to use the 32\-bit double \s-1ABI\s0. ++Specify to use the 32\-bit double \s-1ABI\s0. + .IP "\fB\-mlong\-double\fR" 4 + .IX Item "-mlong-double" +-Specify to use the 64\-bit double \s-1ABI\s0. ++Specify to use the 64\-bit double \s-1ABI\s0. + .IP "\fB\-\-force\-long\-branches\fR" 4 + .IX Item "--force-long-branches" + Relative branches are turned into absolute ones. This concerns +@@ -801,7 +801,7 @@ equivalent to \-Av8plus and \-Av8plusa, respectively. + Warn when the assembler switches to another architecture. + .PP + The following options are available when as is configured for the 'c54x +-architecture. ++architecture. + .IP "\fB\-mfar\-mode\fR" 4 + .IX Item "-mfar-mode" + Enable extended addressing mode. All addresses and relocations will assume +@@ -1124,7 +1124,7 @@ Issue a warning for undocumented Z80 instructions that + .IP "\fB\-Wup\fR" 4 + .IX Item "-Wup" + .PD +-Issue a warning for undocumented Z80 instructions that do not work on R800. ++Issue a warning for undocumented Z80 instructions that do not work on R800. + .IP "\fB\-forbid\-undocumented\-instructions\fR" 4 + .IX Item "-forbid-undocumented-instructions" + .PD 0 diff --git a/devel/avr/binutils/patches/patch-gas_doc_c-avr_texi b/devel/avr/binutils/patches/patch-gas_doc_c-avr_texi index 016d9979e55..92ab07bda07 100644 --- a/devel/avr/binutils/patches/patch-gas_doc_c-avr_texi +++ b/devel/avr/binutils/patches/patch-gas_doc_c-avr_texi @@ -1,43 +1,39 @@ -$OpenBSD: patch-gas_doc_c-avr_texi,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- gas/doc/c-avr.texi.orig Mon Aug 6 13:00:08 2007 -+++ gas/doc/c-avr.texi Sat Sep 27 20:20:27 2008 -@@ -41,24 +41,26 @@ Instruction set avr2 (default) is for the classic AVR - attiny26, at90s2333, at90s2343, at90s4414, at90s4433, at90s4434, - at90s8515, at90c8534, at90s8535, at86rf401, attiny13, attiny2313, - attiny261, attiny461, attiny861, attiny24, attiny44, attiny84, attiny25, --attiny45, attiny85). -+attiny45, attiny85, attiny43u, attiny48, attiny88). +$OpenBSD: patch-gas_doc_c-avr_texi,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- gas/doc/c-avr.texi.orig Fri Aug 29 09:58:02 2008 ++++ gas/doc/c-avr.texi Sun Dec 6 21:48:53 2009 +@@ -67,7 +67,7 @@ atmega323, atmega324p, atmega325, atmega325p, atmega32 + atmega328p, atmega329, atmega329p, atmega3290, atmega3290p, atmega406, atmega64, + atmega640, atmega644, atmega644p, atmega645, atmega6450, atmega649, atmega6490, + atmega16hva, at90can32, at90can64, at90pwm216, at90pwm316, atmega16u4, +-atmega32c1, atmega32m1, atmega32u4, at90usb646, at90usb647, at94k). ++atmega32c1, atmega32m1, atmega32u4, atmega32u6, at90usb646, at90usb647, at94k). - 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, attiny167). + Instruction set avr51 is for the enhanced AVR core with exactly 128K program + memory space (MCU types: atmega128, atmega1280, atmega1281, atmega1284p, +@@ -75,6 +75,26 @@ at90can128, at90usb1286, at90usb1287). --Instruction set avr4 is for the enhanced AVR core with up to 8K program --memory space (MCU types: atmega48, atmega8, atmega83, atmega85, atmega88, --atmega8515, atmega8535, atmega8hva, at90pwm1, at90pwm2, at90pwm3). -+Instruction set avr4 is for the enhanced AVR core with up to 8K -+program memory space (MCU types: atmega48, atmega48p, atmega8, -+atmega83, atmega85, atmega88, atmega88p, atmega8515, atmega8535, -+atmega8hva, at90pwm1, at90pwm2, at90pwm2b, at90pwm3, at90pwm3b). + Instruction set avr6 is for the enhanced AVR core with a 3-byte PC (MCU types: + atmega2560, atmega2561). ++ ++Instruction set avrxmega2 is for the XMEGA AVR core with 8K to 64K program ++memory space and less than 64K data space (MCU types: atxmega16a4, atxmega16d4, ++atxmega32d4). ++ ++Instruction set avrxmega3 is for the XMEGA AVR core with 8K to 64K program ++memory space and greater than 64K data space (MCU types: atxmega32a4). ++ ++Instruction set avrxmega4 is for the XMEGA AVR core with up to 64K program ++memory space and less than 64K data space (MCU types: atxmega64a3). ++ ++Instruction set avrxmega5 is for the XMEGA AVR core with up to 64K program ++memory space and greater than 64K data space (MCU types: atxmega64a1). ++ ++Instruction set avrxmega6 is for the XMEGA AVR core with up to 256K program ++memory space and less than 64K data space (MCU types: atxmega128a3, ++atxmega256a3, atxmega256a3b). ++ ++Instruction set avrxmega7 is for the XMEGA AVR core with up to 256K program ++memory space and greater than 64K data space (MCU types: atxmega128a1). --Instruction set avr5 is for the enhanced AVR core with up to 128K program --memory space (MCU types: atmega16, atmega161, atmega162, atmega163, --atmega164p, atmega165, atmega165p, atmega168, atmega169, atmega169p, --atmega32, atmega323, atmega324p, atmega325, atmega325p, atmega329, --atmega329p, atmega3250, atmega3250p, atmega3290, atmega3290p, atmega406, --atmega64, atmega640, atmega644, atmega644p, atmega128, atmega1280, --atmega1281, atmega645, atmega649, atmega6450, atmega6490, atmega16hva, --at90can32, at90can64, at90can128, at90usb82, at90usb162, at90usb646, -+Instruction set avr5 is for the enhanced AVR core with up to 128K -+program memory space (MCU types: atmega16, atmega161, atmega162, -+atmega163, atmega164p, atmega165, atmega165p, atmega168, atmega168p, -+atmega169, atmega169p, atmega32, atmega32hvb, atmega323, atmega324p, atmega325, -+atmega325p, atmega328p, atmega329, atmega329p, atmega3250, -+atmega3250p, atmega3290, atmega3290p, atmega406, atmega64, atmega640, -+atmega644, atmega644p, atmega128, atmega1280, atmega1281, atmega1284p, atmega645, -+atmega649, atmega6450, atmega6490, atmega16hva, at90can32, at90can64, -+at90can128, at90pwm216, at90pwm316, atmega32c1, atmega32m1, atmega32u4, at90usb646, - at90usb647, at90usb1286, at90usb1287, at94k). - - Instruction set avr6 is for the enhanced AVR core with 256K program + @cindex @code{-mall-opcodes} command line option, AVR + @item -mall-opcodes diff --git a/devel/avr/binutils/patches/patch-include_coff_avr_h b/devel/avr/binutils/patches/patch-include_coff_avr_h index 7b5e66503b1..d7f2845a3ce 100644 --- a/devel/avr/binutils/patches/patch-include_coff_avr_h +++ b/devel/avr/binutils/patches/patch-include_coff_avr_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-include_coff_avr_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- include/coff/avr.h.orig Sat Sep 27 20:20:27 2008 -+++ include/coff/avr.h Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-include_coff_avr_h,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- include/coff/avr.h.orig Sun Dec 6 21:48:53 2009 ++++ include/coff/avr.h Sun Dec 6 21:48:53 2009 @@ -0,0 +1,110 @@ +/* coff information for Atmel AVR. + diff --git a/devel/avr/binutils/patches/patch-include_coff_internal_h b/devel/avr/binutils/patches/patch-include_coff_internal_h index 960bcd50d07..42ede6f4b68 100644 --- a/devel/avr/binutils/patches/patch-include_coff_internal_h +++ b/devel/avr/binutils/patches/patch-include_coff_internal_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-include_coff_internal_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- include/coff/internal.h.orig Mon Aug 6 12:59:46 2007 -+++ include/coff/internal.h Sat Sep 27 20:20:27 2008 +$OpenBSD: patch-include_coff_internal_h,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- include/coff/internal.h.orig Thu Jul 12 00:16:41 2007 ++++ include/coff/internal.h Sun Dec 6 21:48:53 2009 @@ -630,6 +630,8 @@ union internal_auxent }; diff --git a/devel/avr/binutils/patches/patch-include_elf_avr_h b/devel/avr/binutils/patches/patch-include_elf_avr_h index 601f01e4823..5bb9d805da3 100644 --- a/devel/avr/binutils/patches/patch-include_elf_avr_h +++ b/devel/avr/binutils/patches/patch-include_elf_avr_h @@ -1,12 +1,10 @@ -$OpenBSD: patch-include_elf_avr_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- include/elf/avr.h.orig Wed May 24 00:36:11 2006 -+++ include/elf/avr.h Sat Sep 27 20:20:27 2008 -@@ -35,7 +35,14 @@ - #define E_AVR_MACH_AVR3 3 - #define E_AVR_MACH_AVR4 4 +$OpenBSD: patch-include_elf_avr_h,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- include/elf/avr.h.orig Fri Aug 8 22:35:13 2008 ++++ include/elf/avr.h Sun Dec 6 21:48:53 2009 +@@ -40,6 +40,13 @@ #define E_AVR_MACH_AVR5 5 --#define E_AVR_MACH_AVR6 6 -+#define E_AVR_MACH_AVR6 6 + #define E_AVR_MACH_AVR51 51 + #define E_AVR_MACH_AVR6 6 +#define E_AVR_MACH_XMEGA1 101 +#define E_AVR_MACH_XMEGA2 102 +#define E_AVR_MACH_XMEGA3 103 diff --git a/devel/avr/binutils/patches/patch-include_opcode_avr_h b/devel/avr/binutils/patches/patch-include_opcode_avr_h index 4e5bcc33f51..66dc5986f65 100644 --- a/devel/avr/binutils/patches/patch-include_opcode_avr_h +++ b/devel/avr/binutils/patches/patch-include_opcode_avr_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-include_opcode_avr_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- include/opcode/avr.h.orig Fri Apr 7 08:18:08 2006 -+++ include/opcode/avr.h Sat Sep 27 20:20:28 2008 -@@ -30,21 +30,31 @@ +$OpenBSD: patch-include_opcode_avr_h,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- include/opcode/avr.h.orig Fri Aug 8 22:35:13 2008 ++++ include/opcode/avr.h Sun Dec 6 21:48:53 2009 +@@ -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 */ @@ -9,31 +9,17 @@ $OpenBSD: patch-include_opcode_avr_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +#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) #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) +@@ -48,6 +50,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 - -@@ -90,6 +100,7 @@ + #define AVR_ISA_AVR1 AVR_ISA_TINY1 + #define AVR_ISA_AVR2 AVR_ISA_2xxx +@@ -108,6 +112,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) @@ -41,7 +27,7 @@ $OpenBSD: patch-include_opcode_avr_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ? - use this opcode entry if no parameters, else use next opcode entry Order is important - some binary opcodes have more than one name, -@@ -150,7 +161,8 @@ AVR_INSN (reti, "", "1001010100011000", 1, AVR_ISA_ +@@ -168,7 +173,8 @@ AVR_INSN (reti, "", "1001010100011000", 1, AVR_ISA_ 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) @@ -51,7 +37,7 @@ $OpenBSD: patch-include_opcode_avr_h,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ AVR_INSN (adc, "r,r", "000111rdddddrrrr", 1, AVR_ISA_1200, 0x1c00) AVR_INSN (add, "r,r", "000011rdddddrrrr", 1, AVR_ISA_1200, 0x0c00) -@@ -263,4 +275,7 @@ AVR_INSN (st, "e,r", "100!001rrrrree-+", 1, AVR_ISA_ +@@ -281,4 +287,7 @@ AVR_INSN (st, "e,r", "100!001rrrrree-+", 1, AVR_ISA_ (>128K program memory, PC = EIND:Z). */ AVR_INSN (eicall, "", "1001010100011001", 1, AVR_ISA_EIND, 0x9519) AVR_INSN (eijmp, "", "1001010000011001", 1, AVR_ISA_EIND, 0x9419) diff --git a/devel/avr/binutils/patches/patch-ld_Makefile_am b/devel/avr/binutils/patches/patch-ld_Makefile_am index 95b859cc8ed..c6c7ffb498c 100644 --- a/devel/avr/binutils/patches/patch-ld_Makefile_am +++ b/devel/avr/binutils/patches/patch-ld_Makefile_am @@ -1,9 +1,9 @@ -$OpenBSD: patch-ld_Makefile_am,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/Makefile.am.orig Mon Aug 6 13:00:17 2007 -+++ ld/Makefile.am Sat Sep 27 20:20:28 2008 -@@ -138,6 +138,13 @@ ALL_EMULATIONS = \ - eavr4.o \ +$OpenBSD: patch-ld_Makefile_am,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/Makefile.am.orig Tue Dec 23 05:54:51 2008 ++++ ld/Makefile.am Sun Dec 6 21:48:53 2009 +@@ -142,6 +142,13 @@ ALL_EMULATIONS = \ eavr5.o \ + eavr51.o \ eavr6.o \ + eavrxmega1.o \ + eavrxmega2.o \ @@ -15,7 +15,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ecoff_i860.o \ ecoff_sparc.o \ eelf32_spu.o \ -@@ -622,6 +629,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emulte +@@ -646,6 +653,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emulte $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} avr6 "$(tdir_avr2)" diff --git a/devel/avr/binutils/patches/patch-ld_Makefile_in b/devel/avr/binutils/patches/patch-ld_Makefile_in index 7d21d0920d9..550a75083aa 100644 --- a/devel/avr/binutils/patches/patch-ld_Makefile_in +++ b/devel/avr/binutils/patches/patch-ld_Makefile_in @@ -1,9 +1,9 @@ -$OpenBSD: patch-ld_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/Makefile.in.orig Mon Aug 6 13:29:54 2007 -+++ ld/Makefile.in Sat Sep 27 20:20:28 2008 -@@ -385,6 +385,13 @@ ALL_EMULATIONS = \ - eavr4.o \ +$OpenBSD: patch-ld_Makefile_in,v 1.3 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/Makefile.in.orig Tue Dec 23 05:54:52 2008 ++++ ld/Makefile.in Sun Dec 6 21:48:54 2009 +@@ -393,6 +393,13 @@ ALL_EMULATIONS = \ eavr5.o \ + eavr51.o \ eavr6.o \ + eavrxmega1.o \ + eavrxmega2.o \ @@ -15,7 +15,7 @@ $OpenBSD: patch-ld_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ ecoff_i860.o \ ecoff_sparc.o \ eelf32_spu.o \ -@@ -1448,6 +1455,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emulte +@@ -1478,6 +1485,34 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(srcdir)/emulte $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} avr6 "$(tdir_avr2)" diff --git a/devel/avr/binutils/patches/patch-ld_configure_tgt b/devel/avr/binutils/patches/patch-ld_configure_tgt index 333969f08d9..0eba305a177 100644 --- a/devel/avr/binutils/patches/patch-ld_configure_tgt +++ b/devel/avr/binutils/patches/patch-ld_configure_tgt @@ -1,12 +1,12 @@ -$OpenBSD: patch-ld_configure_tgt,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/configure.tgt.orig Tue Aug 28 10:19:42 2007 -+++ ld/configure.tgt Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_configure_tgt,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/configure.tgt.orig Fri Aug 8 22:35:13 2008 ++++ ld/configure.tgt Sun Dec 6 21:48:54 2009 @@ -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" +- targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6" ++ targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6 avrxmega1 avrxmega2 avrxmega3 avrxmega4 avrxmega5 avrxmega6 avrxmega7" ;; bfin-*-elf) targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avr1_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avr1_sh index 5dfb15748ad..0b7932f76f2 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avr1_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avr1_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avr1_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-ld_emulparams_avr1_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ --- ld/emulparams/avr1.sh.orig Wed May 24 00:36:11 2006 -+++ ld/emulparams/avr1.sh Sat Sep 27 20:20:28 2008 ++++ ld/emulparams/avr1.sh Sun Dec 6 21:48:54 2009 @@ -7,5 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=elf32 diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avr2_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avr2_sh index c500f8546dc..8a57daec80b 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avr2_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avr2_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avr2_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-ld_emulparams_avr2_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ --- ld/emulparams/avr2.sh.orig Wed May 24 00:36:11 2006 -+++ ld/emulparams/avr2.sh Sat Sep 27 20:20:28 2008 ++++ ld/emulparams/avr2.sh Sun Dec 6 21:48:54 2009 @@ -7,5 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=elf32 diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avr3_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avr3_sh index 801f08e6b43..756f1a04629 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avr3_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avr3_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avr3_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-ld_emulparams_avr3_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ --- ld/emulparams/avr3.sh.orig Wed May 24 00:36:11 2006 -+++ ld/emulparams/avr3.sh Sat Sep 27 20:20:28 2008 ++++ ld/emulparams/avr3.sh Sun Dec 6 21:48:54 2009 @@ -7,5 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=elf32 diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avr4_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avr4_sh index 71f3027d7eb..433050fe484 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avr4_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avr4_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avr4_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-ld_emulparams_avr4_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ --- ld/emulparams/avr4.sh.orig Wed May 24 00:36:11 2006 -+++ ld/emulparams/avr4.sh Sat Sep 27 20:20:28 2008 ++++ ld/emulparams/avr4.sh Sun Dec 6 21:48:54 2009 @@ -7,5 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=elf32 diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avr5_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avr5_sh index 63698effaca..cac71f0a43e 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avr5_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avr5_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avr5_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-ld_emulparams_avr5_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ --- ld/emulparams/avr5.sh.orig Wed May 24 00:36:11 2006 -+++ ld/emulparams/avr5.sh Sat Sep 27 20:20:28 2008 ++++ ld/emulparams/avr5.sh Sun Dec 6 21:48:54 2009 @@ -7,5 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=elf32 diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avr6_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avr6_sh index b3b953d7980..c40f635b1a7 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avr6_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avr6_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avr6_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ +$OpenBSD: patch-ld_emulparams_avr6_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ --- ld/emulparams/avr6.sh.orig Wed May 24 00:36:11 2006 -+++ ld/emulparams/avr6.sh Sat Sep 27 20:20:28 2008 ++++ ld/emulparams/avr6.sh Sun Dec 6 21:48:54 2009 @@ -7,5 +7,6 @@ EMBEDDED=yes TEMPLATE_NAME=elf32 diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega1_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega1_sh index 2fd73d46e26..b85c5ff2dab 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega1_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega1_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega1_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega1.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega1.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega1_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega1.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega1.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:101 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega2_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega2_sh index cb899b19312..f3409e8cc64 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega2_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega2_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega2_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega2.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega2.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega2_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega2.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega2.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:102 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega3_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega3_sh index 501ae381686..1219035f5b8 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega3_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega3_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega3_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega3.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega3.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega3_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega3.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega3.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:103 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega4_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega4_sh index ee0b9509df1..23f6c9224a7 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega4_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega4_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega4_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega4.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega4.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega4_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega4.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega4.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:104 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega5_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega5_sh index cf7990df3dc..30ed8d511a8 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega5_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega5_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega5_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega5.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega5.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega5_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega5.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega5.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:105 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega6_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega6_sh index b7f549467c5..5d2dec8c378 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega6_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega6_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega6_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega6.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega6.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega6_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega6.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega6.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:106 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega7_sh b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega7_sh index adf33476f27..ad1012b9659 100644 --- a/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega7_sh +++ b/devel/avr/binutils/patches/patch-ld_emulparams_avrxmega7_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_emulparams_avrxmega7_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emulparams/avrxmega7.sh.orig Sat Sep 27 20:20:28 2008 -+++ ld/emulparams/avrxmega7.sh Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_emulparams_avrxmega7_sh,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emulparams/avrxmega7.sh.orig Sun Dec 6 21:48:54 2009 ++++ ld/emulparams/avrxmega7.sh Sun Dec 6 21:48:54 2009 @@ -0,0 +1,12 @@ +ARCH=avr:107 +MACHINE= diff --git a/devel/avr/binutils/patches/patch-ld_emultempl_avrelf_em b/devel/avr/binutils/patches/patch-ld_emultempl_avrelf_em index 94ec1a54d2b..3ac5b20caf7 100644 --- a/devel/avr/binutils/patches/patch-ld_emultempl_avrelf_em +++ b/devel/avr/binutils/patches/patch-ld_emultempl_avrelf_em @@ -1,19 +1,14 @@ -$OpenBSD: patch-ld_emultempl_avrelf_em,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/emultempl/avrelf.em.orig Mon Aug 6 13:00:21 2007 -+++ ld/emultempl/avrelf.em Sat Sep 27 20:20:28 2008 -@@ -71,8 +71,15 @@ avr_elf_${EMULATION_NAME}_before_allocation (void) +$OpenBSD: patch-ld_emultempl_avrelf_em,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/emultempl/avrelf.em.orig Sun Jul 6 17:46:51 2008 ++++ ld/emultempl/avrelf.em Sun Dec 6 21:48:54 2009 +@@ -71,8 +71,10 @@ avr_elf_${EMULATION_NAME}_before_allocation (void) 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. */ ++ /* We only need stubs for avr6, avrxmega6, and avrxmega7. */ + 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; diff --git a/devel/avr/binutils/patches/patch-ld_genscripts_sh b/devel/avr/binutils/patches/patch-ld_genscripts_sh deleted file mode 100644 index b74f231b5d2..00000000000 --- a/devel/avr/binutils/patches/patch-ld_genscripts_sh +++ /dev/null @@ -1,50 +0,0 @@ -$OpenBSD: patch-ld_genscripts_sh,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/genscripts.sh.orig Sun Aug 12 12:00:07 2007 -+++ ld/genscripts.sh Sat Sep 27 20:20:28 2008 -@@ -390,30 +390,30 @@ case " $EMULATION_LIBPATH " in - *" ${EMULATION_NAME} "*) COMPILE_IN=true;; - esac - --if test -n "${BASH+set}"; then -+#if test -n "${BASH+set}"; then -+# source_em() -+# { -+# local current_script="$em_script" -+# em_script=$1 -+# . $em_script -+# em_script=$current_script -+# } -+# fragment() -+# { -+# local lineno=$[${BASH_LINENO[0]} + 1] -+# echo >> e${EMULATION_NAME}.c "#line $lineno \"$em_script\"" -+# cat >> e${EMULATION_NAME}.c -+# } -+#else - source_em() - { -- local current_script="$em_script" -- em_script=$1 -- . $em_script -- em_script=$current_script -- } -- fragment() -- { -- local lineno=$[${BASH_LINENO[0]} + 1] -- echo >> e${EMULATION_NAME}.c "#line $lineno \"$em_script\"" -- cat >> e${EMULATION_NAME}.c -- } --else -- source_em() -- { - . $1 - } - fragment() - { - cat >> e${EMULATION_NAME}.c - } --fi -+#fi - - # Generate e${EMULATION_NAME}.c. - # Start with an empty file, then the sourced .em script diff --git a/devel/avr/binutils/patches/patch-ld_scripttempl_avr_sc b/devel/avr/binutils/patches/patch-ld_scripttempl_avr_sc index 6d69ba3afd0..cb12278f389 100644 --- a/devel/avr/binutils/patches/patch-ld_scripttempl_avr_sc +++ b/devel/avr/binutils/patches/patch-ld_scripttempl_avr_sc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_scripttempl_avr_sc,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- ld/scripttempl/avr.sc.orig Wed May 24 00:36:12 2006 -+++ ld/scripttempl/avr.sc Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-ld_scripttempl_avr_sc,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- ld/scripttempl/avr.sc.orig Thu Oct 9 05:18:31 2008 ++++ ld/scripttempl/avr.sc Sun Dec 6 21:48:54 2009 @@ -4,9 +4,12 @@ OUTPUT_ARCH(${ARCH}) MEMORY diff --git a/devel/avr/binutils/patches/patch-libiberty_Makefile_in b/devel/avr/binutils/patches/patch-libiberty_Makefile_in index 75ae8292604..f4c24c7e6ab 100644 --- a/devel/avr/binutils/patches/patch-libiberty_Makefile_in +++ b/devel/avr/binutils/patches/patch-libiberty_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-libiberty_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ ---- libiberty/Makefile.in.orig Mon Aug 6 12:59:45 2007 -+++ libiberty/Makefile.in Sat Sep 27 20:20:28 2008 -@@ -344,7 +344,8 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC) +$OpenBSD: patch-libiberty_Makefile_in,v 1.3 2009/12/09 16:55:52 ckuethe Exp $ +--- libiberty/Makefile.in.orig Thu Jul 24 06:51:49 2008 ++++ libiberty/Makefile.in Sun Dec 6 21:48:54 2009 +@@ -346,7 +346,8 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC) @MAINT@ echo stamp > stamp-functions INSTALL_DEST = @INSTALL_DEST@ diff --git a/devel/avr/binutils/patches/patch-opcodes_Makefile_in b/devel/avr/binutils/patches/patch-opcodes_Makefile_in index f405b8eb246..f98c3209116 100644 --- a/devel/avr/binutils/patches/patch-opcodes_Makefile_in +++ b/devel/avr/binutils/patches/patch-opcodes_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-opcodes_Makefile_in,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ ---- opcodes/Makefile.in.orig Mon Aug 6 13:21:34 2007 -+++ opcodes/Makefile.in Sat Sep 27 20:20:28 2008 -@@ -876,7 +876,8 @@ installdirs-am: +$OpenBSD: patch-opcodes_Makefile_in,v 1.3 2009/12/09 16:55:52 ckuethe Exp $ +--- opcodes/Makefile.in.orig Tue Sep 9 01:02:19 2008 ++++ opcodes/Makefile.in Sun Dec 6 21:48:54 2009 +@@ -879,7 +879,8 @@ installdirs-am: for dir in "$(DESTDIR)$(bfdlibdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done diff --git a/devel/avr/binutils/patches/patch-opcodes_avr-dis_c b/devel/avr/binutils/patches/patch-opcodes_avr-dis_c index b2db0c0dadf..727a8fc47ab 100644 --- a/devel/avr/binutils/patches/patch-opcodes_avr-dis_c +++ b/devel/avr/binutils/patches/patch-opcodes_avr-dis_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-opcodes_avr-dis_c,v 1.1 2008/10/01 04:46:20 ckuethe Exp $ ---- opcodes/avr-dis.c.orig Mon Aug 6 12:58:38 2007 -+++ opcodes/avr-dis.c Sat Sep 27 20:20:28 2008 +$OpenBSD: patch-opcodes_avr-dis_c,v 1.2 2009/12/09 16:55:52 ckuethe Exp $ +--- opcodes/avr-dis.c.orig Thu Jul 5 02:49:00 2007 ++++ opcodes/avr-dis.c Sun Dec 6 21:48:54 2009 @@ -50,7 +50,7 @@ static const char * comment_start = "0x"; static int diff --git a/devel/avr/binutils/pkg/PLIST b/devel/avr/binutils/pkg/PLIST index 66830595a39..4586430ce99 100644 --- a/devel/avr/binutils/pkg/PLIST +++ b/devel/avr/binutils/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2008/10/01 04:46:20 ckuethe Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/12/09 16:55:52 ckuethe Exp $ avr/ avr/bin/ @bin avr/bin/ar @@ -21,11 +21,26 @@ avr/lib/ldscripts/avr2.xbn avr/lib/ldscripts/avr2.xn avr/lib/ldscripts/avr2.xr avr/lib/ldscripts/avr2.xu +avr/lib/ldscripts/avr25.x +avr/lib/ldscripts/avr25.xbn +avr/lib/ldscripts/avr25.xn +avr/lib/ldscripts/avr25.xr +avr/lib/ldscripts/avr25.xu avr/lib/ldscripts/avr3.x avr/lib/ldscripts/avr3.xbn avr/lib/ldscripts/avr3.xn avr/lib/ldscripts/avr3.xr avr/lib/ldscripts/avr3.xu +avr/lib/ldscripts/avr31.x +avr/lib/ldscripts/avr31.xbn +avr/lib/ldscripts/avr31.xn +avr/lib/ldscripts/avr31.xr +avr/lib/ldscripts/avr31.xu +avr/lib/ldscripts/avr35.x +avr/lib/ldscripts/avr35.xbn +avr/lib/ldscripts/avr35.xn +avr/lib/ldscripts/avr35.xr +avr/lib/ldscripts/avr35.xu avr/lib/ldscripts/avr4.x avr/lib/ldscripts/avr4.xbn avr/lib/ldscripts/avr4.xn @@ -36,6 +51,11 @@ avr/lib/ldscripts/avr5.xbn avr/lib/ldscripts/avr5.xn avr/lib/ldscripts/avr5.xr avr/lib/ldscripts/avr5.xu +avr/lib/ldscripts/avr51.x +avr/lib/ldscripts/avr51.xbn +avr/lib/ldscripts/avr51.xn +avr/lib/ldscripts/avr51.xr +avr/lib/ldscripts/avr51.xu avr/lib/ldscripts/avr6.x avr/lib/ldscripts/avr6.xbn avr/lib/ldscripts/avr6.xn