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/e875d0fb359c
branches: trunk
changeset: 790325:e875d0fb359c
user: christos <christos%NetBSD.org@localhost>
date: Thu Oct 03 18:30:43 2013 +0000
description:
merge conflicts
diffstat:
external/gpl3/gdb/dist/bfd/bfdio.c | 53 +-
external/gpl3/gdb/dist/bfd/coff-pmac.c | 34 -
external/gpl3/gdb/dist/bfd/config.bfd | 272 +-
external/gpl3/gdb/dist/bfd/doc/Makefile.in | 19 +
external/gpl3/gdb/dist/bfd/elf.c | 1183 +-
external/gpl3/gdb/dist/bfd/elf32-i386.c | 1096 +-
external/gpl3/gdb/dist/bfd/netbsd-core.c | 5 +-
external/gpl3/gdb/dist/bfd/xcoff-target.h | 194 -
external/gpl3/gdb/dist/cgen/cpu/ChangeLog | 771 -
external/gpl3/gdb/dist/cgen/cpu/cris.cpu | 4553 ----
external/gpl3/gdb/dist/cgen/cpu/frv.cpu | 9803 ---------
external/gpl3/gdb/dist/cgen/cpu/frv.opc | 1921 -
external/gpl3/gdb/dist/cgen/cpu/iq10.cpu | 1112 -
external/gpl3/gdb/dist/cgen/cpu/iq2000.cpu | 1196 -
external/gpl3/gdb/dist/cgen/cpu/iq2000.opc | 320 -
external/gpl3/gdb/dist/cgen/cpu/iq2000m.cpu | 631 -
external/gpl3/gdb/dist/cgen/cpu/lm32.cpu | 932 -
external/gpl3/gdb/dist/cgen/cpu/lm32.opc | 235 -
external/gpl3/gdb/dist/cgen/cpu/m32c.cpu | 10521 ----------
external/gpl3/gdb/dist/cgen/cpu/m32c.opc | 1182 -
external/gpl3/gdb/dist/cgen/cpu/m32r.cpu | 2437 --
external/gpl3/gdb/dist/cgen/cpu/m32r.opc | 347 -
external/gpl3/gdb/dist/cgen/cpu/mt.cpu | 1352 -
external/gpl3/gdb/dist/cgen/cpu/mt.opc | 472 -
external/gpl3/gdb/dist/cgen/cpu/sh.cpu | 369 -
external/gpl3/gdb/dist/cgen/cpu/sh.opc | 77 -
external/gpl3/gdb/dist/cgen/cpu/sh64-compact.cpu | 1748 -
external/gpl3/gdb/dist/cgen/cpu/sh64-media.cpu | 1733 -
external/gpl3/gdb/dist/cgen/cpu/simplify.inc | 218 -
external/gpl3/gdb/dist/cgen/cpu/xc16x.cpu | 3146 --
external/gpl3/gdb/dist/cgen/cpu/xc16x.opc | 290 -
external/gpl3/gdb/dist/config.guess | 92 +-
external/gpl3/gdb/dist/config.sub | 139 +-
external/gpl3/gdb/dist/config/mh-interix | 7 -
external/gpl3/gdb/dist/gdb/alphabsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c | 31 +-
external/gpl3/gdb/dist/gdb/amd64bsd-nat.c | 76 +-
external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c | 12 +-
external/gpl3/gdb/dist/gdb/armnbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/bsd-kvm.c | 3 +-
external/gpl3/gdb/dist/gdb/call-cmds.h | 34 -
external/gpl3/gdb/dist/gdb/cc-with-index.sh | 123 -
external/gpl3/gdb/dist/gdb/configure | 5529 +---
external/gpl3/gdb/dist/gdb/configure.ac | 420 +-
external/gpl3/gdb/dist/gdb/configure.host | 9 +-
external/gpl3/gdb/dist/gdb/configure.tgt | 256 +-
external/gpl3/gdb/dist/gdb/copyright.sh | 170 -
external/gpl3/gdb/dist/gdb/gdb_assert.h | 68 -
external/gpl3/gdb/dist/gdb/gdb_dirent.h | 41 -
external/gpl3/gdb/dist/gdb/gdb_locale.h | 49 -
external/gpl3/gdb/dist/gdb/gdb_stat.h | 73 -
external/gpl3/gdb/dist/gdb/gdb_string.h | 70 -
external/gpl3/gdb/dist/gdb/gdb_thread_db.h | 463 -
external/gpl3/gdb/dist/gdb/gdb_wait.h | 120 -
external/gpl3/gdb/dist/gdb/gdbinit.in | 34 -
external/gpl3/gdb/dist/gdb/gnulib/Makefile.am | 353 -
external/gpl3/gdb/dist/gdb/gnulib/dummy.c | 42 -
external/gpl3/gdb/dist/gdb/gnulib/extra/arg-nonnull.h | 26 -
external/gpl3/gdb/dist/gdb/gnulib/extra/c++defs.h | 271 -
external/gpl3/gdb/dist/gdb/gnulib/extra/warn-on-use.h | 109 -
external/gpl3/gdb/dist/gdb/gnulib/m4/00gnulib.m4 | 30 -
external/gpl3/gdb/dist/gdb/gnulib/m4/extensions.m4 | 118 -
external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-cache.m4 | 35 -
external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-common.m4 | 201 -
external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-comp.m4 | 253 -
external/gpl3/gdb/dist/gdb/gnulib/m4/gnulib-tool.m4 | 57 -
external/gpl3/gdb/dist/gdb/gnulib/m4/include_next.m4 | 187 -
external/gpl3/gdb/dist/gdb/gnulib/m4/longlong.m4 | 106 -
external/gpl3/gdb/dist/gdb/gnulib/m4/memchr.m4 | 85 -
external/gpl3/gdb/dist/gdb/gnulib/m4/memmem.m4 | 84 -
external/gpl3/gdb/dist/gdb/gnulib/m4/mmap-anon.m4 | 59 -
external/gpl3/gdb/dist/gdb/gnulib/m4/multiarch.m4 | 65 -
external/gpl3/gdb/dist/gdb/gnulib/m4/onceonly.m4 | 91 -
external/gpl3/gdb/dist/gdb/gnulib/m4/stddef_h.m4 | 45 -
external/gpl3/gdb/dist/gdb/gnulib/m4/stdint.m4 | 472 -
external/gpl3/gdb/dist/gdb/gnulib/m4/string_h.m4 | 112 -
external/gpl3/gdb/dist/gdb/gnulib/m4/warn-on-use.m4 | 45 -
external/gpl3/gdb/dist/gdb/gnulib/m4/wchar_h.m4 | 152 -
external/gpl3/gdb/dist/gdb/gnulib/m4/wchar_t.m4 | 20 -
external/gpl3/gdb/dist/gdb/gnulib/m4/wint_t.m4 | 28 -
external/gpl3/gdb/dist/gdb/gnulib/memchr.c | 172 -
external/gpl3/gdb/dist/gdb/gnulib/memchr.valgrind | 14 -
external/gpl3/gdb/dist/gdb/gnulib/memmem.c | 76 -
external/gpl3/gdb/dist/gdb/gnulib/stddef.in.h | 86 -
external/gpl3/gdb/dist/gdb/gnulib/stdint.in.h | 568 -
external/gpl3/gdb/dist/gdb/gnulib/str-two-way.h | 429 -
external/gpl3/gdb/dist/gdb/gnulib/string.in.h | 929 -
external/gpl3/gdb/dist/gdb/gnulib/wchar.in.h | 428 -
external/gpl3/gdb/dist/gdb/hppa-tdep.c | 27 +-
external/gpl3/gdb/dist/gdb/hppa-tdep.h | 3 +-
external/gpl3/gdb/dist/gdb/hppanbsd-nat.c | 2 +-
external/gpl3/gdb/dist/gdb/hppanbsd-tdep.c | 3 +-
external/gpl3/gdb/dist/gdb/i386-stub.c | 952 -
external/gpl3/gdb/dist/gdb/i386bsd-nat.c | 47 +-
external/gpl3/gdb/dist/gdb/i386bsd-nat.h | 11 +-
external/gpl3/gdb/dist/gdb/i386nbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c | 3 +-
external/gpl3/gdb/dist/gdb/inf-ptrace.c | 84 +-
external/gpl3/gdb/dist/gdb/libunwind-frame.c | 575 -
external/gpl3/gdb/dist/gdb/libunwind-frame.h | 77 -
external/gpl3/gdb/dist/gdb/m32r-stub.c | 1779 -
external/gpl3/gdb/dist/gdb/m68k-stub.c | 1098 -
external/gpl3/gdb/dist/gdb/m68kbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/m68kbsd-tdep.c | 3 +-
external/gpl3/gdb/dist/gdb/mips-tdep.h | 29 +-
external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/mipsnbsd-tdep.c | 3 +-
external/gpl3/gdb/dist/gdb/nbsd-thread.c | 13 +-
external/gpl3/gdb/dist/gdb/objc-exp.c | 3457 ---
external/gpl3/gdb/dist/gdb/objc-exp.y | 1787 -
external/gpl3/gdb/dist/gdb/objfiles.c | 482 +-
external/gpl3/gdb/dist/gdb/osf-share/AT386/cma_thread_io.h | 457 -
external/gpl3/gdb/dist/gdb/osf-share/HP800/cma_thread_io.h | 432 -
external/gpl3/gdb/dist/gdb/osf-share/README | 8 -
external/gpl3/gdb/dist/gdb/osf-share/RIOS/cma_thread_io.h | 434 -
external/gpl3/gdb/dist/gdb/osf-share/cma_attr.h | 344 -
external/gpl3/gdb/dist/gdb/osf-share/cma_deb_core.h | 174 -
external/gpl3/gdb/dist/gdb/osf-share/cma_debug_client.h | 199 -
external/gpl3/gdb/dist/gdb/osf-share/cma_errors.h | 55 -
external/gpl3/gdb/dist/gdb/osf-share/cma_handle.h | 185 -
external/gpl3/gdb/dist/gdb/osf-share/cma_init.h | 114 -
external/gpl3/gdb/dist/gdb/osf-share/cma_list.h | 84 -
external/gpl3/gdb/dist/gdb/osf-share/cma_mutex.h | 232 -
external/gpl3/gdb/dist/gdb/osf-share/cma_sched.h | 279 -
external/gpl3/gdb/dist/gdb/osf-share/cma_semaphore_defs.h | 46 -
external/gpl3/gdb/dist/gdb/osf-share/cma_sequence.h | 56 -
external/gpl3/gdb/dist/gdb/osf-share/cma_stack.h | 83 -
external/gpl3/gdb/dist/gdb/osf-share/cma_stack_int.h | 138 -
external/gpl3/gdb/dist/gdb/osf-share/cma_tcb_defs.h | 279 -
external/gpl3/gdb/dist/gdb/osf-share/cma_util.h | 125 -
external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c | 6 +-
external/gpl3/gdb/dist/gdb/ravenscar-sparc-thread.c | 185 -
external/gpl3/gdb/dist/gdb/regcache.c | 147 +-
external/gpl3/gdb/dist/gdb/sh-stub.c | 1583 -
external/gpl3/gdb/dist/gdb/sh-tdep.c | 1039 +-
external/gpl3/gdb/dist/gdb/shnbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/shnbsd-tdep.c | 6 +-
external/gpl3/gdb/dist/gdb/sparc-nat.c | 22 +-
external/gpl3/gdb/dist/gdb/sparc-stub.c | 778 -
external/gpl3/gdb/dist/gdb/sparc64nbsd-nat.c | 21 +-
external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c | 4 +-
external/gpl3/gdb/dist/gdb/stamp-h1 | 1 -
external/gpl3/gdb/dist/gdb/testsuite/.gdbinit | 1 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.base/regs.exp | 83 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.hp/gdb.aCC/exception.exp | 21 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-basics.exp | 252 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-break.exp | 158 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-cli.exp | 182 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-console.exp | 83 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-disassemble.exp | 240 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-eval.exp | 63 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-file.exp | 75 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-hack-cli.exp | 37 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-pthreads.exp | 79 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-read-memory.exp | 84 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-regs.exp | 123 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-return.exp | 72 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-simplerun.exp | 191 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-stack.exp | 212 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-stepi.exp | 79 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-syn-frame.exp | 103 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-until.exp | 85 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-var-block.exp | 175 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-var-cmd.exp | 531 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-var-display.exp | 639 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.mi/mi2-watch.exp | 194 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/attachstop-mt.c | 56 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/attachstop-mt.exp | 265 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/step.c | 221 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/step.exp | 195 -
external/gpl3/gdb/dist/gdb/testsuite/gdb.threads/step2.exp | 145 -
external/gpl3/gdb/dist/gdb/tui/tui-main.c | 37 -
external/gpl3/gdb/dist/gdb/tui/tui-stack.c | 49 +-
external/gpl3/gdb/dist/gdb/ui-file.c | 146 +-
external/gpl3/gdb/dist/gdb/user-regs.c | 3 +-
external/gpl3/gdb/dist/gdb/vaxbsd-nat.c | 3 +-
external/gpl3/gdb/dist/gdb/vec.c | 119 -
external/gpl3/gdb/dist/gdb/vec.h | 1034 -
external/gpl3/gdb/dist/gdb/wrapper.c | 163 -
external/gpl3/gdb/dist/gdb/wrapper.h | 51 -
external/gpl3/gdb/dist/opcodes/configure | 138 +-
external/gpl3/gdb/dist/opcodes/configure.in | 65 +-
external/gpl3/gdb/dist/readline/display.c | 643 +-
external/gpl3/gdb/dist/readline/doc/inc-hist.texinfo | 457 -
external/gpl3/gdb/dist/readline/rltty.c | 142 +-
external/gpl3/gdb/dist/readline/terminal.c | 111 +-
external/gpl3/gdb/dist/readline/xmalloc.h | 29 +-
external/gpl3/gdb/dist/sim/common/callback.c | 6 +-
external/gpl3/gdb/dist/sim/common/common.m4 | 232 -
external/gpl3/gdb/dist/sim/configure | 11 +-
external/gpl3/gdb/dist/sim/m32c/configure.in | 34 -
external/gpl3/gdb/dist/sim/mips/Makefile.in | 4 +-
external/gpl3/gdb/dist/sim/mn10300/Makefile.in | 3 +-
external/gpl3/gdb/dist/sim/ppc/emul_netbsd.c | 5 +-
external/gpl3/gdb/dist/sim/ppc/events.c | 6 +-
external/gpl3/gdb/dist/sim/rx/configure.in | 63 -
external/gpl3/gdb/dist/sim/v850/Makefile.in | 3 +-
198 files changed, 5974 insertions(+), 81988 deletions(-)
diffs (truncated from 95529 to 300 lines):
diff -r ef91d1d38009 -r e875d0fb359c external/gpl3/gdb/dist/bfd/bfdio.c
--- a/external/gpl3/gdb/dist/bfd/bfdio.c Thu Oct 03 18:24:28 2013 +0000
+++ b/external/gpl3/gdb/dist/bfd/bfdio.c Thu Oct 03 18:30:43 2013 +0000
@@ -1,7 +1,7 @@
/* Low-level I/O routines for BFDs.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
Free Software Foundation, Inc.
Written by Cygnus Support.
@@ -87,7 +87,6 @@
real_fopen (const char *filename, const char *modes)
{
#ifdef VMS
- char vms_modes[4];
char *vms_attr;
/* On VMS, fopen allows file attributes as optionnal arguments.
@@ -158,9 +157,15 @@
. int (*bclose) (struct bfd *abfd);
. int (*bflush) (struct bfd *abfd);
. int (*bstat) (struct bfd *abfd, struct stat *sb);
-. {* Just like mmap: (void*)-1 on failure, mmapped address on success. *}
+. {* Mmap a part of the files. ADDR, LEN, PROT, FLAGS and OFFSET are the usual
+. mmap parameter, except that LEN and OFFSET do not need to be page
+. aligned. Returns (void *)-1 on failure, mmapped address on success.
+. Also write in MAP_ADDR the address of the page aligned buffer and in
+. MAP_LEN the size mapped (a page multiple). Use unmap with MAP_ADDR and
+. MAP_LEN to unmap. *}
. void *(*bmmap) (struct bfd *abfd, void *addr, bfd_size_type len,
-. int prot, int flags, file_ptr offset);
+. int prot, int flags, file_ptr offset,
+. void **map_addr, bfd_size_type *map_len);
.};
.extern const struct bfd_iovec _bfd_memory_iovec;
@@ -179,7 +184,8 @@
this element. */
if (abfd->arelt_data != NULL)
{
- size_t maxbytes = ((struct areltdata *) abfd->arelt_data)->parsed_size;
+ bfd_size_type maxbytes = arelt_size (abfd);
+
if (abfd->where + size > maxbytes)
{
if (abfd->where >= maxbytes)
@@ -227,10 +233,14 @@
if (abfd->iovec)
{
+ bfd *parent_bfd = abfd;
ptr = abfd->iovec->btell (abfd);
- if (abfd->my_archive)
- ptr -= abfd->origin;
+ while (parent_bfd->my_archive != NULL)
+ {
+ ptr -= parent_bfd->origin;
+ parent_bfd = parent_bfd->my_archive;
+ }
}
else
ptr = 0;
@@ -302,8 +312,16 @@
}
file_position = position;
- if (direction == SEEK_SET && abfd->my_archive != NULL)
- file_position += abfd->origin;
+ if (direction == SEEK_SET)
+ {
+ bfd *parent_bfd = abfd;
+
+ while (parent_bfd->my_archive != NULL)
+ {
+ file_position += parent_bfd->origin;
+ parent_bfd = parent_bfd->my_archive;
+ }
+ }
if (abfd->iovec)
result = abfd->iovec->bseek (abfd, file_position, direction);
@@ -423,23 +441,28 @@
SYNOPSIS
void *bfd_mmap (bfd *abfd, void *addr, bfd_size_type len,
- int prot, int flags, file_ptr offset);
+ int prot, int flags, file_ptr offset,
+ void **map_addr, bfd_size_type *map_len);
DESCRIPTION
Return mmap()ed region of the file, if possible and implemented.
+ LEN and OFFSET do not need to be page aligned. The page aligned
+ address and length are written to MAP_ADDR and MAP_LEN.
*/
void *
bfd_mmap (bfd *abfd, void *addr, bfd_size_type len,
- int prot, int flags, file_ptr offset)
+ int prot, int flags, file_ptr offset,
+ void **map_addr, bfd_size_type *map_len)
{
void *ret = (void *)-1;
if (abfd->iovec == NULL)
return ret;
- return abfd->iovec->bmmap (abfd, addr, len, prot, flags, offset);
+ return abfd->iovec->bmmap (abfd, addr, len, prot, flags, offset,
+ map_addr, map_len);
}
/* Memory file I/O operations. */
@@ -563,7 +586,7 @@
free (bim);
abfd->iostream = NULL;
- return TRUE;
+ return 0;
}
static int
@@ -586,7 +609,9 @@
static void *
memory_bmmap (bfd *abfd ATTRIBUTE_UNUSED, void *addr ATTRIBUTE_UNUSED,
bfd_size_type len ATTRIBUTE_UNUSED, int prot ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, file_ptr offset ATTRIBUTE_UNUSED)
+ int flags ATTRIBUTE_UNUSED, file_ptr offset ATTRIBUTE_UNUSED,
+ void **map_addr ATTRIBUTE_UNUSED,
+ bfd_size_type *map_len ATTRIBUTE_UNUSED)
{
return (void *)-1;
}
diff -r ef91d1d38009 -r e875d0fb359c external/gpl3/gdb/dist/bfd/coff-pmac.c
--- a/external/gpl3/gdb/dist/bfd/coff-pmac.c Thu Oct 03 18:24:28 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/* BFD back-end for Apple et al PowerPC Mac "XCOFF" files.
- Copyright 1995, 2000, 2001, 2005, 2007 Free Software Foundation, Inc.
-
- This file is part of BFD, the Binary File Descriptor library.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
- MA 02110-1301, USA. */
-
-/* Tweak coffcode.h based on this being a PowerMac instead of RS/6000. */
-
-#define POWERMAC
-
-#define TARGET_SYM pmac_xcoff_vec
-#define TARGET_NAME "xcoff-powermac"
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "coff/rs6000.h"
-#include "libcoff.h"
-#include "xcoff-target.h"
diff -r ef91d1d38009 -r e875d0fb359c external/gpl3/gdb/dist/bfd/config.bfd
--- a/external/gpl3/gdb/dist/bfd/config.bfd Thu Oct 03 18:24:28 2013 +0000
+++ b/external/gpl3/gdb/dist/bfd/config.bfd Thu Oct 03 18:30:43 2013 +0000
@@ -1,4 +1,21 @@
# config.bfd
+#
+# Copyright 2012, 2013 Free Software Foundation
+#
+# 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3. If not see
+# <http://www.gnu.org/licenses/>.
+#
# Convert a canonical host type into a BFD host type.
# Set shell variable targ to canonical target name, and run
# using ``. config.bfd''.
@@ -53,7 +70,6 @@
sparc-*-lynxos* | \
vax-*-vms* | \
arm-*-oabi | \
- thumb-*-oabi | \
a29k-* | \
hppa*-*-rtems* | \
*-go32-rtems* | \
@@ -70,6 +86,7 @@
targ_cpu=`echo $targ | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
case "${targ_cpu}" in
+aarch64*) targ_archs="bfd_aarch64_arch bfd_arm_arch";;
alpha*) targ_archs=bfd_alpha_arch ;;
am34*|am33_2.0*) targ_archs=bfd_mn10300_arch ;;
arm*) targ_archs=bfd_arm_arch ;;
@@ -87,12 +104,13 @@
i370) targ_archs=bfd_i370_arch ;;
lm32) targ_archs=bfd_lm32_arch ;;
m5200|m5407) targ_archs=bfd_m68k_arch ;;
-m6811*|m68hc11*) targ_archs="bfd_m68hc11_arch bfd_m68hc12_arch" ;;
-m6812*|m68hc12*) targ_archs="bfd_m68hc12_arch bfd_m68hc11_arch" ;;
+m6811*|m68hc11*) targ_archs="bfd_m68hc11_arch bfd_m68hc12_arch bfd_m9s12x_arch bfd_m9s12xg_arch" ;;
+m6812*|m68hc12*) targ_archs="bfd_m68hc12_arch bfd_m68hc11_arch bfd_m9s12x_arch bfd_m9s12xg_arch" ;;
m68*) targ_archs=bfd_m68k_arch ;;
m88*) targ_archs=bfd_m88k_arch ;;
microblaze*) targ_archs=bfd_microblaze_arch ;;
mips*) targ_archs=bfd_mips_arch ;;
+nios2*) targ_archs=bfd_nios2_arch ;;
or32*) targ_archs=bfd_or32_arch ;;
pdp11*) targ_archs=bfd_pdp11_arch ;;
pj*) targ_archs="bfd_pj_arch bfd_i386_arch";;
@@ -102,12 +120,12 @@
sh*) targ_archs=bfd_sh_arch ;;
sparc*) targ_archs=bfd_sparc_arch ;;
spu*) targ_archs=bfd_spu_arch ;;
-strongarm*) targ_archs=bfd_arm_arch ;;
-thumb*) targ_archs=bfd_arm_arch ;;
-v850*) targ_archs=bfd_v850_arch ;;
+tilegx*) targ_archs=bfd_tilegx_arch ;;
+tilepro*) targ_archs=bfd_tilepro_arch ;;
+v850*) targ_archs="bfd_v850_arch bfd_v850_rh850_arch" ;;
x86_64*) targ_archs=bfd_i386_arch ;;
-xscale*) targ_archs=bfd_arm_arch ;;
xtensa*) targ_archs=bfd_xtensa_arch ;;
+xgate) targ_archs=bfd_xgate_arch ;;
z80|r800) targ_archs=bfd_z80_arch ;;
z8k*) targ_archs=bfd_z8k_arch ;;
*) targ_archs=bfd_${targ_cpu}_arch ;;
@@ -145,6 +163,26 @@
# START OF targmatch.h
#ifdef BFD64
+ aarch64-*-elf)
+ targ_defvec=bfd_elf64_littleaarch64_vec
+ targ_selvecs="bfd_elf64_bigaarch64_vec bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+ want64=true
+ ;;
+ aarch64_be-*-elf)
+ targ_defvec=bfd_elf64_bigaarch64_vec
+ targ_selvecs="bfd_elf64_littleaarch64_vec bfd_elf32_bigarm_vec bfd_elf32_littlearm_vec"
+ want64=true
+ ;;
+ aarch64-*-linux*)
+ targ_defvec=bfd_elf64_littleaarch64_vec
+ targ_selvecs="bfd_elf64_bigaarch64_vec bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+ want64=true
+ ;;
+ aarch64_be-*-linux*)
+ targ_defvec=bfd_elf64_bigaarch64_vec
+ targ_selvecs="bfd_elf64_littleaarch64_vec bfd_elf32_bigarm_vec bfd_elf32_littlearm_vec"
+ want64=true
+ ;;
alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
targ_defvec=bfd_elf64_alpha_freebsd_vec
targ_selvecs="bfd_elf64_alpha_vec ecoffalpha_little_vec"
@@ -177,6 +215,7 @@
;;
alpha*-*-*vms*)
targ_defvec=vms_alpha_vec
+ targ_selvecs=vms_lib_txt_vec
want64=true
;;
alpha*-*-*)
@@ -195,6 +234,7 @@
;;
ia64*-*-*vms*)
targ_defvec=bfd_elf64_ia64_vms_vec
+ targ_selvecs=vms_lib_txt_vec
want64=true
;;
sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
@@ -217,6 +257,18 @@
targ_selvecs=bfd_elf32_bigarc_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_archs="$targ_archs bfd_i386_arch"
Home |
Main Index |
Thread Index |
Old Index