Date: Tue, 10 Jun 2014 11:39:29 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357297 - in head/devel/gdb: . files Message-ID: <201406101139.s5ABdTO2046067@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Jun 10 11:39:29 2014 New Revision: 357297 URL: http://svnweb.freebsd.org/changeset/ports/357297 QAT: https://qat.redports.org/buildarchive/r357297/ Log: - Update to version 7.7.1. - Fix a problem on FreeBSD 10+ with converters/libiconv installed. GDB could not print string variables then. PR: 190700 Submitted by: luca.pizzamiglio@gmail.com (maintainer) Added: head/devel/gdb/files/patch-bfd-elf32-nds32.c (contents, props changed) head/devel/gdb/files/patch-gdb-gdb_wchar.h (contents, props changed) Deleted: head/devel/gdb/files/patch-bfd-coffcode.h head/devel/gdb/files/patch-bfd-ecoff.c head/devel/gdb/files/patch-bfd-elf32-hppa.c head/devel/gdb/files/patch-bfd-elf32-m32r.c head/devel/gdb/files/patch-bfd-elf32-tic6x.c head/devel/gdb/files/patch-bfd-elf32-v850.c head/devel/gdb/files/patch-bfd-elfnn-ia64.c head/devel/gdb/files/patch-bfd-elfxx-mips.c head/devel/gdb/files/patch-bfd-elfxx-tilegx.c head/devel/gdb/files/patch-bfd-mach-o.c head/devel/gdb/files/patch-bfd-mmo.c head/devel/gdb/files/patch-bfd-opncls.c head/devel/gdb/files/patch-bfd-peicode.h head/devel/gdb/files/patch-bfd-vms-alpha.c head/devel/gdb/files/patch-bfd-xcofflink.c head/devel/gdb/files/patch-include-cgen-basic-ops.h head/devel/gdb/files/patch-opcodes-i386-dis.c head/devel/gdb/files/patch-opcodes-ia64-asmtab.c head/devel/gdb/files/patch-opcodes-rl78-dis.c head/devel/gdb/files/patch-opcodes-v850-dis.c Modified: head/devel/gdb/Makefile head/devel/gdb/distinfo head/devel/gdb/files/extrapatch-gdb-Makefile.in head/devel/gdb/files/fbsd-threads.c head/devel/gdb/files/patch-bfd-elf64-alpha.c head/devel/gdb/files/patch-gdb-amd64bsd-nat.c head/devel/gdb/pkg-plist Modified: head/devel/gdb/Makefile ============================================================================== --- head/devel/gdb/Makefile Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/Makefile Tue Jun 10 11:39:29 2014 (r357297) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gdb -PORTVERSION= 7.6.2 +PORTVERSION= 7.7.1 CATEGORIES= devel MASTER_SITES= GNU @@ -11,17 +11,16 @@ COMMENT= GNU GDB of newer version than c LICENSE= GPLv3 -USE_BZIP2= yes -USES= iconv gmake +USES= iconv gmake libtool tar:bzip2 USE_CSTD= gnu89 GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ + --enable-targets=all \ --with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \ --with-separate-debug-dir=/usr/lib/debug \ ${ICONV_CONFIGURE_ARG} \ - --without-libunwind-ia64 \ - --enable-targets=all + --without-libunwind-ia64 CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT -Wno-unused-function -Wno-unused-variable EXCLUDE= dejagnu expect sim texinfo intl @@ -56,8 +55,8 @@ EXPAT_CONFIGURE_OFF= --without-expat EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD} PYTHON_CONFIGURE_OFF= --without-python -PORT_READLINE_USES= readline:port PORT_READLINE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-gdb-tui-tui-io.c +PORT_READLINE_USES= readline:port TUI_CONFIGURE_ENABLE= tui .include <bsd.port.options.mk> @@ -90,7 +89,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \ ${STAGEDIR}${PREFIX}/bin/gdb${VER} - ${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 \ + ${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1 .if ${PORT_OPTIONS:MTUI} Modified: head/devel/gdb/distinfo ============================================================================== --- head/devel/gdb/distinfo Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/distinfo Tue Jun 10 11:39:29 2014 (r357297) @@ -1,2 +1,2 @@ -SHA256 (gdb-7.6.2.tar.bz2) = 2f6a0e2ce1c66c9dedeb7f58a8d1298ad602ddcdaf15d23104e1f7832b96d0e8 -SIZE (gdb-7.6.2.tar.bz2) = 24269334 +SHA256 (gdb-7.7.1.tar.bz2) = 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5 +SIZE (gdb-7.7.1.tar.bz2) = 24849503 Modified: head/devel/gdb/files/extrapatch-gdb-Makefile.in ============================================================================== --- head/devel/gdb/files/extrapatch-gdb-Makefile.in Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/files/extrapatch-gdb-Makefile.in Tue Jun 10 11:39:29 2014 (r357297) @@ -1,16 +1,5 @@ --- gdb/Makefile.in.orig 2013-04-02 19:38:43.000000000 +0200 +++ gdb/Makefile.in 2013-05-18 13:08:47.000000000 +0200 -@@ -566,8 +566,8 @@ - moxie-tdep.o \ - mt-tdep.o \ - nto-tdep.o \ -- ppc-linux-tdep.o ppcnbsd-tdep.o ppcobsd-tdep.o ppc-sysv-tdep.o \ -- ppc64-tdep.o rl78-tdep.o \ -+ ppc-linux-tdep.o ppcfbsd-tdep.o ppcnbsd-tdep.o ppcobsd-tdep.o \ -+ ppc-sysv-tdep.o ppc64-tdep.o rl78-tdep.o \ - rs6000-aix-tdep.o rs6000-tdep.o ppc-ravenscar-thread.o \ - rs6000-lynx178-tdep.o \ - rx-tdep.o \ @@ -585,6 +585,7 @@ xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \ glibc-tdep.o \ Modified: head/devel/gdb/files/fbsd-threads.c ============================================================================== --- head/devel/gdb/files/fbsd-threads.c Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/files/fbsd-threads.c Tue Jun 10 11:39:29 2014 (r357297) @@ -155,7 +155,7 @@ static void fbsd_thread_find_new_threads static int fbsd_thread_alive (struct target_ops *ops, ptid_t ptid); static void attach_thread (ptid_t ptid, const td_thrhandle_t *th_p, const td_thrinfo_t *ti_p, int verbose); -static void fbsd_thread_detach (struct target_ops *ops, char *args, +static void fbsd_thread_detach (struct target_ops *ops, const char *args, int from_tty); CORE_ADDR fbsd_thread_get_local_address(struct target_ops *ops, @@ -315,7 +315,7 @@ get_current_lwp (int pid) } static void -get_current_thread () +get_current_thread (void) { td_thrhandle_t th; td_thrinfo_t ti; @@ -523,7 +523,7 @@ fbsd_thread_new_objfile (struct objfile } static void -fbsd_thread_detach (struct target_ops *ops, char *args, int from_tty) +fbsd_thread_detach (struct target_ops *ops, const char *args, int from_tty) { struct target_ops *beneath = find_target_beneath (ops); @@ -1289,14 +1289,14 @@ fbsd_thread_get_local_address(struct tar static int tsd_cb (thread_key_t key, void (*destructor)(void *), void *ignore) { - struct minimal_symbol *ms; + struct bound_minimal_symbol bms; const char *name; - ms = lookup_minimal_symbol_by_pc (extract_func_ptr (&destructor)); - if (!ms) + bms = lookup_minimal_symbol_by_pc (extract_func_ptr (&destructor)); + if (!bms.minsym) name = "???"; else - name = SYMBOL_PRINT_NAME (ms); + name = SYMBOL_PRINT_NAME (bms.minsym); printf_filtered ("Key %d, destructor %p <%s>\n", key, destructor, name); return 0; Added: head/devel/gdb/files/patch-bfd-elf32-nds32.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-nds32.c Tue Jun 10 11:39:29 2014 (r357297) @@ -0,0 +1,20 @@ +--- bfd/elf32-nds32.c.orig 2014-02-07 13:04:20.389741513 +0100 ++++ bfd/elf32-nds32.c 2014-02-07 13:06:47.079732839 +0100 +@@ -6303,7 +6303,7 @@ + int *pinsn_type) + { + uint16_t insn16 = 0; +- int insn_type; ++ int insn_type = 0; + unsigned long mach = bfd_get_mach (abfd); + + if (N32_SH5 (insn) != 0) +@@ -6518,7 +6518,7 @@ + { + int op6; + uint16_t insn16 = 0; +- int insn_type; ++ int insn_type = 0; + unsigned long mach = bfd_get_mach (abfd); + + /* Decode 32-bit instruction. */ Modified: head/devel/gdb/files/patch-bfd-elf64-alpha.c ============================================================================== --- head/devel/gdb/files/patch-bfd-elf64-alpha.c Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/files/patch-bfd-elf64-alpha.c Tue Jun 10 11:39:29 2014 (r357297) @@ -1,10 +1,10 @@ --- bfd/elf64-alpha.c.orig 2013-03-11 10:52:58.000000000 +0100 +++ bfd/elf64-alpha.c 2013-03-11 11:50:24.000000000 +0100 @@ -3585,9 +3585,9 @@ - use_gottprel = FALSE; - new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : STN_UNDEF; -- switch (!dynamic && !info->link_info->shared) + /* Some compilers warn about a Boolean-looking expression being + used in a switch. The explicit cast silences them. */ +- switch ((int) (!dynamic && !info->link_info->shared)) - { - case 1: + { Modified: head/devel/gdb/files/patch-gdb-amd64bsd-nat.c ============================================================================== --- head/devel/gdb/files/patch-gdb-amd64bsd-nat.c Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/files/patch-gdb-amd64bsd-nat.c Tue Jun 10 11:39:29 2014 (r357297) @@ -17,11 +17,11 @@ + memset( ®s, 0, sizeof(struct reg)); + memset( &oldregs, 0, sizeof(struct reg)); - if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); -+ ptrace (PT_GETREGS, PIDGET (inferior_ptid), ++ ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), + (PTRACE_TYPE_ARG3) &oldregs, 0); amd64_collect_native_gregset (regcache, ®s, regnum); @@ -31,6 +31,6 @@ + regs.r_rflags ^= (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE; + //printf(" allowed regs.r_rflags = 0x%8.8X\n", regs.r_rflags ); + } - if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't write registers")); Added: head/devel/gdb/files/patch-gdb-gdb_wchar.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-gdb-gdb_wchar.h Tue Jun 10 11:39:29 2014 (r357297) @@ -0,0 +1,20 @@ +--- gdb/gdb_wchar.h.orig 2014-06-05 10:44:18.914279516 +0200 ++++ gdb/gdb_wchar.h 2014-06-05 10:46:07.264279306 +0200 +@@ -56,7 +56,7 @@ + iconvlist. */ + #if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) \ + && (defined (__STDC_ISO_10646__) \ +- || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) ++ || (!defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) + + #include <wchar.h> + #include <wctype.h> +@@ -82,7 +82,7 @@ + #define INTERMEDIATE_ENCODING intermediate_encoding () + const char *intermediate_encoding (void); + +-#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 ++#elif !defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108 + #define INTERMEDIATE_ENCODING "wchar_t" + #else + /* This shouldn't happen, because the earlier #if should have filtered Modified: head/devel/gdb/pkg-plist ============================================================================== --- head/devel/gdb/pkg-plist Tue Jun 10 11:35:27 2014 (r357296) +++ head/devel/gdb/pkg-plist Tue Jun 10 11:39:29 2014 (r357297) @@ -3,13 +3,18 @@ bin/gdb%%VER%% %%TUI%%bin/gdbtui%%VER%% man/man1/gdb%%VER%%.1.gz %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/__init__.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/types.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/FrameDecorator.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/FrameIterator.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/frames.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printing.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/prompt.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/types.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/__init__.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/bound_registers.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py +%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/frame_filters.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/pretty_printers.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/prompt.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/type_printers.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/__init__.py %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/strfns.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406101139.s5ABdTO2046067>