Module Name: src
Committed By: christos
Date: Thu Oct 3 18:30:46 UTC 2013
Modified Files:
src/external/gpl3/gdb/dist: config.guess config.sub
src/external/gpl3/gdb/dist/bfd: bfdio.c config.bfd elf.c elf32-i386.c
netbsd-core.c
src/external/gpl3/gdb/dist/bfd/doc: Makefile.in bfd.info
src/external/gpl3/gdb/dist/gdb: alphabsd-nat.c alphanbsd-tdep.c
amd64bsd-nat.c amd64nbsd-nat.c amd64nbsd-tdep.c armnbsd-nat.c
bsd-kvm.c configure configure.ac configure.host configure.tgt
hppa-tdep.c hppa-tdep.h hppanbsd-nat.c hppanbsd-tdep.c
i386bsd-nat.c i386bsd-nat.h i386nbsd-nat.c i386nbsd-tdep.c
inf-ptrace.c m68kbsd-nat.c m68kbsd-tdep.c mips-tdep.h
mipsnbsd-nat.c mipsnbsd-tdep.c nbsd-thread.c objfiles.c
ppcnbsd-nat.c regcache.c sh-tdep.c shnbsd-nat.c shnbsd-tdep.c
sparc-nat.c sparc64nbsd-nat.c sparcnbsd-nat.c ui-file.c user-regs.c
vaxbsd-nat.c
src/external/gpl3/gdb/dist/gdb/tui: tui-stack.c
src/external/gpl3/gdb/dist/opcodes: configure configure.in
src/external/gpl3/gdb/dist/readline: display.c rltty.c terminal.c
xmalloc.h
src/external/gpl3/gdb/dist/sim: configure
src/external/gpl3/gdb/dist/sim/common: callback.c
src/external/gpl3/gdb/dist/sim/mips: Makefile.in
src/external/gpl3/gdb/dist/sim/mn10300: Makefile.in
src/external/gpl3/gdb/dist/sim/ppc: emul_netbsd.c events.c
src/external/gpl3/gdb/dist/sim/v850: Makefile.in
Removed Files:
src/external/gpl3/gdb/dist/bfd: coff-pmac.c xcoff-target.h
src/external/gpl3/gdb/dist/cgen/cpu: ChangeLog cris.cpu frv.cpu frv.opc
iq10.cpu iq2000.cpu iq2000.opc iq2000m.cpu lm32.cpu lm32.opc
m32c.cpu m32c.opc m32r.cpu m32r.opc mt.cpu mt.opc sh.cpu sh.opc
sh64-compact.cpu sh64-media.cpu simplify.inc xc16x.cpu xc16x.opc
src/external/gpl3/gdb/dist/config: mh-interix
src/external/gpl3/gdb/dist/gdb: call-cmds.h cc-with-index.sh
copyright.sh gdb_assert.h gdb_dirent.h gdb_locale.h gdb_stat.h
gdb_string.h gdb_thread_db.h gdb_wait.h gdbinit.in i386-stub.c
libunwind-frame.c libunwind-frame.h m32r-stub.c m68k-stub.c
objc-exp.c objc-exp.y ravenscar-sparc-thread.c sh-stub.c
sparc-stub.c stamp-h1 vec.c vec.h wrapper.c wrapper.h
src/external/gpl3/gdb/dist/gdb/gnulib: Makefile.am dummy.c memchr.c
memchr.valgrind memmem.c stddef.in.h stdint.in.h str-two-way.h
string.in.h wchar.in.h
src/external/gpl3/gdb/dist/gdb/gnulib/extra: arg-nonnull.h c++defs.h
warn-on-use.h
src/external/gpl3/gdb/dist/gdb/gnulib/m4: 00gnulib.m4 extensions.m4
gnulib-cache.m4 gnulib-common.m4 gnulib-comp.m4 gnulib-tool.m4
include_next.m4 longlong.m4 memchr.m4 memmem.m4 mmap-anon.m4
multiarch.m4 onceonly.m4 stddef_h.m4 stdint.m4 string_h.m4
warn-on-use.m4 wchar_h.m4 wchar_t.m4 wint_t.m4
src/external/gpl3/gdb/dist/gdb/osf-share: README cma_attr.h
cma_deb_core.h cma_debug_client.h cma_errors.h cma_handle.h
cma_init.h cma_list.h cma_mutex.h cma_sched.h cma_semaphore_defs.h
cma_sequence.h cma_stack.h cma_stack_int.h cma_tcb_defs.h
cma_util.h
src/external/gpl3/gdb/dist/gdb/osf-share/AT386: cma_thread_io.h
src/external/gpl3/gdb/dist/gdb/osf-share/HP800: cma_thread_io.h
src/external/gpl3/gdb/dist/gdb/osf-share/RIOS: cma_thread_io.h
src/external/gpl3/gdb/dist/gdb/testsuite: .gdbinit
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.base: regs.exp
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.hp/gdb.aCC: exception.exp
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi: mi2-basics.exp
mi2-break.exp mi2-cli.exp mi2-console.exp mi2-disassemble.exp
mi2-eval.exp mi2-file.exp mi2-hack-cli.exp mi2-pthreads.exp
mi2-read-memory.exp mi2-regs.exp mi2-return.exp mi2-simplerun.exp
mi2-stack.exp mi2-stepi.exp mi2-syn-frame.exp mi2-until.exp
mi2-var-block.exp mi2-var-cmd.exp mi2-var-display.exp mi2-watch.exp
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads: attachstop-mt.c
attachstop-mt.exp step.c step.exp step2.exp
src/external/gpl3/gdb/dist/gdb/tui: tui-main.c
src/external/gpl3/gdb/dist/readline/doc: inc-hist.texinfo
src/external/gpl3/gdb/dist/sim/common: common.m4
src/external/gpl3/gdb/dist/sim/m32c: configure.in
src/external/gpl3/gdb/dist/sim/rx: configure.in
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/config.guess
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/config.sub
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/bfd/bfdio.c \
src/external/gpl3/gdb/dist/bfd/elf.c \
src/external/gpl3/gdb/dist/bfd/elf32-i386.c \
src/external/gpl3/gdb/dist/bfd/netbsd-core.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/bfd/coff-pmac.c \
src/external/gpl3/gdb/dist/bfd/xcoff-target.h
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/bfd/config.bfd
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/bfd/doc/Makefile.in
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/dist/bfd/doc/bfd.info
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/cgen/cpu/ChangeLog \
src/external/gpl3/gdb/dist/cgen/cpu/cris.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/frv.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/frv.opc \
src/external/gpl3/gdb/dist/cgen/cpu/iq10.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/iq2000.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/iq2000.opc \
src/external/gpl3/gdb/dist/cgen/cpu/iq2000m.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/lm32.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/lm32.opc \
src/external/gpl3/gdb/dist/cgen/cpu/m32c.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/m32c.opc \
src/external/gpl3/gdb/dist/cgen/cpu/m32r.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/m32r.opc \
src/external/gpl3/gdb/dist/cgen/cpu/mt.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/mt.opc \
src/external/gpl3/gdb/dist/cgen/cpu/sh.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/sh.opc \
src/external/gpl3/gdb/dist/cgen/cpu/sh64-compact.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/sh64-media.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/simplify.inc \
src/external/gpl3/gdb/dist/cgen/cpu/xc16x.cpu \
src/external/gpl3/gdb/dist/cgen/cpu/xc16x.opc
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/config/mh-interix
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/alphabsd-nat.c \
src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c \
src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/configure.host \
src/external/gpl3/gdb/dist/gdb/configure.tgt \
src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c \
src/external/gpl3/gdb/dist/gdb/i386nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sparc-nat.c \
src/external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/inf-ptrace.c \
src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sparc64nbsd-nat.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c \
src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/gdb/call-cmds.h \
src/external/gpl3/gdb/dist/gdb/cc-with-index.sh \
src/external/gpl3/gdb/dist/gdb/copyright.sh \
src/external/gpl3/gdb/dist/gdb/gdb_assert.h \
src/external/gpl3/gdb/dist/gdb/gdb_dirent.h \
src/external/gpl3/gdb/dist/gdb/gdb_locale.h \
src/external/gpl3/gdb/dist/gdb/gdb_stat.h \
src/external/gpl3/gdb/dist/gdb/gdb_string.h \
src/external/gpl3/gdb/dist/gdb/gdb_thread_db.h \
src/external/gpl3/gdb/dist/gdb/gdb_wait.h \
src/external/gpl3/gdb/dist/gdb/gdbinit.in \
src/external/gpl3/gdb/dist/gdb/i386-stub.c \
src/external/gpl3/gdb/dist/gdb/libunwind-frame.c \
src/external/gpl3/gdb/dist/gdb/libunwind-frame.h \
src/external/gpl3/gdb/dist/gdb/m32r-stub.c \
src/external/gpl3/gdb/dist/gdb/m68k-stub.c \
src/external/gpl3/gdb/dist/gdb/objc-exp.c \
src/external/gpl3/gdb/dist/gdb/objc-exp.y \
src/external/gpl3/gdb/dist/gdb/ravenscar-sparc-thread.c \
src/external/gpl3/gdb/dist/gdb/sh-stub.c \
src/external/gpl3/gdb/dist/gdb/sparc-stub.c \
src/external/gpl3/gdb/dist/gdb/stamp-h1 \
src/external/gpl3/gdb/dist/gdb/vec.c src/external/gpl3/gdb/dist/gdb/vec.h \
src/external/gpl3/gdb/dist/gdb/wrapper.c \
src/external/gpl3/gdb/dist/gdb/wrapper.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/configure \
src/external/gpl3/gdb/dist/gdb/configure.ac \
src/external/gpl3/gdb/dist/gdb/hppa-tdep.c \
src/external/gpl3/gdb/dist/gdb/hppa-tdep.h \
src/external/gpl3/gdb/dist/gdb/hppanbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h \
src/external/gpl3/gdb/dist/gdb/m68kbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/mips-tdep.h \
src/external/gpl3/gdb/dist/gdb/mipsnbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/objfiles.c \
src/external/gpl3/gdb/dist/gdb/regcache.c \
src/external/gpl3/gdb/dist/gdb/sh-tdep.c \
src/external/gpl3/gdb/dist/gdb/ui-file.c \
src/external/gpl3/gdb/dist/gdb/user-regs.c
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/gdb/gnulib/Makefile.am \
src/external/gpl3/gdb/dist/gdb/gnulib/dummy.c \
src/external/gpl3/gdb/dist/gdb/gnulib/memchr.c \
src/external/gpl3/gdb/dist/gdb/gnulib/memchr.valgrind \
src/external/gpl3/gdb/dist/gdb/gnulib/memmem.c \
src/external/gpl3/gdb/dist/gdb/gnulib/stddef.in.h \
src/external/gpl3/gdb/dist/gdb/gnulib/stdint.in.h \
src/external/gpl3/gdb/dist/gdb/gnulib/str-two-way.h \
src/external/gpl3/gdb/dist/gdb/gnulib/string.in.h \
src/external/gpl3/gdb/dist/gdb/gnulib/wchar.in.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/gnulib/extra/arg-nonnull.h \
src/external/gpl3/gdb/dist/gdb/gnulib/extra/c++defs.h \
src/external/gpl3/gdb/dist/gdb/gnulib/extra/warn-on-use.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/00gnulib.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/extensions.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-cache.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-common.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-comp.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-tool.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/include_next.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/longlong.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/memchr.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/memmem.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/mmap-anon.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/multiarch.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/onceonly.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/stddef_h.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/stdint.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/string_h.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/warn-on-use.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/wchar_h.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/wchar_t.m4 \
src/external/gpl3/gdb/dist/gdb/gnulib/m4/wint_t.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/gdb/osf-share/README \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_attr.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_deb_core.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_debug_client.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_errors.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_handle.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_init.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_list.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_mutex.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_sched.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_semaphore_defs.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_sequence.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_stack.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_stack_int.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_tcb_defs.h \
src/external/gpl3/gdb/dist/gdb/osf-share/cma_util.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/osf-share/AT386/cma_thread_io.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/osf-share/HP800/cma_thread_io.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/osf-share/RIOS/cma_thread_io.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/gdb/testsuite/.gdbinit
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.base/regs.exp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.hp/gdb.aCC/exception.exp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-basics.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-break.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-cli.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-console.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-disassemble.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-eval.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-file.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-hack-cli.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-pthreads.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-read-memory.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-regs.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-return.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-simplerun.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-stack.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-stepi.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-syn-frame.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-until.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-var-block.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-var-cmd.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-var-display.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-watch.exp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/attachstop-mt.c \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/attachstop-mt.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/step.c \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/step.exp \
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/step2.exp
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/gdb/tui/tui-main.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/tui/tui-stack.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/opcodes/configure \
src/external/gpl3/gdb/dist/opcodes/configure.in
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/readline/display.c \
src/external/gpl3/gdb/dist/readline/rltty.c \
src/external/gpl3/gdb/dist/readline/terminal.c \
src/external/gpl3/gdb/dist/readline/xmalloc.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gdb/dist/readline/doc/inc-hist.texinfo
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/common/callback.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/sim/common/common.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/sim/m32c/configure.in
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/mips/Makefile.in
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/ppc/emul_netbsd.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/ppc/events.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/sim/rx/configure.in
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/v850/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
