Update to: * add an option to disable the Text User Interface * fix a small configuration issue (thanks to Andreas Tobler) Fix: Patch attached with submission follows:
State Changed From-To: open->feedback This patch introduces regression of failing to build with clang, please see log: http://people.freebsd.org/~pawel/buildlogs/gdb-7.5.1.log
This new patch provides the new features (TUI disabled and all targets enabled) and it's tested with clang. Thanks for the support Best regards, Luca
Sorry for the mess, this patch is still incomplete, it doesn't solve all problems on 64-bit architecture. I'm still working on it. best regards, Luca
Hi, at the end, this is the final patch. It works with gcc and clang, on i386 and amd64 architectures. I prefer remove all warning than turn off -Werror flag. Cheers, Luca
The patch!
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
Author: pawel Date: Wed Mar 13 16:15:49 2013 New Revision: 314093 URL: http://svnweb.freebsd.org/changeset/ports/314093 Log: - Add option to disable TUI - Correct enabling of all targets, add patches to fix new clang build issues raised by this change - Fix WWW: line PR: ports/176103 Submitted by: Luca Pizzamiglio <luca.pizzamiglio@gmail.com> (maintainer) Added: head/devel/gdb/files/patch-bfd-ecoff.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf32-hppa.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf32-m32r.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf32-microblaze.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf32-tic6x.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf32-v850.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf32-xtensa.c (contents, props changed) head/devel/gdb/files/patch-bfd-elf64-alpha.c (contents, props changed) head/devel/gdb/files/patch-bfd-elfnn-ia64.c (contents, props changed) head/devel/gdb/files/patch-bfd-elfxx-mips.c (contents, props changed) head/devel/gdb/files/patch-bfd-elfxx-tilegx.c (contents, props changed) head/devel/gdb/files/patch-bfd-mach-o.c (contents, props changed) head/devel/gdb/files/patch-bfd-mmo.c (contents, props changed) head/devel/gdb/files/patch-bfd-vms-alpha.c (contents, props changed) head/devel/gdb/files/patch-bfd-xcofflink.c (contents, props changed) head/devel/gdb/files/patch-include-cgen-basic-ops.h (contents, props changed) head/devel/gdb/files/patch-opcodes-cr16-opc.c (contents, props changed) head/devel/gdb/files/patch-opcodes-crx-opc.c (contents, props changed) head/devel/gdb/files/patch-opcodes-ia64-asmtab.c (contents, props changed) head/devel/gdb/files/patch-opcodes-tic54x-dis.c (contents, props changed) Modified: head/devel/gdb/Makefile head/devel/gdb/files/extrapatch-gdb-Makefile.in head/devel/gdb/files/patch-opcodes-i386-dis.c head/devel/gdb/pkg-descr (contents, props changed) head/devel/gdb/pkg-plist (contents, props changed) Modified: head/devel/gdb/Makefile ============================================================================== --- head/devel/gdb/Makefile Wed Mar 13 15:40:34 2013 (r314092) +++ head/devel/gdb/Makefile Wed Mar 13 16:15:49 2013 (r314093) @@ -3,6 +3,7 @@ PORTNAME= gdb PORTVERSION= 7.5.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNU @@ -20,8 +21,7 @@ CONFIGURE_ARGS= --program-suffix=${PORTV --with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \ --with-libiconv-prefix=${LOCALBASE} \ --without-libunwind-ia64 \ - --enable-target=all \ - --enable-tui + --enable-targets=all CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT EXCLUDE= dejagnu expect sim texinfo intl @@ -33,14 +33,15 @@ MAN1= gdb${VER}.1 ONLY_FOR_ARCHS= i386 amd64 # untested elsewhere, might work -OPTIONS_DEFINE= DEBUG EXPAT PYTHON THREADS GDB_LINK +OPTIONS_DEFINE= DEBUG EXPAT PYTHON THREADS TUI GDB_LINK OPTIONS_SINGLE_READLINE= BASE_READLINE BUNDLED_READLINE PORT_READLINE OPTIONS_SINGLE= READLINE -BASE_READLINE_DESC= from base system (EXPERIMENTAL) +BASE_READLINE_DESC= from base system(EXPERIMENTAL) BUNDLED_READLINE_DESC= from gdb distfile PORT_READLINE_DESC= from devel/readline port GDB_LINK_DESC= Create the gdb link -OPTIONS_DEFAULT= THREADS GDB_LINK PORT_READLINE +TUI_DESC= Text User Interface enabled +OPTIONS_DEFAULT= THREADS TUI GDB_LINK PORT_READLINE .include <bsd.port.options.mk> @@ -50,8 +51,12 @@ PLIST_SUB+= GDB_LINK="" PLIST_SUB+= GDB_LINK="@comment " .endif -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= 2.5-2.7 +.if ${PORT_OPTIONS:MTUI} +CONFIGURE_ARGS+= --enable-tui +PLIST_SUB+= TUI_LINK="" +.else +CONFIGURE_ARGS+= --disable-tui +PLIST_SUB+= TUI_LINK="@comment " .endif .if empty(PORT_OPTIONS:MBUNDLED_READLINE) @@ -67,6 +72,16 @@ USE_READLINE= base .if ${PORT_OPTIONS:MPORT_READLINE} USE_READLINE= port .endif + +.if ${PORT_OPTIONS:MPYTHON} +USE_PYTHON= 2.5-2.7 +CONFIGURE_ARGS+= --with-python=${PYTHON_CMD} +PLIST_SUB+= PYTHON="" +.else +CONFIGURE_ARGS+= --without-python +PLIST_SUB+= PYTHON="@comment " +.endif + .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MTHREADS} @@ -84,14 +99,6 @@ CONFIGURE_ARGS+= --with-expat=yes CONFIGURE_ARGS+= --without-expat .endif -.if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+= --with-python=${PYTHON_CMD} -PLIST_SUB+= PYTHON="" -.else -CONFIGURE_ARGS+= --without-python -PLIST_SUB+= PYTHON="@comment " -.endif - .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif @@ -105,8 +112,10 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/gdb${VER} - ${LN} -sf ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/gdbtui${VER} ${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 ${MAN1PREFIX}/man/man1/gdb${VER}.1 +.if ${PORT_OPTIONS:MTUI} + ${LN} -sf ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/gdbtui${VER} +.endif .if ${PORT_OPTIONS:MGDB_LINK} ${LN} -sf gdb${VER} ${PREFIX}/bin/gdb .endif Modified: head/devel/gdb/files/extrapatch-gdb-Makefile.in ============================================================================== --- head/devel/gdb/files/extrapatch-gdb-Makefile.in Wed Mar 13 15:40:34 2013 (r314092) +++ head/devel/gdb/files/extrapatch-gdb-Makefile.in Wed Mar 13 16:15:49 2013 (r314093) @@ -1,23 +1,13 @@ --- gdb/Makefile.in.orig 2012-07-02 17:29:33.000000000 +0200 +++ gdb/Makefile.in 2012-08-26 21:01:45.589052997 +0200 -@@ -572,7 +572,7 @@ - xstormy16-tdep.o \ +@@ -573,6 +573,7 @@ xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \ glibc-tdep.o \ -- bsd-uthread.o \ + bsd-uthread.o \ + fbsd-threads.o \ nbsd-tdep.o obsd-tdep.o \ sol2-tdep.o \ solib-frv.o solib-irix.o solib-svr4.o \ -@@ -779,7 +779,7 @@ - gnulib/import/stdint.in.h remote.h gdb.h sparc-nat.h \ - gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \ - amd64-nat.h s390-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \ --gdbarch.h bsd-uthread.h gdb_stat.h memory-map.h memrange.h \ -+gdbarch.h gdb_stat.h memory-map.h memrange.h \ - mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \ - ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \ - f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \ @@ -1164,7 +1164,7 @@ # Removing the old gdb first works better if it is running, at least on SunOS. gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) @@ -32,7 +22,7 @@ avr-tdep.c \ bfin-linux-tdep.c bfin-tdep.c \ - bsd-uthread.c bsd-kvm.c \ -+ fbsd-threads.c bsd-kvm.c \ ++ bsd-uthread.c fbsd-threads.c bsd-kvm.c \ core-regset.c \ dcache.c dicos-tdep.c darwin-nat.c \ exec.c \ Added: head/devel/gdb/files/patch-bfd-ecoff.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-ecoff.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/ecoff.c.orig 2013-03-11 12:42:03.000000000 +0100 ++++ bfd/ecoff.c 2013-03-11 12:44:29.000000000 +0100 +@@ -1888,7 +1888,7 @@ + ret = (bfd_coff_filhsz (abfd) + + bfd_coff_aoutsz (abfd) + + c * bfd_coff_scnhsz (abfd)); +- return BFD_ALIGN (ret, 16); ++ return (int)BFD_ALIGN (ret, 16); + } + + /* Get the contents of a section. */ Added: head/devel/gdb/files/patch-bfd-elf32-hppa.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-hppa.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/elf32-hppa.c.orig 2013-03-07 09:56:40.000000000 +0100 ++++ bfd/elf32-hppa.c 2013-03-07 09:57:07.000000000 +0100 +@@ -2384,7 +2384,7 @@ + bfd_size_type mask; + + if (gotalign > pltalign) +- bfd_set_section_alignment (dynobj, sec, gotalign); ++ (void)bfd_set_section_alignment (dynobj, sec, gotalign); + mask = ((bfd_size_type) 1 << gotalign) - 1; + sec->size = (sec->size + sizeof (plt_stub) + mask) & ~mask; + } Added: head/devel/gdb/files/patch-bfd-elf32-m32r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-m32r.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/elf32-m32r.c.orig 2013-03-07 09:57:30.000000000 +0100 ++++ bfd/elf32-m32r.c 2013-03-07 09:57:53.000000000 +0100 +@@ -1390,7 +1390,7 @@ + flags); + if (s == NULL) + return FALSE; +- bfd_set_section_alignment (abfd, s, 2); ++ (void)bfd_set_section_alignment (abfd, s, 2); + } + + bh = bfd_link_hash_lookup (info->hash, "_SDA_BASE_", Added: head/devel/gdb/files/patch-bfd-elf32-microblaze.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-microblaze.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/elf32-microblaze.c.orig 2013-03-07 10:01:47.000000000 +0100 ++++ bfd/elf32-microblaze.c 2013-03-07 10:02:54.000000000 +0100 +@@ -1741,7 +1741,7 @@ + for (isym = isymbuf; isym < isymend; isym++) + { + if (isym->st_shndx == shndx) +- isym->st_value =- calc_fixup (isym->st_value, sec); ++ isym->st_value = -calc_fixup (isym->st_value, sec); + } + + /* Now adjust the global symbols defined in this section. */ Added: head/devel/gdb/files/patch-bfd-elf32-tic6x.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-tic6x.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,30 @@ +--- bfd/elf32-tic6x.c.orig 2013-03-07 10:03:28.000000000 +0100 ++++ bfd/elf32-tic6x.c 2013-03-07 10:08:19.000000000 +0100 +@@ -3043,7 +3043,7 @@ + *secp = bfd_make_section_old_way (abfd, ".scommon"); + (*secp)->flags |= SEC_IS_COMMON; + *valp = sym->st_size; +- bfd_set_section_alignment (abfd, *secp, bfd_log2 (sym->st_value)); ++ (void)bfd_set_section_alignment (abfd, *secp, bfd_log2 (sym->st_value)); + break; + } + +@@ -3319,8 +3319,6 @@ + { + bfd_signed_vma *local_got; + bfd_signed_vma *end_local_got; +- char *local_tls_type; +- bfd_vma *local_tlsdesc_gotent; + bfd_size_type locsymcount; + Elf_Internal_Shdr *symtab_hdr; + asection *srel; +@@ -3361,8 +3359,7 @@ + end_local_got = local_got + locsymcount; + s = htab->elf.sgot; + srel = htab->elf.srelgot; +- for (; local_got < end_local_got; +- ++local_got, ++local_tls_type, ++local_tlsdesc_gotent) ++ for (; local_got < end_local_got; ++local_got) + { + if (*local_got > 0) + { Added: head/devel/gdb/files/patch-bfd-elf32-v850.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-v850.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/elf32-v850.c.orig 2013-03-11 12:55:48.000000000 +0100 ++++ bfd/elf32-v850.c 2013-03-11 12:57:45.000000000 +0100 +@@ -2933,7 +2933,7 @@ + + if (alignmoveto < alignto) + { +- unsigned int i; ++ bfd_vma i; + + align_pad_size = alignto - alignmoveto; + #ifdef DEBUG_RELAX Added: head/devel/gdb/files/patch-bfd-elf32-xtensa.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf32-xtensa.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,20 @@ +--- bfd/elf32-xtensa.c.orig 2013-03-07 10:08:58.000000000 +0100 ++++ bfd/elf32-xtensa.c 2013-03-07 10:11:40.000000000 +0100 +@@ -6075,7 +6075,7 @@ + release_internal_relocs (sec_cache->sec, sec_cache->relocs); + if (sec_cache->ptbl) + free (sec_cache->ptbl); +- memset (sec_cache, 0, sizeof (sec_cache)); ++ memset (sec_cache, 0, sizeof (*sec_cache)); + } + } + +@@ -6117,7 +6117,7 @@ + + /* Fill in the new section cache. */ + clear_section_cache (sec_cache); +- memset (sec_cache, 0, sizeof (sec_cache)); ++ memset (sec_cache, 0, sizeof (*sec_cache)); + + sec_cache->sec = sec; + sec_cache->contents = contents; Added: head/devel/gdb/files/patch-bfd-elf64-alpha.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elf64-alpha.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,63 @@ +--- 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) +- { +- case 1: ++ { ++ int skip_default = 0; ++ if (!dynamic && !info->link_info->shared) + { + bfd_vma tp_base; + bfd_signed_vma disp; +@@ -3605,7 +3605,7 @@ + irel[0].r_offset = pos[0] - info->contents; + irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPREL16); + irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); +- break; ++ skip_default = 1; + } + else if (disp >= -(bfd_signed_vma) 0x80000000 + && disp < (bfd_signed_vma) 0x7fff8000 +@@ -3620,24 +3620,23 @@ + irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELHI); + irel[1].r_offset = pos[1] - info->contents; + irel[1].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELLO); +- break; ++ skip_default = 1; + } + } +- /* FALLTHRU */ +- +- default: +- use_gottprel = TRUE; +- +- insn = (OP_LDQ << 26) | (tlsgd_reg << 21) | (29 << 16); +- bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); +- bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]); +- +- irel[0].r_offset = pos[0] - info->contents; +- irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_GOTTPREL); +- irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); +- break; +- } ++ /* FALLTHRU (default) */ ++ if (skip_default != 1 ) ++ { ++ use_gottprel = TRUE; + ++ insn = (OP_LDQ << 26) | (tlsgd_reg << 21) | (29 << 16); ++ bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); ++ bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]); ++ ++ irel[0].r_offset = pos[0] - info->contents; ++ irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_GOTTPREL); ++ irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); ++ } ++ } + bfd_put_32 (info->abfd, (bfd_vma) INSN_RDUNIQ, pos[2]); + + insn = INSN_ADDQ | (16 << 21) | (0 << 16) | (0 << 0); Added: head/devel/gdb/files/patch-bfd-elfnn-ia64.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elfnn-ia64.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/elfnn-ia64.c.orig 2013-03-11 10:21:19.000000000 +0100 ++++ bfd/elfnn-ia64.c 2013-03-11 10:21:43.000000000 +0100 +@@ -1546,7 +1546,7 @@ + bfd_set_section_flags (abfd, ia64_info->root.sgot, + SEC_SMALL_DATA | flags); + /* The .got section is always aligned at 8 bytes. */ +- bfd_set_section_alignment (abfd, ia64_info->root.sgot, 3); ++ (void)bfd_set_section_alignment (abfd, ia64_info->root.sgot, 3); + } + + if (!get_pltoff (abfd, info, ia64_info)) Added: head/devel/gdb/files/patch-bfd-elfxx-mips.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elfxx-mips.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,28 @@ +--- bfd/elfxx-mips.c.orig 2013-03-07 10:12:06.000000000 +0100 ++++ bfd/elfxx-mips.c 2013-03-07 10:13:30.000000000 +0100 +@@ -7292,20 +7292,20 @@ + /* Change alignments of some sections. */ + s = bfd_get_linker_section (abfd, ".hash"); + if (s != NULL) +- bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); ++ (void)bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); + s = bfd_get_linker_section (abfd, ".dynsym"); + if (s != NULL) +- bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); ++ (void)bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); + s = bfd_get_linker_section (abfd, ".dynstr"); + if (s != NULL) +- bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); ++ (void)bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); + /* ??? */ + s = bfd_get_section_by_name (abfd, ".reginfo"); + if (s != NULL) +- bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); ++ (void)bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); + s = bfd_get_linker_section (abfd, ".dynamic"); + if (s != NULL) +- bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); ++ (void)bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd)); + } + + if (!info->shared) Added: head/devel/gdb/files/patch-bfd-elfxx-tilegx.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-elfxx-tilegx.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,20 @@ +--- bfd/elfxx-tilegx.c.orig 2013-03-07 10:14:34.000000000 +0100 ++++ bfd/elfxx-tilegx.c 2013-03-07 10:15:31.000000000 +0100 +@@ -1205,7 +1205,7 @@ + }; + + /* Reuse an existing info 10 bundle. */ +-static const bfd_byte const *tilegx64_plt_tail_entry = ++static const bfd_byte *tilegx64_plt_tail_entry = + &tilegx64_short_plt_entry[4 * TILEGX_BUNDLE_SIZE_IN_BYTES]; + + static const bfd_byte +@@ -1250,7 +1250,7 @@ + }; + + /* Reuse an existing info 10 bundle. */ +-static const bfd_byte const *tilegx32_plt_tail_entry = ++static const bfd_byte *tilegx32_plt_tail_entry = + &tilegx64_short_plt_entry[4 * TILEGX_BUNDLE_SIZE_IN_BYTES]; + + static int Added: head/devel/gdb/files/patch-bfd-mach-o.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-mach-o.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/mach-o.c.orig 2013-03-07 10:15:55.000000000 +0100 ++++ bfd/mach-o.c 2013-03-07 10:16:09.000000000 +0100 +@@ -2683,7 +2683,7 @@ + s->flags = xlat->macho_sectype | xlat->macho_secattr; + s->align = xlat->sectalign > bfdalign ? xlat->sectalign + : bfdalign; +- bfd_set_section_alignment (abfd, sec, s->align); ++ (void)bfd_set_section_alignment (abfd, sec, s->align); + bfd_flags = bfd_get_section_flags (abfd, sec); + if (bfd_flags == SEC_NO_FLAGS) + bfd_set_section_flags (abfd, sec, xlat->bfd_flags); Added: head/devel/gdb/files/patch-bfd-mmo.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-mmo.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,29 @@ +--- bfd/mmo.c.orig 2013-03-11 12:17:57.000000000 +0100 ++++ bfd/mmo.c 2013-03-11 12:17:21.000000000 +0100 +@@ -663,7 +663,7 @@ + return NULL; + + if (! sec->user_set_vma) +- bfd_set_section_vma (abfd, sec, vma); ++ (void)bfd_set_section_vma (abfd, sec, vma); + if (! bfd_set_section_flags (abfd, sec, + bfd_get_section_flags (abfd, sec) + | SEC_CODE | SEC_LOAD | SEC_ALLOC)) +@@ -677,7 +677,7 @@ + return NULL; + + if (! sec->user_set_vma) +- bfd_set_section_vma (abfd, sec, vma); ++ (void)bfd_set_section_vma (abfd, sec, vma); + if (! bfd_set_section_flags (abfd, sec, + bfd_get_section_flags (abfd, sec) + | SEC_LOAD | SEC_ALLOC)) +@@ -693,7 +693,7 @@ + sprintf (sec_name, ".MMIX.sec.%d", abfd->tdata.mmo_data->sec_no++); + sec = mmo_make_section (abfd, sec_name); + if (! sec->user_set_vma) +- bfd_set_section_vma (abfd, sec, vma); ++ (void)bfd_set_section_vma (abfd, sec, vma); + + if (! bfd_set_section_flags (abfd, sec, + bfd_get_section_flags (abfd, sec) Added: head/devel/gdb/files/patch-bfd-vms-alpha.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-vms-alpha.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,20 @@ +--- bfd/vms-alpha.c.orig 2013-03-11 10:40:39.000000000 +0100 ++++ bfd/vms-alpha.c 2013-03-11 12:31:12.000000000 +0100 +@@ -6044,7 +6044,7 @@ + unsigned char *rec, unsigned int rec_len) + { + unsigned int off = sizeof (struct vms_egsd); +- unsigned int sec_len; ++ unsigned int sec_len = 0; + + fprintf (file, _(" %s (len=%u+%u):\n"), name, + (unsigned)(rec_len - sizeof (struct vms_eobjrec)), +@@ -9118,7 +9118,7 @@ + vms_debug2 ((1, "vms_new_section_hook (%p, [%d]%s)\n", + abfd, section->index, section->name)); + +- bfd_set_section_alignment (abfd, section, 0); ++ (void)bfd_set_section_alignment (abfd, section, 0); + + vms_debug2 ((7, "%d: %s\n", section->index, section->name)); + Added: head/devel/gdb/files/patch-bfd-xcofflink.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-bfd-xcofflink.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,11 @@ +--- bfd/xcofflink.c.orig 2013-03-07 10:16:45.000000000 +0100 ++++ bfd/xcofflink.c 2013-03-07 10:19:50.000000000 +0100 +@@ -6273,7 +6273,7 @@ + irel = flinfo.section_info[o->target_index].relocs; + irelend = irel + o->reloc_count; + rel_hash = flinfo.section_info[o->target_index].rel_hashes; +- for (; irel < irelend; irel++, rel_hash++, erel += relsz) ++ for (; irel < irelend; irel++, rel_hash++) + { + if (*rel_hash != NULL) + { Added: head/devel/gdb/files/patch-include-cgen-basic-ops.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-include-cgen-basic-ops.h Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,43 @@ +--- include/cgen/basic-ops.h.orig 2013-03-07 17:31:21.000000000 +0100 ++++ include/cgen/basic-ops.h 2013-03-07 17:31:28.000000000 +0100 +@@ -24,11 +24,16 @@ + + #include <assert.h> + +-#if defined (__GNUC__) && ! defined (SEMOPS_DEFINE_INLINE) ++#if defined (__GNUC__) && ! defined (SEMOPS_DEFINE_INLINE) && ! defined (__clang__) + #define SEMOPS_DEFINE_INLINE + #define SEMOPS_INLINE extern inline + #else +-#define SEMOPS_INLINE ++# if defined (__clang__) && ! defined (SEMOPS_DEFINE_INLINE) ++# define SEMOPS_DEFINE_INLINE ++# define SEMOPS_INLINE static inline ++# else ++# define SEMOPS_INLINE ++# endif + #endif + + /* These don't really have a mode. */ +@@ -295,11 +300,16 @@ + significant and word number 0 is the most significant word. + ??? May also wish an endian-dependent version. Later. */ + +-QI SUBWORDSIQI (SI, int); +-HI SUBWORDSIHI (SI, int); +-QI SUBWORDDIQI (DI, int); +-HI SUBWORDDIHI (DI, int); +-SI SUBWORDDISI (DI, int); ++#if defined (__clang__) && defined (SEMOPS_DEFINE_INLINE) ++#define SEMOPS_STATIC static ++#else ++#define SEMOPS_STATIC ++#endif ++SEMOPS_STATIC QI SUBWORDSIQI (SI, int); ++SEMOPS_STATIC HI SUBWORDSIHI (SI, int); ++SEMOPS_STATIC QI SUBWORDDIQI (DI, int); ++SEMOPS_STATIC HI SUBWORDDIHI (DI, int); ++SEMOPS_STATIC SI SUBWORDDISI (DI, int); + + #ifdef SEMOPS_DEFINE_INLINE + Added: head/devel/gdb/files/patch-opcodes-cr16-opc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-opcodes-cr16-opc.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,65 @@ +--- opcodes/cr16-opc.c.orig 2013-03-07 10:34:48.000000000 +0100 ++++ opcodes/cr16-opc.c 2013-03-07 10:33:49.000000000 +0100 +@@ -502,36 +502,36 @@ + const reg_entry cr16_pregtab[] = + { + /* Build a processor register. */ +- REG(dbs, 0x0, CR16_P_REGTYPE), +- REG(dsr, 0x1, CR16_P_REGTYPE), +- REG(dcrl, 0x2, CR16_P_REGTYPE), +- REG(dcrh, 0x3, CR16_P_REGTYPE), +- REG(car0l, 0x4, CR16_P_REGTYPE), +- REG(car0h, 0x5, CR16_P_REGTYPE), +- REG(car1l, 0x6, CR16_P_REGTYPE), +- REG(car1h, 0x7, CR16_P_REGTYPE), +- REG(cfg, 0x8, CR16_P_REGTYPE), +- REG(psr, 0x9, CR16_P_REGTYPE), +- REG(intbasel, 0xa, CR16_P_REGTYPE), +- REG(intbaseh, 0xb, CR16_P_REGTYPE), +- REG(ispl, 0xc, CR16_P_REGTYPE), +- REG(isph, 0xd, CR16_P_REGTYPE), +- REG(uspl, 0xe, CR16_P_REGTYPE), +- REG(usph, 0xf, CR16_P_REGTYPE), ++ REG((reg)dbs, 0x0, CR16_P_REGTYPE), ++ REG((reg)dsr, 0x1, CR16_P_REGTYPE), ++ REG((reg)dcrl, 0x2, CR16_P_REGTYPE), ++ REG((reg)dcrh, 0x3, CR16_P_REGTYPE), ++ REG((reg)car0l, 0x4, CR16_P_REGTYPE), ++ REG((reg)car0h, 0x5, CR16_P_REGTYPE), ++ REG((reg)car1l, 0x6, CR16_P_REGTYPE), ++ REG((reg)car1h, 0x7, CR16_P_REGTYPE), ++ REG((reg)cfg, 0x8, CR16_P_REGTYPE), ++ REG((reg)psr, 0x9, CR16_P_REGTYPE), ++ REG((reg)intbasel, 0xa, CR16_P_REGTYPE), ++ REG((reg)intbaseh, 0xb, CR16_P_REGTYPE), ++ REG((reg)ispl, 0xc, CR16_P_REGTYPE), ++ REG((reg)isph, 0xd, CR16_P_REGTYPE), ++ REG((reg)uspl, 0xe, CR16_P_REGTYPE), ++ REG((reg)usph, 0xf, CR16_P_REGTYPE), + }; + + const reg_entry cr16_pregptab[] = + { +- REG(dbs, 0, CR16_P_REGTYPE), +- REG(dsr, 1, CR16_P_REGTYPE), +- REG(dcr, 2, CR16_P_REGTYPE), +- REG(car0, 4, CR16_P_REGTYPE), +- REG(car1, 6, CR16_P_REGTYPE), +- REG(cfg, 8, CR16_P_REGTYPE), +- REG(psr, 9, CR16_P_REGTYPE), +- REG(intbase, 10, CR16_P_REGTYPE), +- REG(isp, 12, CR16_P_REGTYPE), +- REG(usp, 14, CR16_P_REGTYPE), ++ REG((reg)dbs, 0, CR16_P_REGTYPE), ++ REG((reg)dsr, 1, CR16_P_REGTYPE), ++ REG((reg)dcr, 2, CR16_P_REGTYPE), ++ REG((reg)car0, 4, CR16_P_REGTYPE), ++ REG((reg)car1, 6, CR16_P_REGTYPE), ++ REG((reg)cfg, 8, CR16_P_REGTYPE), ++ REG((reg)psr, 9, CR16_P_REGTYPE), ++ REG((reg)intbase, 10, CR16_P_REGTYPE), ++ REG((reg)isp, 12, CR16_P_REGTYPE), ++ REG((reg)usp, 14, CR16_P_REGTYPE), + }; + + const unsigned int cr16_num_pregs = ARRAY_SIZE (cr16_pregtab); Added: head/devel/gdb/files/patch-opcodes-crx-opc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-opcodes-crx-opc.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,20 @@ +--- opcodes/crx-opc.c.orig 2013-03-07 10:35:06.000000000 +0100 ++++ opcodes/crx-opc.c 2013-03-07 10:40:31.000000000 +0100 +@@ -632,7 +632,7 @@ + const reg_entry crx_copregtab[] = + { + /* Build a Coprocessor register c<N>. */ +-#define REG_C(N) REG(CONCAT2(c,N), N, CRX_C_REGTYPE) ++#define REG_C(N) REG((reg)CONCAT2(c,N), N, CRX_C_REGTYPE) + + REG_C(0), REG_C(1), REG_C(2), REG_C(3), + REG_C(4), REG_C(5), REG_C(6), REG_C(7), +@@ -640,7 +640,7 @@ + REG_C(12), REG_C(13), REG_C(14), REG_C(15), + + /* Build a Coprocessor Special register cs<N>. */ +-#define REG_CS(N) REG(CONCAT2(cs,N), N, CRX_CS_REGTYPE) ++#define REG_CS(N) REG((reg)CONCAT2(cs,N), N, CRX_CS_REGTYPE) + + REG_CS(0), REG_CS(1), REG_CS(2), REG_CS(3), + REG_CS(4), REG_CS(5), REG_CS(6), REG_CS(7), Modified: head/devel/gdb/files/patch-opcodes-i386-dis.c ============================================================================== --- head/devel/gdb/files/patch-opcodes-i386-dis.c Wed Mar 13 15:40:34 2013 (r314092) +++ head/devel/gdb/files/patch-opcodes-i386-dis.c Wed Mar 13 16:15:49 2013 (r314093) @@ -56,3 +56,4 @@ + oappend (&"%es:"[(short)intel_syntax]); ptr_reg (code, sizeflag); } + Added: head/devel/gdb/files/patch-opcodes-ia64-asmtab.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-opcodes-ia64-asmtab.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,37 @@ +--- opcodes/ia64-asmtab.c.orig 2008-08-28 16:07:49.000000000 +0200 ++++ opcodes/ia64-asmtab.c 2013-03-13 16:40:09.000000000 +0100 +@@ -101,7 +101,7 @@ + { "CPUID#", 7, 0, 5, -1, NULL, }, + { "CR[CMCV]", 28, 0, 3, 74, NULL, }, + { "CR[DCR]", 28, 0, 3, 0, NULL, }, +- { "CR[EOI]", 28, 0, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI Ð CR67)\" on page 2:119", }, ++ { "CR[EOI]", 28, 0, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI CR67)\" on page 2:119", }, + { "CR[GPTA]", 28, 0, 3, 9, NULL, }, + { "CR[IFA]", 28, 0, 1, 20, NULL, }, + { "CR[IFA]", 28, 0, 3, 20, NULL, }, +@@ -123,13 +123,13 @@ + { "CR[ITM]", 28, 0, 3, 1, NULL, }, + { "CR[ITV]", 28, 0, 3, 72, NULL, }, + { "CR[IVA]", 28, 0, 4, 2, NULL, }, +- { "CR[IVR]", 28, 0, 7, 65, "SC Section 5.8.3.2, \"External Interrupt Vector Register (IVR Ð CR65)\" on page 2:118", }, +- { "CR[LID]", 28, 0, 7, 64, "SC Section 5.8.3.1, \"Local ID (LID Ð CR64)\" on page 2:117", }, ++ { "CR[IVR]", 28, 0, 7, 65, "SC Section 5.8.3.2, \"External Interrupt Vector Register (IVR CR65)\" on page 2:118", }, ++ { "CR[LID]", 28, 0, 7, 64, "SC Section 5.8.3.1, \"Local ID (LID CR64)\" on page 2:117", }, + { "CR[LRR%], % in 0 - 1", 10, 0, 3, -1, NULL, }, + { "CR[PMV]", 28, 0, 3, 73, NULL, }, + { "CR[PTA]", 28, 0, 3, 8, NULL, }, + { "CR[TPR]", 28, 0, 3, 66, NULL, }, +- { "CR[TPR]", 28, 0, 7, 66, "SC Section 5.8.3.3, \"Task Priority Register (TPR Ð CR66)\" on page 2:119", }, ++ { "CR[TPR]", 28, 0, 7, 66, "SC Section 5.8.3.3, \"Task Priority Register (TPR CR66)\" on page 2:119", }, + { "CR[TPR]", 28, 0, 1, 66, NULL, }, + { "CR%, % in 3-7, 10-15, 18, 28-63, 75-79, 82-127", 11, 0, 0, -1, NULL, }, + { "DBR#", 12, 0, 2, -1, NULL, }, +@@ -303,7 +303,7 @@ + { "CPUID#", 7, 1, 0, -1, NULL, }, + { "CR[CMCV]", 28, 1, 2, 74, NULL, }, + { "CR[DCR]", 28, 1, 2, 0, NULL, }, +- { "CR[EOI]", 28, 1, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI Ð CR67)\" on page 2:119", }, ++ { "CR[EOI]", 28, 1, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI CR67)\" on page 2:119", }, + { "CR[GPTA]", 28, 1, 2, 9, NULL, }, + { "CR[IFA]", 28, 1, 2, 20, NULL, }, + { "CR[IFS]", 28, 1, 2, 23, NULL, }, Added: head/devel/gdb/files/patch-opcodes-tic54x-dis.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gdb/files/patch-opcodes-tic54x-dis.c Wed Mar 13 16:15:49 2013 (r314093) @@ -0,0 +1,105 @@ +--- opcodes/tic54x-dis.c.orig 2013-03-07 10:46:52.000000000 +0100 ++++ opcodes/tic54x-dis.c 2013-03-07 12:05:19.000000000 +0100 +@@ -168,14 +168,9 @@ + } + + int +-print_instruction (info, memaddr, opcode, tm_name, tm_operands, size, ext) +- disassemble_info *info; +- bfd_vma memaddr; +- unsigned short opcode; +- const char *tm_name; +- const enum optype tm_operands[]; +- int size; +- int ext; ++print_instruction (disassemble_info * info, bfd_vma memaddr, ++ unsigned short opcode, const char *tm_name, ++ const enum optype tm_operands[], int size, int ext) + { + static int n; + /* string storage for multiple operands */ +@@ -468,6 +463,7 @@ + return 1; + } + ++/* + static int + print_parallel_instruction (info, memaddr, opcode, ptm, size) + disassemble_info *info; +@@ -475,6 +471,11 @@ + unsigned short opcode; + const insn_template *ptm; + int size; ++*/ ++static int ++print_parallel_instruction (disassemble_info *info, ++ bfd_vma memaddr, unsigned short opcode, ++ const insn_template * ptm, int size) + { + print_instruction (info, memaddr, opcode, + ptm->name, ptm->operand_types, size, 0); +@@ -484,10 +485,8 @@ + } + + static int +-sprint_dual_address (info, buf, code) +- disassemble_info *info ATTRIBUTE_UNUSED; +- char buf[]; +- unsigned short code; ++sprint_dual_address ( disassemble_info *info ATTRIBUTE_UNUSED, ++ char buf[], unsigned short code) + { + const char *formats[] = { + "*ar%d", +@@ -499,10 +498,8 @@ + } + + static int +-sprint_indirect_address (info, buf, opcode) +- disassemble_info *info ATTRIBUTE_UNUSED; +- char buf[]; +- unsigned short opcode; ++sprint_indirect_address (disassemble_info * info ATTRIBUTE_UNUSED, ++ char buf[], unsigned short opcode) + { + const char *formats[] = { + "*ar%d", +@@ -522,10 +519,8 @@ + } + + static int +-sprint_direct_address (info, buf, opcode) +- disassemble_info *info ATTRIBUTE_UNUSED; +- char buf[]; +- unsigned short opcode; ++sprint_direct_address ( disassemble_info *info ATTRIBUTE_UNUSED, ++ char buf[], unsigned short opcode) + { + /* FIXME -- look up relocation if available */ + return sprintf (buf, "DP+0x%02x", (int) (opcode & 0x7F)); +@@ -552,10 +547,8 @@ + } + + static int +-sprint_cc2 (info, buf, opcode) +- disassemble_info *info ATTRIBUTE_UNUSED; +- char *buf; +- unsigned short opcode; ++sprint_cc2 (disassemble_info *info ATTRIBUTE_UNUSED, ++ char *buf, unsigned short opcode) + { + const char *cc2[] = { + "??", "??", "ageq", "alt", "aneq", "aeq", "agt", "aleq", +@@ -565,10 +558,8 @@ + } + + static int +-sprint_condition (info, buf, opcode) +- disassemble_info *info ATTRIBUTE_UNUSED; +- char *buf; +- unsigned short opcode; ++sprint_condition (disassemble_info *info ATTRIBUTE_UNUSED, ++ char *buf, unsigned short opcode) + { + char *start = buf; + const char *cmp[] = { Modified: head/devel/gdb/pkg-descr ============================================================================== --- head/devel/gdb/pkg-descr Wed Mar 13 15:40:34 2013 (r314092) +++ head/devel/gdb/pkg-descr Wed Mar 13 16:15:49 2013 (r314093) @@ -3,4 +3,4 @@ many other languages. GDB can target (i more than a dozen different processor architectures, and GDB itself can run on most popular GNU/Linux, Unix and Microsoft Windows variants. -WWW: http://www.gnu.org/software/gdb/ +WWW: http://www.gnu.org/software/gdb/ Modified: head/devel/gdb/pkg-plist ============================================================================== --- head/devel/gdb/pkg-plist Wed Mar 13 15:40:34 2013 (r314092) +++ head/devel/gdb/pkg-plist Wed Mar 13 16:15:49 2013 (r314093) @@ -1,6 +1,6 @@ %%GDB_LINK%%bin/gdb bin/gdb%%VER%% -bin/gdbtui%%VER%% +%%TUI_LINK%%bin/gdbtui%%VER%% %%PYTHON%%share/gdb%%VER%%/python/gdb/__init__.py %%PYTHON%%share/gdb%%VER%%/python/gdb/types.py %%PYTHON%%share/gdb%%VER%%/python/gdb/printing.py
State Changed From-To: feedback->closed Committed. Thanks!