Module Name: src Committed By: christos Date: Sun Sep 29 14:03:32 UTC 2013
Modified Files: src/external/gpl3/binutils/dist: config.guess config.sub configure configure.ac src/external/gpl3/binutils/dist/bfd: ChangeLog aoutx.h archive.c archures.c bfd-in2.h bfd.c coff-alpha.c config.bfd configure configure.host configure.in cpu-mips.c dwarf2.c elf-eh-frame.c elf.c elf32-arm.c elf32-avr.c elf32-hppa.c elf32-i386.c elf32-m68k.c elf32-ppc.c elf32-sh.c elf32-vax.c elf64-alpha.c elf64-mips.c elf64-ppc.c elf64-x86-64.c elflink.c elfn32-mips.c elfxx-mips.c elfxx-sparc.c libbfd.h linker.c reloc.c syms.c version.h src/external/gpl3/binutils/dist/bfd/doc: Makefile.in bfdt.texi bfdver.texi reloc.texi src/external/gpl3/binutils/dist/binutils: ChangeLog Makefile.in NEWS aclocal.m4 ar.c bucomm.c configure configure.in objcopy.c readelf.c strings.c src/external/gpl3/binutils/dist/binutils/doc: Makefile.in 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.tgt remap.c write.c src/external/gpl3/binutils/dist/gas/config: tc-alpha.c tc-arm.c tc-m68k.c tc-mips.c tc-mips.h tc-ppc.c src/external/gpl3/binutils/dist/gas/doc: Makefile.am Makefile.in as.1 as.info as.texinfo c-mips.texi c-ppc.texi src/external/gpl3/binutils/dist/gas/testsuite: ChangeLog src/external/gpl3/binutils/dist/gas/testsuite/gas/mips: mips.exp src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc: booke.d booke.s common.d common.s e500mc.d e500mc.s power4_32.d power4_32.s power6.d power6.s power7.d power7.s ppc.exp vsx.d vsx.s src/external/gpl3/binutils/dist/gprof: corefile.c gprof.1 gprof.info src/external/gpl3/binutils/dist/include: bfdlink.h src/external/gpl3/binutils/dist/include/elf: ChangeLog common.h internal.h mips.h ppc.h src/external/gpl3/binutils/dist/include/opcode: ChangeLog mips.h ppc.h src/external/gpl3/binutils/dist/ld: ChangeLog Makefile.am Makefile.in configure.tgt ld.texinfo ldctor.c ldemul.c ldexp.c ldlang.c ldlang.h ldlex.c ldlex.h ldlex.l ldmain.c ldmain.h lexsup.c src/external/gpl3/binutils/dist/ld/emulparams: elf32bmipn32-defs.sh elf_i386.sh src/external/gpl3/binutils/dist/ld/emultempl: beos.em elf32.em mmo.em pe.em pep.em spuelf.em xtensaelf.em src/external/gpl3/binutils/dist/ld/scripttempl: elf.sc src/external/gpl3/binutils/dist/ld/testsuite: ChangeLog src/external/gpl3/binutils/dist/ld/testsuite/ld-elf: linkoncerdiff.d src/external/gpl3/binutils/dist/ld/testsuite/ld-powerpc: powerpc.exp vxworks-relax.rd src/external/gpl3/binutils/dist/libiberty: floatformat.c src/external/gpl3/binutils/dist/opcodes: ChangeLog Makefile.am Makefile.in configure configure.in mips-dis.c mips-opc.c ppc-dis.c ppc-opc.c sparc-dis.c Removed Files: src/external/gpl3/binutils/dist/bfd: coff-pmac.c xcoff-target.h src/external/gpl3/binutils/dist/cgen/cpu: fr30.cpu fr30.opc ip2k.cpu ip2k.opc mep-avc.cpu mep-avc2.cpu mep-c5.cpu mep-core.cpu mep-default.cpu mep-ext-cop.cpu mep-fmax.cpu mep-h1.cpu mep-ivc2.cpu mep-rhcop.cpu mep-sample-ucidsp.cpu mep.cpu mep.opc openrisc.cpu openrisc.opc simplify.inc xstormy16.cpu xstormy16.opc src/external/gpl3/binutils/dist/config: mh-cxux mh-decstation mh-dgux386 mh-interix mh-lynxrs6k mh-ncr3000 mh-necv4 mh-ppc-darwin mh-sco mh-solaris mh-sysv4 mh-sysv5 mh-x86omitfp mt-mep mt-netware mt-v810 mt-wince src/external/gpl3/binutils/dist/gas/testsuite/gas/bfin: 16bit_illegals.d 16bit_illegals.s src/external/gpl3/binutils/dist/gas/testsuite/gas/mips: mips5.d mips5.l mips5.s src/external/gpl3/binutils/dist/gas/testsuite/gas/tic6x: insns-c674x-bad.d insns-c674x-bad.l insns-c674x-bad.s src/external/gpl3/binutils/dist/gold/po: ja.gmo ja.po src/external/gpl3/binutils/dist/ld/testsuite/ld-i386: emit-relocs.d src/external/gpl3/binutils/dist/ld/testsuite/ld-plugin: plugin-ignore.d Log Message: resolve conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/config.guess \ src/external/gpl3/binutils/dist/configure.ac cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/config.sub cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/configure cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/bfd/ChangeLog \ src/external/gpl3/binutils/dist/bfd/bfd-in2.h \ src/external/gpl3/binutils/dist/bfd/configure \ src/external/gpl3/binutils/dist/bfd/elf.c \ src/external/gpl3/binutils/dist/bfd/elf32-i386.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/bfd/aoutx.h \ src/external/gpl3/binutils/dist/bfd/archive.c \ src/external/gpl3/binutils/dist/bfd/archures.c \ src/external/gpl3/binutils/dist/bfd/bfd.c \ src/external/gpl3/binutils/dist/bfd/coff-alpha.c \ src/external/gpl3/binutils/dist/bfd/configure.host \ src/external/gpl3/binutils/dist/bfd/configure.in \ src/external/gpl3/binutils/dist/bfd/cpu-mips.c \ src/external/gpl3/binutils/dist/bfd/dwarf2.c \ src/external/gpl3/binutils/dist/bfd/elf-eh-frame.c \ src/external/gpl3/binutils/dist/bfd/elf32-arm.c \ src/external/gpl3/binutils/dist/bfd/elf32-avr.c \ src/external/gpl3/binutils/dist/bfd/elf32-m68k.c \ src/external/gpl3/binutils/dist/bfd/elf32-sh.c \ src/external/gpl3/binutils/dist/bfd/elf64-alpha.c \ src/external/gpl3/binutils/dist/bfd/elf64-mips.c \ src/external/gpl3/binutils/dist/bfd/elf64-ppc.c \ src/external/gpl3/binutils/dist/bfd/elf64-x86-64.c \ src/external/gpl3/binutils/dist/bfd/elfn32-mips.c \ src/external/gpl3/binutils/dist/bfd/libbfd.h \ src/external/gpl3/binutils/dist/bfd/linker.c \ src/external/gpl3/binutils/dist/bfd/reloc.c \ src/external/gpl3/binutils/dist/bfd/syms.c \ src/external/gpl3/binutils/dist/bfd/version.h cvs rdiff -u -r1.1.1.2 -r0 src/external/gpl3/binutils/dist/bfd/coff-pmac.c \ src/external/gpl3/binutils/dist/bfd/xcoff-target.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/dist/bfd/config.bfd cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/bfd/elf32-hppa.c \ src/external/gpl3/binutils/dist/bfd/elf32-ppc.c \ src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/bfd/elf32-vax.c cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/bfd/elflink.c \ src/external/gpl3/binutils/dist/bfd/elfxx-mips.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/bfd/doc/Makefile.in \ src/external/gpl3/binutils/dist/bfd/doc/bfdt.texi cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/bfd/doc/bfdver.texi \ src/external/gpl3/binutils/dist/bfd/doc/reloc.texi cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/binutils/ChangeLog \ src/external/gpl3/binutils/dist/binutils/NEWS \ src/external/gpl3/binutils/dist/binutils/ar.c \ src/external/gpl3/binutils/dist/binutils/bucomm.c \ src/external/gpl3/binutils/dist/binutils/configure \ src/external/gpl3/binutils/dist/binutils/configure.in \ src/external/gpl3/binutils/dist/binutils/strings.c cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/binutils/Makefile.in \ src/external/gpl3/binutils/dist/binutils/aclocal.m4 cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/binutils/objcopy.c cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/binutils/readelf.c cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/binutils/dist/binutils/doc/Makefile.in cvs rdiff -u -r1.3 -r1.4 \ 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/readelf.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.4 -r1.5 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/strings.1 cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/binutils/doc/elfedit.1 cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/binutils/dist/cgen/cpu/fr30.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/fr30.opc \ src/external/gpl3/binutils/dist/cgen/cpu/ip2k.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/ip2k.opc \ src/external/gpl3/binutils/dist/cgen/cpu/mep-avc.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-avc2.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-c5.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-core.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-default.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-ext-cop.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-fmax.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-h1.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-ivc2.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-rhcop.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep-sample-ucidsp.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/mep.opc \ src/external/gpl3/binutils/dist/cgen/cpu/openrisc.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/openrisc.opc \ src/external/gpl3/binutils/dist/cgen/cpu/simplify.inc \ src/external/gpl3/binutils/dist/cgen/cpu/xstormy16.cpu \ src/external/gpl3/binutils/dist/cgen/cpu/xstormy16.opc cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/binutils/dist/config/mh-cxux \ src/external/gpl3/binutils/dist/config/mh-decstation \ src/external/gpl3/binutils/dist/config/mh-dgux386 \ src/external/gpl3/binutils/dist/config/mh-interix \ src/external/gpl3/binutils/dist/config/mh-lynxrs6k \ src/external/gpl3/binutils/dist/config/mh-ncr3000 \ src/external/gpl3/binutils/dist/config/mh-necv4 \ src/external/gpl3/binutils/dist/config/mh-ppc-darwin \ src/external/gpl3/binutils/dist/config/mh-sco \ src/external/gpl3/binutils/dist/config/mh-solaris \ src/external/gpl3/binutils/dist/config/mh-sysv4 \ src/external/gpl3/binutils/dist/config/mh-sysv5 \ src/external/gpl3/binutils/dist/config/mh-x86omitfp \ src/external/gpl3/binutils/dist/config/mt-mep \ src/external/gpl3/binutils/dist/config/mt-netware \ src/external/gpl3/binutils/dist/config/mt-v810 \ src/external/gpl3/binutils/dist/config/mt-wince cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/ChangeLog \ src/external/gpl3/binutils/dist/gas/remap.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/gas/configure.tgt cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/gas/write.c cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/gas/config/tc-alpha.c \ src/external/gpl3/binutils/dist/gas/config/tc-mips.h cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/gas/config/tc-arm.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/gas/config/tc-m68k.c \ src/external/gpl3/binutils/dist/gas/config/tc-ppc.c cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/binutils/dist/gas/config/tc-mips.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/doc/Makefile.am \ src/external/gpl3/binutils/dist/gas/doc/as.1 \ src/external/gpl3/binutils/dist/gas/doc/as.info \ src/external/gpl3/binutils/dist/gas/doc/as.texinfo \ src/external/gpl3/binutils/dist/gas/doc/c-ppc.texi cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/gas/doc/Makefile.in cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/gas/doc/c-mips.texi cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/gas/testsuite/ChangeLog cvs rdiff -u -r1.1.1.1 -r0 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/bfin/16bit_illegals.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/bfin/16bit_illegals.s cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/mips/mips.exp cvs rdiff -u -r1.1.1.1 -r0 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/mips/mips5.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/mips/mips5.l \ src/external/gpl3/binutils/dist/gas/testsuite/gas/mips/mips5.s cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/booke.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/booke.s \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/common.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/e500mc.s \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/vsx.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/vsx.s cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/common.s \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/power4_32.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/power4_32.s cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/e500mc.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/power6.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/power6.s \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/power7.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/power7.s \ src/external/gpl3/binutils/dist/gas/testsuite/gas/ppc/ppc.exp cvs rdiff -u -r1.1.1.1 -r0 \ src/external/gpl3/binutils/dist/gas/testsuite/gas/tic6x/insns-c674x-bad.d \ src/external/gpl3/binutils/dist/gas/testsuite/gas/tic6x/insns-c674x-bad.l \ src/external/gpl3/binutils/dist/gas/testsuite/gas/tic6x/insns-c674x-bad.s cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/binutils/dist/gold/po/ja.gmo \ src/external/gpl3/binutils/dist/gold/po/ja.po cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gprof/corefile.c cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/gprof/gprof.1 \ src/external/gpl3/binutils/dist/gprof/gprof.info cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/include/bfdlink.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/include/elf/ChangeLog \ src/external/gpl3/binutils/dist/include/elf/internal.h \ src/external/gpl3/binutils/dist/include/elf/mips.h \ src/external/gpl3/binutils/dist/include/elf/ppc.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/include/elf/common.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/include/opcode/ChangeLog \ src/external/gpl3/binutils/dist/include/opcode/ppc.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/dist/include/opcode/mips.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/ld/ChangeLog \ src/external/gpl3/binutils/dist/ld/ldctor.c \ src/external/gpl3/binutils/dist/ld/ldemul.c \ src/external/gpl3/binutils/dist/ld/ldexp.c \ src/external/gpl3/binutils/dist/ld/ldlang.c \ src/external/gpl3/binutils/dist/ld/ldlang.h \ src/external/gpl3/binutils/dist/ld/ldlex.l \ src/external/gpl3/binutils/dist/ld/ldmain.c \ src/external/gpl3/binutils/dist/ld/ldmain.h \ src/external/gpl3/binutils/dist/ld/lexsup.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/ld/Makefile.am \ src/external/gpl3/binutils/dist/ld/ld.texinfo cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/ld/Makefile.in cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/ld/configure.tgt cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/ld/ldlex.c cvs rdiff -u -r1.1.1.3 -r1.2 src/external/gpl3/binutils/dist/ld/ldlex.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/binutils/dist/ld/emulparams/elf_i386.sh cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/ld/emultempl/beos.em \ 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 \ src/external/gpl3/binutils/dist/ld/emultempl/spuelf.em \ src/external/gpl3/binutils/dist/ld/emultempl/xtensaelf.em cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/binutils/dist/ld/emultempl/elf32.em cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/ld/scripttempl/elf.sc cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/ld/testsuite/ChangeLog cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/dist/ld/testsuite/ld-elf/linkoncerdiff.d cvs rdiff -u -r1.1.1.1 -r0 \ src/external/gpl3/binutils/dist/ld/testsuite/ld-i386/emit-relocs.d cvs rdiff -u -r1.1.1.1 -r0 \ src/external/gpl3/binutils/dist/ld/testsuite/ld-plugin/plugin-ignore.d cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/ld/testsuite/ld-powerpc/powerpc.exp cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/dist/ld/testsuite/ld-powerpc/vxworks-relax.rd cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/libiberty/floatformat.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/opcodes/ChangeLog \ src/external/gpl3/binutils/dist/opcodes/Makefile.am \ src/external/gpl3/binutils/dist/opcodes/Makefile.in \ src/external/gpl3/binutils/dist/opcodes/configure \ src/external/gpl3/binutils/dist/opcodes/configure.in \ src/external/gpl3/binutils/dist/opcodes/mips-dis.c \ src/external/gpl3/binutils/dist/opcodes/ppc-dis.c \ src/external/gpl3/binutils/dist/opcodes/ppc-opc.c cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/opcodes/mips-opc.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/opcodes/sparc-dis.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.