avr-gcc-list
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[avr-gcc-list] Removing old ld emulations from avr-binutils


From: Marek Michalkiewicz
Subject: [avr-gcc-list] Removing old ld emulations from avr-binutils
Date: Fri, 17 Oct 2003 21:59:27 +0200
User-agent: Mutt/1.5.4i

Hi,

I'd like to commit the following patch to binutils CVS (mainline
only, which will be 2.15 - not to the 2.14 branch), removing the
old ld emulations necessary for old versions of GCC.  I cheated
a little by just patching Makefile.in instead of regenerating it,
because I never have the correct versions of the required tools...

Denis - do you have any objections?  When binutils 2.15 is released,
I don't think anyone should still use pre-3.3 version of avr-gcc.

Eric - sorry it took so long (not "this weekend" as promised).
Please test WinAVR build with this patch (it does not remove
any files - you have to do that manually in your CVS tree).

Thanks,
Marek


Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/ld/ChangeLog,v
retrieving revision 1.1004
diff -c -3 -p -r1.1004 ChangeLog
*** ChangeLog   16 Oct 2003 08:46:34 -0000      1.1004
--- ChangeLog   17 Oct 2003 19:26:03 -0000
***************
*** 1,3 ****
--- 1,20 ----
+ 2003-10-17  Marek Michalkiewicz  <address@hidden>
+ 
+       * Makefile.am: Remove old (before GCC 3.3) emulations for AVR
+       target: avr1200, avr23xx, avr4433, avr44x4, avr85xx, avrmega103,
+       avrmega161, avrmega603.  Default to avr2.
+       * Makefile.in: Regenerate.
+       * configure.tgt: Likewise.
+       * emulparams/avr1200.sh: Remove.
+       * emulparams/avr23xx.sh: Remove.
+       * emulparams/avr4433.sh: Remove.
+       * emulparams/avr44x4.sh: Remove.
+       * emulparams/avr85xx.sh: Remove.
+       * emulparams/avrmega103.sh: Remove.
+       * emulparams/avrmega161.sh: Remove.
+       * emulparams/avrmega603.sh: Remove.
+       * scripttempl/elf32avr.sc: Remove.
+ 
  2003-10-16  Alan Modra  <address@hidden>
  
        * Makefile.am (GENSCRIPTS_EXTRA, GEN_EXTRA_DEPENDS): Remove.  Use
Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.143
diff -c -3 -p -r1.143 Makefile.am
*** Makefile.am 16 Oct 2003 08:46:34 -0000      1.143
--- Makefile.am 17 Oct 2003 19:26:05 -0000
*************** ALL_EMULATIONS = \
*** 128,143 ****
        earmnto.o \
        earmnbsd.o \
        earmpe.o \
-       eavr1200.o \
-       eavr23xx.o \
-       eavr4433.o \
-       eavr44x4.o \
-       eavr85xx.o \
-       eavrmega103.o \
-       eavrmega161.o \
-       eavrmega603.o \
-       eavr1.o \
        eavr2.o \
        eavr3.o \
        eavr4.o \
        eavr5.o \
--- 128,135 ----
        earmnto.o \
        earmnbsd.o \
        earmpe.o \
        eavr2.o \
+       eavr1.o \
        eavr3.o \
        eavr4.o \
        eavr5.o \
*************** earm_epoc_pe.c: $(srcdir)/emulparams/arm
*** 527,584 ****
  earmpe.c: $(srcdir)/emulparams/armpe.sh \
    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armpe "$(tdir_armpe)"
! eavr85xx.c: $(srcdir)/emulparams/avr85xx.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr85xx "$(tdir_avr85xx)"
! eavr1200.c: $(srcdir)/emulparams/avr1200.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr1200 "$(tdir_avr85xx)"
! eavr23xx.c: $(srcdir)/emulparams/avr23xx.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr23xx "$(tdir_avr85xx)"
! eavr44x4.c: $(srcdir)/emulparams/avr44x4.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr44x4 "$(tdir_avr85xx)"
! eavr4433.c: $(srcdir)/emulparams/avr4433.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr4433 "$(tdir_avr85xx)"
! eavrmega603.c: $(srcdir)/emulparams/avrmega603.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avrmega603 "$(tdir_avr85xx)"
! eavrmega103.c: $(srcdir)/emulparams/avrmega103.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avrmega103 "$(tdir_avr85xx)"
! eavrmega161.c: $(srcdir)/emulparams/avrmega161.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avrmega161 "$(tdir_avr85xx)"
! eavr1.c: $(srcdir)/emulparams/avr1.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr1 "$(tdir_avr85xx)"
! eavr2.c: $(srcdir)/emulparams/avr2.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr2 "$(tdir_avr85xx)"
  eavr3.c: $(srcdir)/emulparams/avr3.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr3 "$(tdir_avr85xx)"
  eavr4.c: $(srcdir)/emulparams/avr4.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr4 "$(tdir_avr85xx)"
  eavr5.c: $(srcdir)/emulparams/avr5.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr5 "$(tdir_avr85xx)"
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc 
${GEN_DEPENDS}
        ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
--- 519,544 ----
  earmpe.c: $(srcdir)/emulparams/armpe.sh \
    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armpe "$(tdir_armpe)"
! eavr2.c: $(srcdir)/emulparams/avr2.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr2 "$(tdir_avr2)"
! eavr1.c: $(srcdir)/emulparams/avr1.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr1 "$(tdir_avr2)"
  eavr3.c: $(srcdir)/emulparams/avr3.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr3 "$(tdir_avr2)"
  eavr4.c: $(srcdir)/emulparams/avr4.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr4 "$(tdir_avr2)"
  eavr5.c: $(srcdir)/emulparams/avr5.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr5 "$(tdir_avr2)"
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc 
${GEN_DEPENDS}
        ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.154
diff -c -3 -p -r1.154 Makefile.in
*** Makefile.in 16 Oct 2003 08:46:34 -0000      1.154
--- Makefile.in 17 Oct 2003 19:26:06 -0000
*************** ALL_EMULATIONS = \
*** 242,257 ****
        earmnto.o \
        earmnbsd.o \
        earmpe.o \
-       eavr1200.o \
-       eavr23xx.o \
-       eavr4433.o \
-       eavr44x4.o \
-       eavr85xx.o \
-       eavrmega103.o \
-       eavrmega161.o \
-       eavrmega603.o \
-       eavr1.o \
        eavr2.o \
        eavr3.o \
        eavr4.o \
        eavr5.o \
--- 242,249 ----
        earmnto.o \
        earmnbsd.o \
        earmpe.o \
        eavr2.o \
+       eavr1.o \
        eavr3.o \
        eavr4.o \
        eavr5.o \
*************** earm_epoc_pe.c: $(srcdir)/emulparams/arm
*** 1253,1310 ****
  earmpe.c: $(srcdir)/emulparams/armpe.sh \
    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armpe "$(tdir_armpe)"
! eavr85xx.c: $(srcdir)/emulparams/avr85xx.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr85xx "$(tdir_avr85xx)"
! eavr1200.c: $(srcdir)/emulparams/avr1200.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr1200 "$(tdir_avr85xx)"
! eavr23xx.c: $(srcdir)/emulparams/avr23xx.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr23xx "$(tdir_avr85xx)"
! eavr44x4.c: $(srcdir)/emulparams/avr44x4.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr44x4 "$(tdir_avr85xx)"
! eavr4433.c: $(srcdir)/emulparams/avr4433.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr4433 "$(tdir_avr85xx)"
! eavrmega603.c: $(srcdir)/emulparams/avrmega603.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avrmega603 "$(tdir_avr85xx)"
! eavrmega103.c: $(srcdir)/emulparams/avrmega103.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avrmega103 "$(tdir_avr85xx)"
! eavrmega161.c: $(srcdir)/emulparams/avrmega161.sh \
!   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \
!   ${GEN_DEPENDS}
!       ${GENSCRIPTS} avrmega161 "$(tdir_avr85xx)"
! eavr1.c: $(srcdir)/emulparams/avr1.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr1 "$(tdir_avr85xx)"
! eavr2.c: $(srcdir)/emulparams/avr2.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr2 "$(tdir_avr85xx)"
  eavr3.c: $(srcdir)/emulparams/avr3.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr3 "$(tdir_avr85xx)"
  eavr4.c: $(srcdir)/emulparams/avr4.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr4 "$(tdir_avr85xx)"
  eavr5.c: $(srcdir)/emulparams/avr5.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr5 "$(tdir_avr85xx)"
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc 
${GEN_DEPENDS}
        ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
--- 1245,1270 ----
  earmpe.c: $(srcdir)/emulparams/armpe.sh \
    $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} armpe "$(tdir_armpe)"
! eavr2.c: $(srcdir)/emulparams/avr2.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr2 "$(tdir_avr2)"
! eavr1.c: $(srcdir)/emulparams/avr1.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr1 "$(tdir_avr2)"
  eavr3.c: $(srcdir)/emulparams/avr3.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr3 "$(tdir_avr2)"
  eavr4.c: $(srcdir)/emulparams/avr4.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr4 "$(tdir_avr2)"
  eavr5.c: $(srcdir)/emulparams/avr5.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
!       ${GENSCRIPTS} avr5 "$(tdir_avr2)"
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc 
${GEN_DEPENDS}
        ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
Index: configure.tgt
===================================================================
RCS file: /cvs/src/src/ld/configure.tgt,v
retrieving revision 1.138
diff -c -3 -p -r1.138 configure.tgt
*** configure.tgt       6 Oct 2003 09:12:36 -0000       1.138
--- configure.tgt       17 Oct 2003 19:26:06 -0000
*************** arm-*-wince)            targ_emul=armpe ;
*** 24,31 ****
  arm-*-pe)             targ_emul=armpe ;
                        targ_extra_ofiles="deffilep.o pe-dll.o" ;;
  arc-*-elf*)           targ_emul=arcelf ;;
! avr-*-*)              targ_emul=avr85xx
!                       targ_extra_emuls="avr1200 avr23xx avr44x4 avr4433 
avrmega603 avrmega103 avrmega161 avr1 avr2 avr3 avr4 avr5" ;;
  cris-*-*aout*)                targ_emul=crisaout
                        targ_extra_emuls="criself crislinux"
                        targ_extra_libpath=$targ_extra_emuls ;;
--- 24,31 ----
  arm-*-pe)             targ_emul=armpe ;
                        targ_extra_ofiles="deffilep.o pe-dll.o" ;;
  arc-*-elf*)           targ_emul=arcelf ;;
! avr-*-*)              targ_emul=avr2
!                       targ_extra_emuls="avr1 avr3 avr4 avr5" ;;
  cris-*-*aout*)                targ_emul=crisaout
                        targ_extra_emuls="criself crislinux"
                        targ_extra_libpath=$targ_extra_emuls ;;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]