Module Name: src
Committed By: christos
Date: Thu Jul 28 12:25:08 UTC 2016
Modified Files:
src/external/gpl3/binutils/dist/bfd: ChangeLog archive.c coff-alpha.c
coffcode.h configure dwarf2.c elf-bfd.h elf32-arm.c elf32-avr.c
elf32-hppa.c elf32-i386.c elf32-ppc.c elf64-ppc.c elf64-x86-64.c
elflink.c version.h
src/external/gpl3/binutils/dist/binutils: ChangeLog Makefile.in
configure objcopy.c
src/external/gpl3/binutils/dist/binutils/doc: addr2line.1 ar.1
binutils.info binutils.texi cxxfilt.man dlltool.1 elfedit.1
nlmconv.1 nm.1 objcopy.1 objdump.1 ranlib.1 readelf.1 size.1
strings.1 strip.1 windmc.1 windres.1
src/external/gpl3/binutils/dist/gas: ChangeLog configure configure.ac
write.c
src/external/gpl3/binutils/dist/gas/config: tc-mips.c
src/external/gpl3/binutils/dist/gas/doc: as.1 as.info
src/external/gpl3/binutils/dist/gas/testsuite: ChangeLog
src/external/gpl3/binutils/dist/gas/testsuite/gas/mips: mips.exp
src/external/gpl3/binutils/dist/include/elf: ChangeLog
src/external/gpl3/binutils/dist/include/opcode: ChangeLog
src/external/gpl3/binutils/dist/ld: ChangeLog configure ld.texinfo
lexsup.c
src/external/gpl3/binutils/dist/ld/emultempl: elf32.em mmo.em pe.em
pep.em
src/external/gpl3/binutils/dist/ld/testsuite: ChangeLog
src/external/gpl3/binutils/dist/ld/testsuite/ld-powerpc: powerpc.exp
src/external/gpl3/binutils/dist/opcodes: ChangeLog configure ppc-opc.c
Removed Files:
src/external/gpl3/binutils/dist/ld/testsuite/ld-aarch64:
farcall-section.d farcall-section.s
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/bfd/ChangeLog \
src/external/gpl3/binutils/dist/bfd/elf32-i386.c \
src/external/gpl3/binutils/dist/bfd/elf32-ppc.c \
src/external/gpl3/binutils/dist/bfd/elf64-ppc.c
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/bfd/archive.c \
src/external/gpl3/binutils/dist/bfd/coff-alpha.c \
src/external/gpl3/binutils/dist/bfd/dwarf2.c \
src/external/gpl3/binutils/dist/bfd/elf-bfd.h \
src/external/gpl3/binutils/dist/bfd/elf32-avr.c \
src/external/gpl3/binutils/dist/bfd/elf64-x86-64.c \
src/external/gpl3/binutils/dist/bfd/version.h
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/bfd/coffcode.h
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/bfd/configure
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/dist/bfd/elf32-arm.c \
src/external/gpl3/binutils/dist/bfd/elf32-hppa.c
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/dist/bfd/elflink.c
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/binutils/ChangeLog \
src/external/gpl3/binutils/dist/binutils/configure
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/binutils/Makefile.in
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/binutils/objcopy.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/binutils/doc/addr2line.1 \
src/external/gpl3/binutils/dist/binutils/doc/binutils.info \
src/external/gpl3/binutils/dist/binutils/doc/cxxfilt.man \
src/external/gpl3/binutils/dist/binutils/doc/dlltool.1 \
src/external/gpl3/binutils/dist/binutils/doc/nlmconv.1 \
src/external/gpl3/binutils/dist/binutils/doc/nm.1 \
src/external/gpl3/binutils/dist/binutils/doc/objcopy.1 \
src/external/gpl3/binutils/dist/binutils/doc/objdump.1 \
src/external/gpl3/binutils/dist/binutils/doc/ranlib.1 \
src/external/gpl3/binutils/dist/binutils/doc/size.1 \
src/external/gpl3/binutils/dist/binutils/doc/strip.1 \
src/external/gpl3/binutils/dist/binutils/doc/windmc.1 \
src/external/gpl3/binutils/dist/binutils/doc/windres.1
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/binutils/doc/ar.1 \
src/external/gpl3/binutils/dist/binutils/doc/binutils.texi \
src/external/gpl3/binutils/dist/binutils/doc/readelf.1 \
src/external/gpl3/binutils/dist/binutils/doc/strings.1
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/dist/binutils/doc/elfedit.1
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/gas/ChangeLog
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/gas/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/gas/configure.ac
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/gas/write.c
cvs rdiff -u -r1.17 -r1.18 \
src/external/gpl3/binutils/dist/gas/config/tc-mips.c
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/gas/doc/as.1 \
src/external/gpl3/binutils/dist/gas/doc/as.info
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/gas/testsuite/ChangeLog
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/gas/testsuite/gas/mips/mips.exp
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/include/elf/ChangeLog
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/include/opcode/ChangeLog
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/ld/ChangeLog \
src/external/gpl3/binutils/dist/ld/lexsup.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/ld/configure
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/ld/ld.texinfo
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/binutils/dist/ld/emultempl/elf32.em
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/ld/emultempl/mmo.em \
src/external/gpl3/binutils/dist/ld/emultempl/pe.em \
src/external/gpl3/binutils/dist/ld/emultempl/pep.em
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/ld/testsuite/ChangeLog
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/binutils/dist/ld/testsuite/ld-aarch64/farcall-section.d \
src/external/gpl3/binutils/dist/ld/testsuite/ld-aarch64/farcall-section.s
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/ld/testsuite/ld-powerpc/powerpc.exp
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/opcodes/ChangeLog \
src/external/gpl3/binutils/dist/opcodes/ppc-opc.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/opcodes/configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
