From 0c3d3a6fe7b623c4cf18a981f713cbac4174ee80 Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 12 Jul 2011 20:42:26 +0200 Subject: [PATCH] gdb: Adjust makefiles for gdb 7.3 --- contrib/gdb-7/README.DELETED | 61 ++++++++++++++++-------------- contrib/gdb-7/README.DRAGONFLY | 12 +++--- gnu/usr.bin/gdb/Makefile.inc | 2 - gnu/usr.bin/gdb/gdb/ada-lex.c | 2 +- gnu/usr.bin/gdb/kgdb/trgt.c | 2 +- gnu/usr.bin/gdb/kgdb/trgt_i386.c | 18 +++++++++ gnu/usr.bin/gdb/kgdb/trgt_x86_64.c | 9 +++++ gnu/usr.bin/gdb/libbfd/config.h | 13 ++++++- gnu/usr.bin/gdb/libgdb/Makefile | 7 ++-- gnu/usr.bin/gdb/libgdb/config.h | 12 +++--- gnu/usr.bin/gdb/libiberty/config.h | 31 +++++++++++---- 11 files changed, 110 insertions(+), 59 deletions(-) diff --git a/contrib/gdb-7/README.DELETED b/contrib/gdb-7/README.DELETED index 0e86ba7b05..f9ded5151e 100644 --- a/contrib/gdb-7/README.DELETED +++ b/contrib/gdb-7/README.DELETED @@ -4,6 +4,7 @@ Makefile.def Makefile.in Makefile.tpl README-maintainer-mode +bfd/.gitignore bfd/ChangeLog bfd/ChangeLog-0001 bfd/ChangeLog-0203 @@ -13,6 +14,7 @@ bfd/ChangeLog-2006 bfd/ChangeLog-2007 bfd/ChangeLog-2008 bfd/ChangeLog-2009 +bfd/ChangeLog-2010 bfd/ChangeLog-9193 bfd/ChangeLog-9495 bfd/ChangeLog-9697 @@ -208,6 +210,7 @@ bfd/elf32-or32.c bfd/elf32-pj.c bfd/elf32-ppc.c bfd/elf32-ppc.h +bfd/elf32-rx.c bfd/elf32-s390.c bfd/elf32-score.c bfd/elf32-score.h @@ -221,7 +224,6 @@ bfd/elf32-sh64.h bfd/elf32-sparc.c bfd/elf32-spu.c bfd/elf32-spu.h -bfd/elf32-rx.c bfd/elf32-tic6x.c bfd/elf32-tic6x.h bfd/elf32-v850.c @@ -366,16 +368,19 @@ bfd/xsym.h bfd/xtensa-isa.c bfd/xtensa-modules.c compile -config/ config-ml.in config.guess config.rpath config.sub +config/ configure configure.ac +cgen/ +cpu/ depcomp djunpack.bat etc/ +gdb/.gitignore gdb/CONTRIBUTE gdb/ChangeLog gdb/ChangeLog-1990 @@ -398,6 +403,7 @@ gdb/ChangeLog-2006 gdb/ChangeLog-2007 gdb/ChangeLog-2008 gdb/ChangeLog-2009 +gdb/ChangeLog-2010 gdb/ChangeLog-3.x gdb/MAINTAINERS gdb/Makefile.in @@ -447,6 +453,9 @@ gdb/armnbsd-nat.c gdb/armnbsd-tdep.c gdb/armobsd-tdep.c gdb/avr-tdep.c +gdb/bfin-linux-tdep.c +gdb/bfin-tdep.c +gdb/bfin-tdep.h gdb/c-exp.c gdb/config/alpha/ gdb/config/arm/ @@ -502,9 +511,8 @@ gdb/dicos-tdep.c gdb/dicos-tdep.h gdb/dink32-rom.c gdb/doc/ChangeLog +gdb/doc/Makefile.in gdb/doc/annotate.info -gdb/doc/configure -gdb/doc/configure.ac gdb/doc/gdb.info gdb/doc/gdb.info-1 gdb/doc/gdb.info-2 @@ -515,9 +523,6 @@ gdb/doc/gdb.info-6 gdb/doc/gdbint.info gdb/doc/gdbint.info-1 gdb/doc/gdbint.info-2 -gdb/doc/LRS -gdb/doc/Makefile.in -gdb/doc/a4rc.sed gdb/doc/lpsrc.sed gdb/doc/psrc.sed gdb/doc/refcard.tex @@ -532,10 +537,13 @@ gdb/f-exp.c gdb/features/Makefile gdb/features/arm-core.xml gdb/features/arm-fpa.xml +gdb/features/arm-m-profile.xml gdb/features/arm-vfpv2.xml gdb/features/arm-vfpv3.xml gdb/features/arm-with-iwmmxt.c gdb/features/arm-with-iwmmxt.xml +gdb/features/arm-with-m.c +gdb/features/arm-with-m.xml gdb/features/arm-with-neon.c gdb/features/arm-with-neon.xml gdb/features/arm-with-vfpv2.c @@ -602,7 +610,6 @@ gdb/hppabsd-tdep.h gdb/hppanbsd-nat.c gdb/hppanbsd-tdep.c gdb/hppaobsd-tdep.c -gdb/hpux-thread.c gdb/i386-cygwin-tdep.c gdb/i386-darwin-nat.c gdb/i386-darwin-tdep.c @@ -624,6 +631,9 @@ gdb/i386nbsd-tdep.c gdb/i386obsd-nat.c gdb/i386obsd-tdep.c gdb/i386v4-nat.c +gdb/ia64-hpux-nat.c +gdb/ia64-hpux-tdep.c +gdb/ia64-hpux-tdep.h gdb/ia64-linux-nat.c gdb/ia64-linux-tdep.c gdb/ia64-tdep.c @@ -728,23 +738,6 @@ gdb/proc-why.c gdb/process_reply.defs gdb/procfs.c gdb/procfs.h -gdb/python/py-block.c -gdb/python/py-breakpoint.c -gdb/python/py-cmd.c -gdb/python/py-frame.c -gdb/python/py-function.c -gdb/python/py-inferior.c -gdb/python/py-infthread.c -gdb/python/py-lazy-string.c -gdb/python/py-objfile.c -gdb/python/py-param.c -gdb/python/py-progspace.c -gdb/python/py-symbol.c -gdb/python/py-symtab.c -gdb/python/py-type.c -gdb/python/py-utils.c -gdb/python/python-config.py -gdb/python/python-internal.h gdb/regformats/arm-with-iwmmxt.dat gdb/regformats/arm-with-neon.dat gdb/regformats/arm-with-vfpv2.dat @@ -795,6 +788,8 @@ gdb/sol2-tdep.h gdb/solib-darwin.c gdb/solib-darwin.h gdb/solib-frv.c +gdb/solib-ia64-hpux.c +gdb/solib-ia64-hpux.h gdb/solib-irix.c gdb/solib-irix.h gdb/solib-osf.c @@ -805,6 +800,8 @@ gdb/solib-som.h gdb/solib-spu.c gdb/solib-spu.h gdb/solib-sunos.c +gdb/solib-target.c +gdb/solib-target.h gdb/somread.c gdb/sparc-linux-nat.c gdb/sparc-linux-tdep.c @@ -837,7 +834,11 @@ gdb/srec.h gdb/stamp-h1 gdb/symfile-mem.c gdb/syscalls/amd64-linux.xml +gdb/syscalls/bfin-linux.xml gdb/syscalls/i386-linux.xml +gdb/syscalls/mips-n32-linux.xml +gdb/syscalls/mips-n64-linux.xml +gdb/syscalls/mips-o32-linux.xml gdb/syscalls/ppc-linux.xml gdb/syscalls/ppc64-linux.xml gdb/syscalls/sparc-linux.xml @@ -1036,8 +1037,8 @@ include/opcode/pj.h include/opcode/pn.h include/opcode/ppc.h include/opcode/pyr.h -include/opcode/s390.h include/opcode/rx.h +include/opcode/s390.h include/opcode/score-datadep.h include/opcode/score-inst.h include/opcode/sparc.h @@ -1061,12 +1062,13 @@ include/progress.h include/sha1.h include/som/ include/sort.h +include/vms/ include/xtensa-config.h include/xtensa-isa-internal.h include/xtensa-isa.h -include/vms/ install-sh intl/ +libdecnumber/.gitignore libdecnumber/ChangeLog libdecnumber/Makefile.in libdecnumber/aclocal.m4 @@ -1093,6 +1095,7 @@ libdecnumber/decRound.h libdecnumber/decSingle.c libdecnumber/decSingle.h libdecnumber/decSingleSymbols.h +libiberty/.gitignore libiberty/ChangeLog libiberty/Makefile.in libiberty/_doprnt.c @@ -1109,9 +1112,9 @@ libiberty/bzero.c libiberty/calloc.c libiberty/choose-temp.c libiberty/clock.c -libiberty/config/ libiberty/config.h-vms libiberty/config.in +libiberty/config/ libiberty/configure libiberty/configure.ac libiberty/configure.com @@ -1203,6 +1206,7 @@ missing mkdep mkinstalldirs move-if-change +opcodes/.gitignore opcodes/ChangeLog opcodes/ChangeLog-0001 opcodes/ChangeLog-0203 @@ -1212,6 +1216,7 @@ opcodes/ChangeLog-2006 opcodes/ChangeLog-2007 opcodes/ChangeLog-2008 opcodes/ChangeLog-2009 +opcodes/ChangeLog-2010 opcodes/ChangeLog-9297 opcodes/ChangeLog-9899 opcodes/MAINTAINERS diff --git a/contrib/gdb-7/README.DRAGONFLY b/contrib/gdb-7/README.DRAGONFLY index e76c9ee6ea..0e56b0d958 100644 --- a/contrib/gdb-7/README.DRAGONFLY +++ b/contrib/gdb-7/README.DRAGONFLY @@ -1,13 +1,13 @@ -GNU GDB 7.2 +GNU GDB 7.3 =========== Original source can be downloaded from: http://ftp.gnu.org/gnu/gdb -file = gdb-7.2.tar.bz2 -date = 3 Sep 2010 -size = 18530613 -sha1 = cae138dee0c11778c471a1d5e4b09e0ae08f9e9d +file = gdb-7.3a.tar.bz2 +date = 24 August 2011 +size = 19503041 +sha1 = d68061206a3485bab32da3fb751c6c3b913c2b9c A list of files and directories removed is in README.DELETED @@ -18,7 +18,6 @@ The following files were added: gdb/i386dfly-tdep.c Local modifications applied to following files: - bfd/config.bfd (remove for gdb 7.3) gdb/amd64-tdep.h gdb/charset.c gdb/configure.host @@ -34,4 +33,3 @@ Local modifications applied to following files: gdb/tui-io.c include/elf/common.h include/libiberty.h - \ No newline at end of file diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc index 5b8c449dd0..055232b6d0 100644 --- a/gnu/usr.bin/gdb/Makefile.inc +++ b/gnu/usr.bin/gdb/Makefile.inc @@ -1,5 +1,3 @@ -#CSTD?= gnu89 - BASEDIR= ${.CURDIR}/${RELATIVE}../../../../contrib/gdb-7 GDBLIBS+= ${.OBJDIR}/../libopcodes/libopcodes.a diff --git a/gnu/usr.bin/gdb/gdb/ada-lex.c b/gnu/usr.bin/gdb/gdb/ada-lex.c index dc76ff27b3..aea4684c50 100644 --- a/gnu/usr.bin/gdb/gdb/ada-lex.c +++ b/gnu/usr.bin/gdb/gdb/ada-lex.c @@ -609,7 +609,7 @@ char *yytext; #define INITIAL 0 /* FLEX lexer for Ada expressions, for GDB. Copyright (C) 1994, 1997, 1998, 2000, 2001, 2002, 2003, 2007, 2008, 2009, - 2010 Free Software Foundation, Inc. + 2010, 2011 Free Software Foundation, Inc. This file is part of GDB. diff --git a/gnu/usr.bin/gdb/kgdb/trgt.c b/gnu/usr.bin/gdb/kgdb/trgt.c index 21429bc7be..4458833ea3 100644 --- a/gnu/usr.bin/gdb/kgdb/trgt.c +++ b/gnu/usr.bin/gdb/kgdb/trgt.c @@ -326,7 +326,7 @@ initialize_kgdb_target(void) kgdb_trgt_ops.to_longname = "kernel core dump file"; kgdb_trgt_ops.to_doc = "Use a vmcore file as a target. Specify the filename of the vmcore file."; - kgdb_trgt_ops.to_stratum = core_stratum; + kgdb_trgt_ops.to_stratum = process_stratum; kgdb_trgt_ops.to_has_registers = default_child_has_registers; kgdb_trgt_ops.to_has_memory = default_child_has_memory; kgdb_trgt_ops.to_has_stack = default_child_has_stack; diff --git a/gnu/usr.bin/gdb/kgdb/trgt_i386.c b/gnu/usr.bin/gdb/kgdb/trgt_i386.c index 8932266f93..91791b9c92 100644 --- a/gnu/usr.bin/gdb/kgdb/trgt_i386.c +++ b/gnu/usr.bin/gdb/kgdb/trgt_i386.c @@ -223,8 +223,17 @@ kgdb_trgt_dblfault_prev_register(struct frame_info *next_frame, return frame_unwind_got_memory(next_frame, regnum, addrp); } +static enum unwind_stop_reason +kgdb_trgt_dblfault_unwind_reason(struct frame_info *next_frame, + void **this_cache) +{ + /* XXX marino : populate logic to determine unwind stoppage */ + return UNWIND_NO_REASON; +} + static const struct frame_unwind kgdb_trgt_dblfault_unwind = { NORMAL_FRAME, + &kgdb_trgt_dblfault_unwind_reason, &kgdb_trgt_dblfault_this_id, &kgdb_trgt_dblfault_prev_register, .sniffer = kgdb_trgt_trapframe_sniffer @@ -359,8 +368,17 @@ kgdb_trgt_trapframe_prev_register(struct frame_info *next_frame, return frame_unwind_got_memory(next_frame, regnum, addrp); } +static enum unwind_stop_reason +kgdb_trgt_trapframe_unwind_reason(struct frame_info *next_frame, + void **this_cache) +{ + /* XXX marino : populate logic to determine unwind stoppage */ + return UNWIND_NO_REASON; +} + const struct frame_unwind kgdb_trgt_trapframe_unwind = { NORMAL_FRAME, + &kgdb_trgt_trapframe_unwind_reason, &kgdb_trgt_trapframe_this_id, &kgdb_trgt_trapframe_prev_register, .sniffer = kgdb_trgt_trapframe_sniffer diff --git a/gnu/usr.bin/gdb/kgdb/trgt_x86_64.c b/gnu/usr.bin/gdb/kgdb/trgt_x86_64.c index 44a073f761..8681e3ba5e 100644 --- a/gnu/usr.bin/gdb/kgdb/trgt_x86_64.c +++ b/gnu/usr.bin/gdb/kgdb/trgt_x86_64.c @@ -228,8 +228,17 @@ kgdb_trgt_trapframe_prev_register(struct frame_info *next_frame, return frame_unwind_got_memory(next_frame, regnum, addrp); } +static enum unwind_stop_reason +kgdb_trgt_trapframe_unwind_reason(struct frame_info *next_frame, + void **this_cache) +{ + /* XXX marino : populate logic to determine unwind stoppage */ + return UNWIND_NO_REASON; +} + const struct frame_unwind kgdb_trgt_trapframe_unwind = { NORMAL_FRAME, + &kgdb_trgt_trapframe_unwind_reason, &kgdb_trgt_trapframe_this_id, &kgdb_trgt_trapframe_prev_register, .sniffer = kgdb_trgt_trapframe_sniffer diff --git a/gnu/usr.bin/gdb/libbfd/config.h b/gnu/usr.bin/gdb/libbfd/config.h index 40ef46a9b3..016ac1c28f 100644 --- a/gnu/usr.bin/gdb/libbfd/config.h +++ b/gnu/usr.bin/gdb/libbfd/config.h @@ -1,6 +1,9 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.in by autoheader. */ +/* Name of host specific core header file to include in elf.c. */ +/* #undef CORE_HEADER */ + /* Define to 1 if translation of program messages to the user's native language is requested. */ /* #undef ENABLE_NLS */ @@ -115,6 +118,9 @@ /* Define if has lwpstatus_t.pr_context. */ /* #undef HAVE_LWPSTATUS_T_PR_CONTEXT */ +/* Define if has lwpstatus_t.pr_fpreg. */ +/* #undef HAVE_LWPSTATUS_T_PR_FPREG */ + /* Define if has lwpstatus_t.pr_reg. */ /* #undef HAVE_LWPSTATUS_T_PR_REG */ @@ -299,11 +305,14 @@ #define TIME_WITH_SYS_TIME 1 /* Name of host specific header file to include in trad-core.c. */ -#define TRAD_HEADER "hosts/i386bsd.h" +/* #undef TRAD_HEADER */ /* Use b modifier when opening binary files? */ /* #undef USE_BINARY_FOPEN */ +/* Define if we should use leading underscore on 64 bit mingw targets */ +/* #undef USE_MINGW64_LEADING_UNDERSCORES */ + /* Use mmap if it's available? */ /* #undef USE_MMAP */ @@ -336,7 +345,7 @@ /* Version number of package */ -#define VERSION "2.20.51" +#define VERSION "2.21.51" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile index 0011488141..f6dbae983e 100644 --- a/gnu/usr.bin/gdb/libgdb/Makefile +++ b/gnu/usr.bin/gdb/libgdb/Makefile @@ -66,8 +66,7 @@ SRCS+= \ ui-out.c cli-out.c \ varobj.c vec.c wrapper.c \ jv-lang.c jv-valprint.c jv-typeprint.c \ - m2-lang.c p-lang.c p-typeprint.c p-valprint.c \ - scm-exp.c scm-lang.c scm-valprint.c \ + m2-lang.c opencl-lang.c p-lang.c p-typeprint.c p-valprint.c \ sentinel-frame.c \ complaints.c typeprint.c \ ada-typeprint.c c-typeprint.c f-typeprint.c m2-typeprint.c \ @@ -85,7 +84,7 @@ SRCS+= \ trad-frame.c \ tramp-frame.c \ solib.c solib-target.c \ - prologue-value.c memory-map.c xml-support.c xml-syscall.c \ + prologue-value.c memory-map.c memrange.c xml-support.c xml-syscall.c \ target-descriptions.c target-memory.c xml-tdesc.c xml-builtin.c \ inferior.c osdata.c gdb_usleep.c record.c gcore.c \ jit.c progspace.c @@ -103,7 +102,7 @@ SRCS+= remote.c dcache.c tracepoint.c ax-general.c ax-gdb.c remote-fileio.c SRCS+= cli-dump.c \ cli-decode.c cli-script.c cli-cmds.c cli-setshow.c \ cli-logging.c \ - cli-interp.c + cli-interp.c cli-utils.c # SUBDIR_MI_OBS SRCS+= mi-out.c mi-console.c \ diff --git a/gnu/usr.bin/gdb/libgdb/config.h b/gnu/usr.bin/gdb/libgdb/config.h index 2ee75d254b..2d102f98af 100644 --- a/gnu/usr.bin/gdb/libgdb/config.h +++ b/gnu/usr.bin/gdb/libgdb/config.h @@ -45,7 +45,7 @@ /* #define DEFAULT_BFD_ARCH bfd_i386_arch */ /* Define to BFD's default target vector. */ -/* #define DEFAULT_BFD_VEC bfd_elf32_i386_freebsd_vec */ +/* #define DEFAULT_BFD_VEC bfd_elf64_x86_64_vec */ /* Define to 1 if translation of program messages to the user's native language is requested. */ @@ -62,13 +62,13 @@ #define GDB_DEFAULT_HOST_CHARSET "UTF-8" /* Host double floatformat */ -#define GDB_HOST_DOUBLE_FORMAT &floatformat_ieee_double_little +#define GDB_HOST_DOUBLE_FORMAT 0 /* Host float floatformat */ -#define GDB_HOST_FLOAT_FORMAT &floatformat_ieee_single_little +#define GDB_HOST_FLOAT_FORMAT 0 /* Host long double floatformat */ -#define GDB_HOST_LONG_DOUBLE_FORMAT &floatformat_i387_ext +#define GDB_HOST_LONG_DOUBLE_FORMAT 0 /* nativefile */ /* #undef GDB_NM_FILE */ @@ -550,10 +550,10 @@ #define HAVE_STRUCT_REG 1 /* Define to 1 if `struct reg' is a member of `r_fs'. */ -#define HAVE_STRUCT_REG_R_FS 1 +/* #undef HAVE_STRUCT_REG_R_FS */ /* Define to 1 if `struct reg' is a member of `r_gs'. */ -#define HAVE_STRUCT_REG_R_GS 1 +/* #undef HAVE_STRUCT_REG_R_GS */ /* Define if exists and defines a struct so_map which has members with an ``som_'' prefix. (Found on older *BSD systems.) */ diff --git a/gnu/usr.bin/gdb/libiberty/config.h b/gnu/usr.bin/gdb/libiberty/config.h index 53dc1358a1..32b548da1a 100644 --- a/gnu/usr.bin/gdb/libiberty/config.h +++ b/gnu/usr.bin/gdb/libiberty/config.h @@ -45,8 +45,8 @@ don't. */ #define HAVE_DECL_ASPRINTF 1 -/* Define to 1 if you have the declaration of `basename', and to 0 if you - don't. */ +/* Define to 1 if you have the declaration of `basename(char *)', and to 0 if + you don't. */ #define HAVE_DECL_BASENAME 0 /* Define to 1 if you have the declaration of `calloc', and to 0 if you don't. @@ -92,6 +92,9 @@ don't. */ #define HAVE_DECL_VSNPRINTF 1 +/* Define to 1 if you have the `dup3' function. */ +/* #undef HAVE_DUP3 */ + /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -155,9 +158,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the `mempcpy' function. */ -/* #undef HAVE_MEMPCPY */ - /* Define to 1 if you have the `memset' function. */ #define HAVE_MEMSET 1 @@ -170,6 +170,9 @@ /* Define to 1 if you have the `on_exit' function. */ /* #undef HAVE_ON_EXIT */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PROCESS_H */ + /* Define to 1 if you have the `psignal' function. */ #define HAVE_PSIGNAL 1 @@ -200,12 +203,21 @@ /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 +/* Define to 1 if you have the `setproctitle' function. */ +#define HAVE_SETPROCTITLE 1 + /* Define to 1 if you have the `sigsetmask' function. */ #define HAVE_SIGSETMASK 1 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `spawnve' function. */ +/* #undef HAVE_SPAWNVE */ + +/* Define to 1 if you have the `spawnvpe' function. */ +/* #undef HAVE_SPAWNVPE */ + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -290,6 +302,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PRCTL_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_PSTAT_H */ @@ -359,9 +374,6 @@ /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - /* Define to 1 if you have the `vsprintf' function. */ #define HAVE_VSPRINTF 1 @@ -468,6 +480,9 @@ /* Define to `int' if does not define. */ /* #undef pid_t */ +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ /* #undef uintptr_t */ -- 2.41.0