Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/gpl3/gdb/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/121220eab738
branches: trunk
changeset: 810034:121220eab738
user: christos <christos%NetBSD.org@localhost>
date: Sun Aug 16 09:52:55 2015 +0000
description:
merge conflicts
diffstat:
external/gpl3/gdb/dist/bfd/bfdio.c | 2 +-
external/gpl3/gdb/dist/bfd/config.bfd | 1188 +++---
external/gpl3/gdb/dist/bfd/configure | 870 ++--
external/gpl3/gdb/dist/bfd/doc/Makefile.am | 44 +-
external/gpl3/gdb/dist/bfd/doc/Makefile.in | 181 +-
external/gpl3/gdb/dist/bfd/doc/bfd.info | Bin
external/gpl3/gdb/dist/bfd/elf.c | 849 ++--
external/gpl3/gdb/dist/bfd/elf32-i386.c | 399 +-
external/gpl3/gdb/dist/bfd/netbsd-core.c | 6 +-
external/gpl3/gdb/dist/config.guess | 201 +-
external/gpl3/gdb/dist/config.sub | 38 +-
external/gpl3/gdb/dist/gdb/alphabsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c | 96 +-
external/gpl3/gdb/dist/gdb/amd64bsd-nat.c | 5 +-
external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c | 4 +-
external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c | 4 +-
external/gpl3/gdb/dist/gdb/arm-tdep.c | 2277 ++++++++++--
external/gpl3/gdb/dist/gdb/armnbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/armnbsd-tdep.c | 4 +-
external/gpl3/gdb/dist/gdb/bsd-kvm.c | 32 +-
external/gpl3/gdb/dist/gdb/common/agent.c | 137 +-
external/gpl3/gdb/dist/gdb/common/common-defs.h | 2 +
external/gpl3/gdb/dist/gdb/configure | 1267 ++++--
external/gpl3/gdb/dist/gdb/configure.ac | 277 +-
external/gpl3/gdb/dist/gdb/configure.host | 13 +-
external/gpl3/gdb/dist/gdb/configure.tgt | 38 +-
external/gpl3/gdb/dist/gdb/d-exp.c | 3819 ++++++++------------
external/gpl3/gdb/dist/gdb/hppa-tdep.c | 42 +-
external/gpl3/gdb/dist/gdb/hppa-tdep.h | 4 +-
external/gpl3/gdb/dist/gdb/hppanbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/hppanbsd-tdep.c | 27 +-
external/gpl3/gdb/dist/gdb/i386bsd-nat.c | 4 +-
external/gpl3/gdb/dist/gdb/i386bsd-nat.h | 2 +-
external/gpl3/gdb/dist/gdb/i386nbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c | 5 +-
external/gpl3/gdb/dist/gdb/inf-ptrace.c | 113 +-
external/gpl3/gdb/dist/gdb/m68kbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/m68kbsd-tdep.c | 33 +-
external/gpl3/gdb/dist/gdb/mips-tdep.h | 17 +-
external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/mipsnbsd-tdep.c | 41 +-
external/gpl3/gdb/dist/gdb/nbsd-thread.c | 40 +-
external/gpl3/gdb/dist/gdb/objfiles.c | 124 +-
external/gpl3/gdb/dist/gdb/p-exp.y | 375 +-
external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/regcache.c | 152 +-
external/gpl3/gdb/dist/gdb/remote.c | 2393 ++++++------
external/gpl3/gdb/dist/gdb/sh-tdep.c | 31 +-
external/gpl3/gdb/dist/gdb/shnbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/shnbsd-tdep.c | 6 +-
external/gpl3/gdb/dist/gdb/solib.c | 54 +-
external/gpl3/gdb/dist/gdb/sparc-nat.c | 60 +-
external/gpl3/gdb/dist/gdb/sparc64nbsd-nat.c | 26 +-
external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c | 6 +-
external/gpl3/gdb/dist/gdb/tui/tui-stack.c | 3 +-
external/gpl3/gdb/dist/gdb/ui-file.c | 13 +-
external/gpl3/gdb/dist/gdb/user-regs.c | 30 +-
external/gpl3/gdb/dist/gdb/utils.c | 2 +-
external/gpl3/gdb/dist/gdb/varobj.c | 323 +-
external/gpl3/gdb/dist/gdb/vaxbsd-nat.c | 2 +-
external/gpl3/gdb/dist/libiberty/make-temp-file.c | 4 +-
external/gpl3/gdb/dist/libiberty/strerror.c | 5 +
external/gpl3/gdb/dist/opcodes/cgen.sh | 2 +-
external/gpl3/gdb/dist/opcodes/configure | 95 +-
external/gpl3/gdb/dist/sim/common/callback.c | 199 +-
external/gpl3/gdb/dist/sim/configure | 1 +
external/gpl3/gdb/dist/sim/mn10300/Makefile.in | 2 +-
external/gpl3/gdb/dist/sim/ppc/hw_memory.c | 2 +
external/gpl3/gdb/dist/sim/v850/Makefile.in | 2 +-
69 files changed, 8695 insertions(+), 7315 deletions(-)
diffs (truncated from 24446 to 300 lines):
diff -r b3627f94c82f -r 121220eab738 external/gpl3/gdb/dist/bfd/bfdio.c
--- a/external/gpl3/gdb/dist/bfd/bfdio.c Sun Aug 16 09:51:58 2015 +0000
+++ b/external/gpl3/gdb/dist/bfd/bfdio.c Sun Aug 16 09:52:55 2015 +0000
@@ -1,6 +1,6 @@
/* Low-level I/O routines for BFDs.
- Copyright 1990-2013 Free Software Foundation, Inc.
+ Copyright (C) 1990-2015 Free Software Foundation, Inc.
Written by Cygnus Support.
diff -r b3627f94c82f -r 121220eab738 external/gpl3/gdb/dist/bfd/config.bfd
--- a/external/gpl3/gdb/dist/bfd/config.bfd Sun Aug 16 09:51:58 2015 +0000
+++ b/external/gpl3/gdb/dist/bfd/config.bfd Sun Aug 16 09:52:55 2015 +0000
@@ -1,6 +1,6 @@
# config.bfd
#
-# Copyright 2012, 2013 Free Software Foundation
+# Copyright (C) 2012-2015 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -48,6 +48,11 @@
# Catch obsolete configurations.
case $targ in
+ openrisc-*-* | or32-*-*)
+ echo "*** Configuration $targ is obsolete." >&2
+ echo "*** Use or1k-*-elf or or1k-*-linux as the target instead" >&2
+ exit 1
+ ;;
null)
if test "x$enable_obsolete" != xyes; then
echo "*** Configuration $targ is obsolete." >&2
@@ -59,24 +64,23 @@
esac
case $targ in
- m68*-apple-aux* | \
- m68*-apollo-* | \
- m68*-bull-sysv* | \
- m68*-*-rtemscoff* | \
- maxq-*-coff | \
+ *-go32-rtems* | \
+ a29k-* | \
+ arm-*-oabi | \
+ hppa*-*-rtems* | \
i960-*-rtems* | \
- or32-*-rtems* | \
+ i[3-7]86*-*-rtemscoff* | \
m68*-*-lynxos* | \
- sparc-*-lynxos* | \
- vax-*-vms* | \
- arm-*-oabi | \
- a29k-* | \
- hppa*-*-rtems* | \
- *-go32-rtems* | \
- i[3-7]86*-*-rtemscoff* | \
+ m68*-*-rtemscoff* | \
+ m68*-apollo-* | \
+ m68*-apple-aux* | \
+ m68*-bull-sysv* | \
+ maxq-*-coff | \
mips*el-*-rtems* | \
powerpcle-*-rtems* | \
sparc*-*-rtemsaout* | \
+ sparc-*-lynxos* | \
+ vax-*-vms* | \
null)
echo "*** Configuration $targ is obsolete." >&2
echo "*** Support has been REMOVED." >&2
@@ -112,7 +116,7 @@
mips*) targ_archs=bfd_mips_arch ;;
nds32*) targ_archs=bfd_nds32_arch ;;
nios2*) targ_archs=bfd_nios2_arch ;;
-or32*) targ_archs=bfd_or32_arch ;;
+or1k*|or1knd*) targ_archs=bfd_or1k_arch ;;
pdp11*) targ_archs=bfd_pdp11_arch ;;
pj*) targ_archs="bfd_pj_arch bfd_i386_arch";;
powerpc*) targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
@@ -124,6 +128,7 @@
tilegx*) targ_archs=bfd_tilegx_arch ;;
tilepro*) targ_archs=bfd_tilepro_arch ;;
v850*) targ_archs="bfd_v850_arch bfd_v850_rh850_arch" ;;
+visium*) targ_archs=bfd_visium_arch ;;
x86_64*) targ_archs=bfd_i386_arch ;;
xtensa*) targ_archs=bfd_xtensa_arch ;;
xgate) targ_archs=bfd_xgate_arch ;;
@@ -165,23 +170,23 @@
# START OF targmatch.h
#ifdef BFD64
aarch64-*-elf)
- targ_defvec=bfd_elf64_littleaarch64_vec
- targ_selvecs="bfd_elf64_bigaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+ targ_defvec=aarch64_elf64_le_vec
+ targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
want64=true
;;
aarch64_be-*-elf)
- targ_defvec=bfd_elf64_bigaarch64_vec
- targ_selvecs="bfd_elf64_littleaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_bigarm_vec bfd_elf32_littlearm_vec"
+ targ_defvec=aarch64_elf64_be_vec
+ targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
want64=true
;;
aarch64-*-linux*)
- targ_defvec=bfd_elf64_littleaarch64_vec
- targ_selvecs="bfd_elf64_bigaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+ targ_defvec=aarch64_elf64_le_vec
+ targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
want64=true
;;
aarch64_be-*-linux*)
- targ_defvec=bfd_elf64_bigaarch64_vec
- targ_selvecs="bfd_elf64_littleaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_bigarm_vec bfd_elf32_littlearm_vec"
+ targ_defvec=aarch64_elf64_be_vec
+ targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
want64=true
;;
aarch64-*-netbsd*)
@@ -195,8 +200,8 @@
want64=true
;;
alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- targ_defvec=bfd_elf64_alpha_freebsd_vec
- targ_selvecs="bfd_elf64_alpha_vec ecoffalpha_little_vec"
+ targ_defvec=alpha_elf64_fbsd_vec
+ targ_selvecs="alpha_elf64_vec alpha_ecoff_le_vec"
want64=true
# FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
case "${targ}" in
@@ -205,170 +210,170 @@
esac
;;
alpha*-*-netbsd* | alpha*-*-openbsd*)
- targ_defvec=bfd_elf64_alpha_vec
- targ_selvecs=ecoffalpha_little_vec
+ targ_defvec=alpha_elf64_vec
+ targ_selvecs=alpha_ecoff_le_vec
want64=true
;;
alpha*-*-netware*)
- targ_defvec=ecoffalpha_little_vec
- targ_selvecs=nlm32_alpha_vec
+ targ_defvec=alpha_ecoff_le_vec
+ targ_selvecs=alpha_nlm32_vec
want64=true
;;
alpha*-*-linux*ecoff*)
- targ_defvec=ecoffalpha_little_vec
- targ_selvecs=bfd_elf64_alpha_vec
+ targ_defvec=alpha_ecoff_le_vec
+ targ_selvecs=alpha_elf64_vec
want64=true
;;
alpha*-*-linux-* | alpha*-*-elf*)
- targ_defvec=bfd_elf64_alpha_vec
- targ_selvecs=ecoffalpha_little_vec
+ targ_defvec=alpha_elf64_vec
+ targ_selvecs=alpha_ecoff_le_vec
want64=true
;;
alpha*-*-*vms*)
- targ_defvec=vms_alpha_vec
- targ_selvecs=vms_lib_txt_vec
+ targ_defvec=alpha_vms_vec
+ targ_selvecs=alpha_vms_lib_txt_vec
want64=true
;;
alpha*-*-*)
- targ_defvec=ecoffalpha_little_vec
+ targ_defvec=alpha_ecoff_le_vec
want64=true
;;
ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
- targ_defvec=bfd_elf64_ia64_little_vec
- targ_selvecs="bfd_elf64_ia64_big_vec bfd_pei_ia64_vec"
+ targ_defvec=ia64_elf64_le_vec
+ targ_selvecs="ia64_elf64_be_vec ia64_pei_vec"
want64=true
;;
ia64*-*-hpux*)
- targ_defvec=bfd_elf32_ia64_hpux_big_vec
- targ_selvecs="bfd_elf64_ia64_hpux_big_vec"
+ targ_defvec=ia64_elf32_hpux_be_vec
+ targ_selvecs="ia64_elf64_hpux_be_vec"
want64=true
;;
ia64*-*-*vms*)
- targ_defvec=bfd_elf64_ia64_vms_vec
- targ_selvecs=vms_lib_txt_vec
+ targ_defvec=ia64_elf64_vms_vec
+ targ_selvecs=alpha_vms_lib_txt_vec
want64=true
;;
sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
- targ_defvec=bfd_elf64_sparc_freebsd_vec
- targ_selvecs="bfd_elf64_sparc_vec bfd_elf32_sparc_vec sunos_big_vec"
+ targ_defvec=sparc_elf64_fbsd_vec
+ targ_selvecs="sparc_elf64_vec sparc_elf32_vec sparc_aout_sunos_be_vec"
;;
sparc64-*-netbsd* | sparc64-*-openbsd*)
- targ_defvec=bfd_elf64_sparc_vec
- targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+ targ_defvec=sparc_elf64_vec
+ targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
want64=true
;;
#endif /* BFD64 */
am34-*-linux* | am33_2.0-*-linux*)
- targ_defvec=bfd_elf32_am33lin_vec
+ targ_defvec=am33_elf32_linux_vec
;;
arc-*-elf*)
- targ_defvec=bfd_elf32_littlearc_vec
- targ_selvecs=bfd_elf32_bigarc_vec
+ targ_defvec=arc_elf32_le_vec
+ targ_selvecs=arc_elf32_be_vec
;;
arm-*-nacl*)
- targ_defvec=bfd_elf32_littlearm_nacl_vec
- targ_selvecs="bfd_elf32_bigarm_nacl_vec bfd_elf32_i386_nacl_vec"
- targ64_selvecs="bfd_elf32_x86_64_nacl_vec bfd_elf64_x86_64_nacl_vec"
+ targ_defvec=arm_elf32_nacl_le_vec
+ targ_selvecs="arm_elf32_nacl_be_vec i386_elf32_nacl_vec"
+ targ64_selvecs="x86_64_elf32_nacl_vec x86_64_elf64_nacl_vec"
targ_archs="$targ_archs bfd_i386_arch"
;;
armeb-*-nacl*)
- targ_defvec=bfd_elf32_bigarm_nacl_vec
- targ_selvecs="bfd_elf32_littlearm_nacl_vec bfd_elf32_i386_nacl_vec"
- targ64_selvecs="bfd_elf32_x86_64_nacl_vec bfd_elf64_x86_64_nacl_vec"
+ targ_defvec=arm_elf32_nacl_be_vec
+ targ_selvecs="arm_elf32_nacl_le_vec i386_elf32_nacl_vec"
+ targ64_selvecs="x86_64_elf32_nacl_vec x86_64_elf64_nacl_vec"
targ_archs="$targ_archs bfd_i386_arch"
;;
armeb-*-netbsdelf*)
- targ_defvec=bfd_elf32_bigarm_vec
- targ_selvecs="bfd_elf32_littlearm_vec armnetbsd_vec"
+ targ_defvec=arm_elf32_be_vec
+ targ_selvecs="arm_elf32_le_vec arm_aout_nbsd_vec"
;;
arm-*-netbsdelf*)
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs="bfd_elf32_bigarm_vec armnetbsd_vec"
+ targ_defvec=arm_elf32_le_vec
+ targ_selvecs="arm_elf32_be_vec arm_aout_nbsd_vec"
;;
arm-*-netbsd* | arm-*-openbsd*)
- targ_defvec=armnetbsd_vec
- targ_selvecs="bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+ targ_defvec=arm_aout_nbsd_vec
+ targ_selvecs="arm_elf32_le_vec arm_elf32_be_vec"
targ_underscore=yes
- targ_cflags=-D__QNXTARGET__
;;
arm-*-nto* | nto*arm*)
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
+ targ_defvec=arm_elf32_le_vec
+ targ_selvecs=arm_elf32_be_vec
+ targ_cflags=-D__QNXTARGET__
;;
arm-*-riscix*)
- targ_defvec=riscix_vec
+ targ_defvec=arm_aout_riscix_vec
;;
arm-epoc-pe*)
- targ_defvec=arm_epoc_pe_little_vec
- targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
+ targ_defvec=arm_pe_epoc_le_vec
+ targ_selvecs="arm_pe_epoc_le_vec arm_pe_epoc_be_vec arm_pei_epoc_le_vec arm_pei_epoc_be_vec"
targ_underscore=no
targ_cflags=-DARM_COFF_BUGFIX
;;
arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
- targ_defvec=arm_wince_pe_little_vec
- targ_selvecs="arm_wince_pe_little_vec arm_wince_pe_big_vec arm_wince_pei_little_vec arm_wince_pei_big_vec"
+ targ_defvec=arm_pe_wince_le_vec
+ targ_selvecs="arm_pe_wince_le_vec arm_pe_wince_be_vec arm_pei_wince_le_vec arm_pei_wince_be_vec"
targ_underscore=no
targ_cflags="-DARM_WINCE -DARM_COFF_BUGFIX"
;;
arm-*-pe*)
- targ_defvec=armpe_little_vec
- targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
+ targ_defvec=arm_pe_le_vec
+ targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
targ_underscore=yes
;;
arm-*-aout | armel-*-aout)
- targ_defvec=aout_arm_little_vec
- targ_selvecs=aout_arm_big_vec
+ targ_defvec=arm_aout_le_vec
+ targ_selvecs=arm_aout_be_vec
;;
Home |
Main Index |
Thread Index |
Old Index