gcc-4.5 / binutil patch problem

Go To Last Post
3 posts / 0 new
Author
Message
#1
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Has anyone got the patches from atmel to apply cleanly? Am I doing something wrong here? I have the binutils-2.20.1 source which the names of the patch files claim to be patches for.

john@ubuntu:/usr/local/src/gcc-4.5/binutils$ cat /home/john/src/avr-llvm/dragonegg/trunk/patches/source/avr/binutils/*.patch | patch --dry-run -p0
patching file binutils/size.c
patching file bfd/Makefile.am
patching file bfd/Makefile.in
patching file bfd/coff-avr.c
patching file bfd/coff-ext-avr.c
patching file bfd/coffcode.h
patching file bfd/coffgen.c
patching file bfd/coffswap.h
patching file bfd/config.bfd
patching file bfd/configure
patching file bfd/configure.in
patching file bfd/targets.c
patching file binutils/Makefile.am
patching file binutils/Makefile.in
patching file binutils/bucomm.c
patching file binutils/bucomm.h
patching file binutils/budbg.h
patching file binutils/debug.c
patching file binutils/debug.h
patching file binutils/doc/objcopy.1
patching file binutils/objcopy.c
patching file binutils/rdcoff.c
patching file binutils/wrcoff.c
patching file include/coff/avr.h
patching file include/coff/internal.h
patching file ld/scripttempl/avr.sc
patching file gas/config/tc-avr.c
patching file gas/config/tc-avr.h
patching file gas/dwarf2dbg.c
patching file ./gas/config/tc-avr.c
Hunk #1 succeeded at 377 (offset -1 lines).
patching file bfd/archures.c
patching file bfd/bfd-in2.h
Hunk #1 succeeded at 2042 (offset 7 lines).
patching file bfd/cpu-avr.c
patching file bfd/elf32-avr.c
patching file gas/config/tc-avr.c
Hunk #1 succeeded at 29 (offset -1 lines).
Hunk #2 succeeded at 80 (offset -1 lines).
Hunk #3 succeeded at 223 (offset -1 lines).
Hunk #4 succeeded at 415 (offset -1 lines).
Hunk #5 succeeded at 847 (offset -1 lines).
Hunk #6 succeeded at 969 (offset -1 lines).
patching file gas/doc/c-avr.texi
patching file include/elf/avr.h
patching file include/opcode/avr.h
patching file ld/Makefile.am
patching file ld/Makefile.in
Hunk #2 succeeded at 2076 (offset 1 line).
patching file ld/configure.tgt
patching file ld/emulparams/avrxmega1.sh
patching file ld/emulparams/avrxmega2.sh
patching file ld/emulparams/avrxmega3.sh
patching file ld/emulparams/avrxmega4.sh
patching file ld/emulparams/avrxmega5.sh
patching file ld/emulparams/avrxmega6.sh
patching file ld/emulparams/avrxmega7.sh
patching file ld/emultempl/avrelf.em
patching file opcodes/avr-dis.c
patching file gas/config/tc-avr.c
Hunk #1 succeeded at 106 (offset -9 lines).
Hunk #2 succeeded at 127 (offset -9 lines).
Hunk #3 succeeded at 134 (offset -9 lines).
Hunk #4 succeeded at 150 (offset -9 lines).
Hunk #5 succeeded at 226 (offset -9 lines).
Hunk #6 succeeded at 235 with fuzz 1 (offset -9 lines).
patching file gas/doc/c-avr.texi
patching file bfd/archures.c
Hunk #1 FAILED at 364.
1 out of 1 hunk FAILED -- saving rejects to file bfd/archures.c.rej
patching file bfd/bfd-in2.h
Hunk #1 FAILED at 1986.
1 out of 1 hunk FAILED -- saving rejects to file bfd/bfd-in2.h.rej
patching file bfd/cpu-avr.c
Hunk #1 FAILED at 147.
1 out of 1 hunk FAILED -- saving rejects to file bfd/cpu-avr.c.rej
patching file bfd/elf32-avr.c
Hunk #1 succeeded at 1328 with fuzz 2 (offset -28 lines).
Hunk #2 succeeded at 1394 with fuzz 2 (offset -56 lines).
patching file gas/config/tc-avr.c
Hunk #1 FAILED at 88.
Hunk #2 FAILED at 261.
Hunk #3 FAILED at 443.
Hunk #4 succeeded at 739 (offset -51 lines).
3 out of 4 hunks FAILED -- saving rejects to file gas/config/tc-avr.c.rej
patching file include/elf/avr.h
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED -- saving rejects to file include/elf/avr.h.rej
patching file include/opcode/avr.h
Hunk #1 succeeded at 65 (offset -2 lines).
Hunk #2 succeeded at 154 (offset -3 lines).
Hunk #3 succeeded at 254 (offset -4 lines).
Hunk #4 succeeded at 267 (offset -4 lines).
patching file ld/Makefile.am
Hunk #1 FAILED at 149.
Hunk #2 FAILED at 681.
2 out of 2 hunks FAILED -- saving rejects to file ld/Makefile.am.rej
patching file ld/configure.tgt
Hunk #1 FAILED at 107.
1 out of 1 hunk FAILED -- saving rejects to file ld/configure.tgt.rej
patching file ld/emulparams/avrtiny10.sh
patching file gas/config/tc-avr.c
Hunk #1 FAILED at 260.
Hunk #2 FAILED at 268.
2 out of 2 hunks FAILED -- saving rejects to file gas/config/tc-avr.c.rej
patching file gas/doc/c-avr.texi
Hunk #1 FAILED at 97.
Hunk #2 FAILED at 105.
2 out of 2 hunks FAILED -- saving rejects to file gas/doc/c-avr.texi.rej
patching file gas/config/tc-avr.c
Hunk #1 FAILED at 252.
1 out of 1 hunk FAILED -- saving rejects to file gas/config/tc-avr.c.rej
patching file gas/doc/c-avr.texi
Hunk #1 FAILED at 88.
1 out of 1 hunk FAILED -- saving rejects to file gas/doc/c-avr.texi.rej
patching file ./binutils/size.c
Hunk #1 FAILED at 132.
1 out of 1 hunk FAILED -- saving rejects to file ./binutils/size.c.rej
patching file ./gas/config/tc-avr.c
Hunk #1 FAILED at 261.
1 out of 1 hunk FAILED -- saving rejects to file ./gas/config/tc-avr.c.rej
patching file ./gas/doc/c-avr.texi
Hunk #1 FAILED at 102.
1 out of 1 hunk FAILED -- saving rejects to file ./gas/doc/c-avr.texi.rej
patching file binutils/size.c
Hunk #1 FAILED at 121.
1 out of 1 hunk FAILED -- saving rejects to file binutils/size.c.rej
patching file gas/config/tc-avr.c
Hunk #1 FAILED at 267.
1 out of 1 hunk FAILED -- saving rejects to file gas/config/tc-avr.c.rej
patching file gas/doc/c-avr.texi
Hunk #1 FAILED at 103.
1 out of 1 hunk FAILED -- saving rejects to file gas/doc/c-avr.texi.rej
patching file binutils/size.c
Hunk #1 FAILED at 220.
1 out of 1 hunk FAILED -- saving rejects to file binutils/size.c.rej
patching file gas/config/tc-avr.c
Hunk #1 succeeded at 149 with fuzz 2 (offset -10 lines).
patching file gas/doc/c-avr.texi
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file gas/doc/c-avr.texi.rej
patching file ld/Makefile.in
Hunk #1 FAILED at 441.
Hunk #2 succeeded at 945 (offset -7 lines).
Hunk #3 FAILED at 2112.
2 out of 3 hunks FAILED -- saving rejects to file ld/Makefile.in.rej
patching file binutils/size.c
Hunk #1 FAILED at 207.
Hunk #2 FAILED at 244.
2 out of 2 hunks FAILED -- saving rejects to file binutils/size.c.rej
patching file gas/config/tc-avr.c
Hunk #1 succeeded at 185 with fuzz 2 (offset -35 lines).
patching file gas/doc/c-avr.texi
Hunk #1 FAILED at 75.
1 out of 1 hunk FAILED -- saving rejects to file gas/doc/c-avr.texi.rej
patching file ./binutils/size.c
Hunk #1 FAILED at 194.
Hunk #2 FAILED at 206.
2 out of 2 hunks FAILED -- saving rejects to file ./binutils/size.c.rej
patching file ./gas/config/tc-avr.c
Hunk #1 FAILED at 185.
Hunk #2 succeeded at 173 with fuzz 2 (offset -24 lines).
1 out of 2 hunks FAILED -- saving rejects to file ./gas/config/tc-avr.c.rej
patching file ./gas/doc/as.info
patching file ./gas/doc/c-avr.texi
Hunk #1 FAILED at 69.
1 out of 1 hunk FAILED -- saving rejects to file ./gas/doc/c-avr.texi.rej
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

As you wrote about patche_s_: Are you sure they are applied in the right order?

avrfreaks does not support Opera. Profile inactive.

  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

SprinterSB wrote:
As you wrote about patche_s_: Are you sure they are applied in the right order?

Thanks.
I didn't know they needed to be in order. They where technically being applied in order but since I was using --dry-run to test it first the files weren't actually being modified.
I removed --dry-run and it worked fine.