SOURCES: crossavr-binutils-coff-avr.patch, crossavr-binutils-newde...

glen glen at pld-linux.org
Wed Apr 11 02:34:29 CEST 2007


Author: glen                         Date: Wed Apr 11 00:34:29 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged for 2.17.50.0.14

---- Files affected:
SOURCES:
   crossavr-binutils-coff-avr.patch (1.1 -> 1.2) , crossavr-binutils-newdevices.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/crossavr-binutils-coff-avr.patch
diff -u SOURCES/crossavr-binutils-coff-avr.patch:1.1 SOURCES/crossavr-binutils-coff-avr.patch:1.2
--- SOURCES/crossavr-binutils-coff-avr.patch:1.1	Mon Apr  9 21:15:13 2007
+++ SOURCES/crossavr-binutils-coff-avr.patch	Wed Apr 11 02:34:23 2007
@@ -1,38 +1,3 @@
---- ./binutils/doc/objcopy.1.orig	Fri Jun 23 20:19:49 2006
-+++ ./binutils/doc/objcopy.1	Tue Sep 26 00:25:05 2006
-@@ -190,6 +190,8 @@
-         [\fB\-\-readonly\-text\fR]
-         [\fB\-\-pure\fR]
-         [\fB\-\-impure\fR]
-+        [\fB\-\-change\-pathname\fR \fIold\fR=\fInew\fR]
-+        [\fB\-\-basename\fR]
-         [\fB\-v\fR|\fB\-\-verbose\fR]
-         [\fB\-V\fR|\fB\-\-version\fR]  
-         [\fB\-\-help\fR] [\fB\-\-info\fR]
-@@ -745,6 +747,23 @@
- full executable.  It does not have to be a file created by the
- \&\fB\-\-only\-keep\-debug\fR switch.
- .RE
-+.IP "\fB\-\-change\-pathname\fR \fIold\fR=\fInew\fR" 4
-+.IX Item "--change-pathname old=new"
-+When converting debugging information using \fB\-\-debugging\fR, for
-+every pathname that starts with \fIold\fR, replace the matching part
-+by \fInew\fR.  This is intented to map pathnames between different
-+debugging tools, or when parts of the object file(s) had their
-+pathnames recorded in a different build environment.  Note that only
-+leading directory name components might be changed that way, since the
-+trailing filename could be recorded elsewhere as well (depending on the
-+debugging format of the input file).
-+.IP "\fB\-\-basename\fR"
-+.IX Item "--basename"
-+When converting debugging information using \fB\-\-debugging\fR, for
-+every pathname, strip all leading directory information.  This option
-+takes precedence over any \fB\-\-change\-pathname\fR option.  For some
-+debugging formats that cannot handle long filenames, this options is
-+implied (notably, some COFF debugging formats).
- .IP "\fB\-V\fR" 4
- .IX Item "-V"
- .PD 0
 --- ./binutils/Makefile.am.orig	Thu Apr  6 23:49:26 2006
 +++ ./binutils/Makefile.am	Tue Sep 26 00:25:05 2006
 @@ -97,14 +97,14 @@
@@ -279,8 +244,8 @@
  /* Record a function definition.  This implicitly starts a function
     block.  The debug_type argument is the type of the return value.
     The bfd_boolean indicates whether the function is globally visible.
---- ./binutils/objcopy.c.orig	Tue Feb 28 17:09:01 2006
-+++ ./binutils/objcopy.c	Tue Sep 26 00:25:14 2006
+--- ./binutils/objcopy.c	Tue Sep 26 00:25:14 2006
++++ binutils-2.17.50.0.14/binutils/objcopy.c	2007-04-11 03:21:58.000000000 +0300
 @@ -31,6 +31,7 @@
  #include "elf-bfd.h"
  #include <sys/stat.h>
@@ -289,18 +254,18 @@
  
  /* 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
-@@ -257,7 +258,9 @@
-     OPTION_READONLY_TEXT,
+@@ -265,7 +266,9 @@
      OPTION_WRITABLE_TEXT,
      OPTION_PURE,
--    OPTION_IMPURE
-+    OPTION_IMPURE,
+     OPTION_IMPURE,
+-    OPTION_EXTRACT_SYMBOL
++    OPTION_EXTRACT_SYMBOL,
 +    OPTION_CHANGE_PATHNAME,
 +    OPTION_BASENAME
    };
  
  /* Options to handle if running as "strip".  */
-@@ -301,10 +304,12 @@
+@@ -303,10 +306,12 @@
    {"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},
@@ -313,7 +278,7 @@
    {"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},
-@@ -483,6 +488,8 @@
+@@ -485,6 +490,8 @@
       --prefix-alloc-sections <prefix>\n\
                                     Add <prefix> to start of every allocatable\n\
                                       section name\n\
@@ -322,7 +287,7 @@
    -v --verbose                     List all object files modified\n\
    @<file>                          Read options from <file>\n\
    -V --version                     Display this program's version number\n\
-@@ -821,6 +828,8 @@
+@@ -823,6 +830,8 @@
    long src_count = 0, dst_count = 0;
    int relocatable = (abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC))
  		    == HAS_RELOC;
@@ -331,7 +296,7 @@
  
    for (; src_count < symcount; src_count++)
      {
-@@ -916,9 +925,10 @@
+@@ -918,9 +927,10 @@
  	       || bfd_is_com_section (bfd_get_section (sym)))
  	keep = strip_symbols != STRIP_UNNEEDED;
        else if ((flags & BSF_DEBUGGING) != 0)	/* Debugging symbol.  */
@@ -345,7 +310,7 @@
        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.  */
-@@ -2417,6 +2427,10 @@
+@@ -2419,6 +2429,10 @@
      return write_ieee_debugging_info (obfd, dhandle);
  
    if (bfd_get_flavour (obfd) == bfd_target_coff_flavour
@@ -356,12 +321,8 @@
        || bfd_get_flavour (obfd) == bfd_target_elf_flavour)
      {
        bfd_byte *syms, *strings;
-@@ -3096,6 +3110,30 @@
+@@ -3102,2 +3116,26 @@
  
- 	case OPTION_PREFIX_ALLOC_SECTIONS:
- 	  prefix_alloc_sections_string = optarg;
-+	  break;
-+
 +	case OPTION_CHANGE_PATHNAME:
 +	  {
 +	    const char *s;
@@ -384,8 +345,8 @@
 +	case OPTION_BASENAME:
 +	  /* very special case of pathname translation */
 +	  debug_register_pathname_xlat (NULL, NULL);
- 	  break;
- 
++	  break;
++
  	case OPTION_READONLY_TEXT:
 --- ./binutils/rdcoff.c.orig	Sun May  8 16:17:39 2005
 +++ ./binutils/rdcoff.c	Tue Sep 26 00:25:05 2006
@@ -3964,19 +3925,6 @@
  	coff-h8300.c \
  	coff-h8500.c \
  	coff-i386.c \
-@@ -934,10 +938,10 @@
- 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/'` ;\
--	bfd_version_string="\"$(VERSION)\"" ;\
-+	bfd_version_string="\"$(VERSION) + coff-avr-patch (20050630)\"" ;\
- 	if test "x$(RELEASE)" = x ; then \
- 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
--	  bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
-+	  bfd_version_string="\"$(VERSION) $${bfd_version_date} + coff-avr-patch (20050630)\"" ;\
- 	fi ;\
- 	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" < $(srcdir)/version.h > $@
- 
 @@ -1129,6 +1133,12 @@
    $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(INCDIR)/coff/external.h \
    coff-m68k.c $(INCDIR)/hashtab.h libcoff.h $(INCDIR)/bfdlink.h \
@@ -4010,19 +3958,6 @@
  	coff-h8300.c \
  	coff-h8500.c \
  	coff-i386.c \
-@@ -1500,10 +1504,10 @@
- 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/'` ;\
--	bfd_version_string="\"$(VERSION)\"" ;\
-+	bfd_version_string="\"$(VERSION) + coff-avr-patch (20050630)\"" ;\
- 	if test "x$(RELEASE)" = x ; then \
- 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
--	  bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
-+	  bfd_version_string="\"$(VERSION) $${bfd_version_date} + coff-avr-patch (20050630)\"" ;\
- 	fi ;\
- 	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" < $(srcdir)/version.h > $@
- 
 @@ -1695,6 +1699,12 @@
    $(INCDIR)/coff/internal.h $(INCDIR)/coff/m68k.h $(INCDIR)/coff/external.h \
    coff-m68k.c $(INCDIR)/hashtab.h libcoff.h $(INCDIR)/bfdlink.h \

================================================================
Index: SOURCES/crossavr-binutils-newdevices.patch
diff -u SOURCES/crossavr-binutils-newdevices.patch:1.1 SOURCES/crossavr-binutils-newdevices.patch:1.2
--- SOURCES/crossavr-binutils-newdevices.patch:1.1	Mon Apr  9 21:15:13 2007
+++ SOURCES/crossavr-binutils-newdevices.patch	Wed Apr 11 02:34:23 2007
@@ -1,6 +1,6 @@
---- gas/config/tc-avr.c.orig	Fri Apr  6 23:27:21 2007
-+++ gas/config/tc-avr.c	Fri Apr  6 23:31:21 2007
-@@ -111,27 +111,36 @@
+--- binutils-2.17.50.0.14/gas/config/tc-avr.c~	2007-04-11 03:28:56.000000000 +0300
++++ binutils-2.17.50.0.14/gas/config/tc-avr.c	2007-04-11 03:29:22.000000000 +0300
+@@ -109,8 +109,10 @@
    {"atmega88",   AVR_ISA_PWMx,    bfd_mach_avr4},
    {"atmega8515", AVR_ISA_M8,      bfd_mach_avr4},
    {"atmega8535", AVR_ISA_M8,      bfd_mach_avr4},
@@ -11,18 +11,9 @@
    {"atmega16",   AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega161",  AVR_ISA_M161,    bfd_mach_avr5},
    {"atmega162",  AVR_ISA_M323,    bfd_mach_avr5},
-   {"atmega163",  AVR_ISA_M161,    bfd_mach_avr5},
--  {"atmega164",  AVR_ISA_M323,    bfd_mach_avr5},
-+  {"atmega164p", AVR_ISA_M323,    bfd_mach_avr5},
-   {"atmega165",  AVR_ISA_M323,    bfd_mach_avr5},
-+  {"atmega165p", AVR_ISA_M323,    bfd_mach_avr5},
-   {"atmega168",  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},
+@@ -125,9 +127,13 @@
    {"atmega323",  AVR_ISA_M323,    bfd_mach_avr5},
--  {"atmega324",  AVR_ISA_M323,    bfd_mach_avr5},
-+  {"atmega324p", AVR_ISA_M323,    bfd_mach_avr5},
+   {"atmega324p", AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega325",  AVR_ISA_M323,    bfd_mach_avr5},
 +  {"atmega325p", AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega329",  AVR_ISA_M323,    bfd_mach_avr5},
@@ -34,16 +25,3 @@
    {"atmega406",  AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega64",   AVR_ISA_M323,    bfd_mach_avr5},
    {"atmega640",  AVR_ISA_M323,    bfd_mach_avr5},
-   {"atmega644",  AVR_ISA_M323,    bfd_mach_avr5},
-+  {"atmega644p", AVR_ISA_M323,    bfd_mach_avr5},
-   {"atmega128",  AVR_ISA_M128,    bfd_mach_avr5},
-   {"atmega1280", AVR_ISA_M128,    bfd_mach_avr5},
-   {"atmega1281", AVR_ISA_M128,    bfd_mach_avr5},
-@@ -142,6 +151,7 @@
-   {"at90can32" , AVR_ISA_M323,    bfd_mach_avr5},
-   {"at90can64" , AVR_ISA_M323,    bfd_mach_avr5},
-   {"at90can128", AVR_ISA_M128,    bfd_mach_avr5},
-+  {"at90usb162", 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},
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/crossavr-binutils-coff-avr.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/crossavr-binutils-newdevices.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list