CVS commit: src/distrib/sets/lists/comp

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep 25 07:00:46 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: md.amd64

Log Message:
add new files for binutils 2.21.


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/distrib/sets/lists/comp/md.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.139 src/distrib/sets/lists/comp/md.amd64:1.140
--- src/distrib/sets/lists/comp/md.amd64:1.139	Sun Sep 25 04:11:47 2011
+++ src/distrib/sets/lists/comp/md.amd64	Sun Sep 25 07:00:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.139 2011/09/25 04:11:47 christos Exp $
+# $NetBSD: md.amd64,v 1.140 2011/09/25 07:00:45 mrg Exp $
 ./usr/include/amd64comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -1153,6 +1153,19 @@
 ./usr/libdata/ldscripts/elf_i386.xsw		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf_i386.xu		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf_i386.xw		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.x		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xbn		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xc		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xd		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xdc		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xdw		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xn		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xr		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xs		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xsc		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xsw		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xu		comp-util-bin		binutils
+./usr/libdata/ldscripts/elf_l1om.xw		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf_x86_64.x		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf_x86_64.xbn		comp-util-bin		binutils
 ./usr/libdata/ldscripts/elf_x86_64.xc		comp-util-bin		binutils



CVS commit: src/external/gpl3/binutils/dist/gas/config

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep 25 09:44:54 UTC 2011

Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-mips.c

Log Message:
add OPTION_FIX_LOONGSON2F_BTB and OPTION_NO_FIX_LOONGSON2F_BTB
options back to the enum.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/dist/gas/config/tc-mips.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/gas/config/tc-mips.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.8 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.9
--- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.8	Sun Sep 25 04:32:37 2011
+++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c	Sun Sep 25 09:44:54 2011
@@ -11362,6 +11362,8 @@ enum options
 OPTION_NO_PDR,
 OPTION_MVXWORKS_PIC,
 #endif /* OBJ_ELF */
+OPTION_FIX_LOONGSON2F_BTB,
+OPTION_NO_FIX_LOONGSON2F_BTB,
 OPTION_END_OF_ENUM
   };
   



CVS commit: src/external/gpl3/binutils/dist/bfd

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep 25 11:07:32 UTC 2011

Modified Files:
src/external/gpl3/binutils/dist/bfd: elf32-vax.c

Log Message:
make this build again.

gimpy, please check the #if 0'd code that may or may not be useful? :)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/bfd/elf32-vax.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/elf32-vax.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.3 src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.4
--- src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.3	Sun Sep 25 04:32:35 2011
+++ src/external/gpl3/binutils/dist/bfd/elf32-vax.c	Sun Sep 25 11:07:32 2011
@@ -769,6 +769,7 @@ elf_vax_check_relocs (bfd *abfd, struct 
 		  if (sreloc == NULL)
 		return FALSE;
 
+#if 0
 		  BFD_ASSERT (CONST_STRNEQ (name, .rela)
 			   strcmp (bfd_get_section_name (abfd, sec),
 	 name + 5) == 0);
@@ -788,6 +789,7 @@ elf_vax_check_relocs (bfd *abfd, struct 
 			  || !bfd_set_section_alignment (dynobj, sreloc, 2))
 			return FALSE;
 		}
+#endif
 
 		  if (sec-flags  SEC_READONLY)
 		info-flags |= DF_TEXTREL;
@@ -1644,7 +1646,6 @@ elf_vax_relocate_section (bfd *output_bf
 
 	case R_VAX_PC8:
 	case R_VAX_PC16:
-	case R_VAX_PC32:
 	r_vax_pc32_shared:
 	  if (h == NULL
 	  || ELF_ST_VISIBILITY (h-other) != STV_DEFAULT



CVS commit: src/share/mk

2011-09-25 Thread Alan Barrett
Module Name:src
Committed By:   apb
Date:   Sun Sep 25 11:20:41 UTC 2011

Modified Files:
src/share/mk: bsd.lib.mk

Log Message:
If the number of entries in CLEANFILES is too large, then the
commands in bsd.clean.mk encounter errors like exec(/bin/sh)
failed (Argument list too long).  Avoid that by splitting the
files to clean into several lists using different variable names.

This should fix PR 45397, at least until the number of files
grows much larger.


To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/share/mk/bsd.lib.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.316 src/share/mk/bsd.lib.mk:1.317
--- src/share/mk/bsd.lib.mk:1.316	Sat Sep 10 16:57:35 2011
+++ src/share/mk/bsd.lib.mk	Sun Sep 25 11:20:41 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.316 2011/09/10 16:57:35 apb Exp $
+#	$NetBSD: bsd.lib.mk,v 1.317 2011/09/25 11:20:41 apb Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include bsd.init.mk
@@ -595,14 +595,27 @@ lint: ${LOBJS}
 	${LINT} ${LINTFLAGS} ${LOBJS}
 .endif
 
+# If the number of entries in CLEANFILES is too large, then the
+# commands in bsd.clean.mk encounter errors like exec(/bin/sh)
+# failed (Argument list too long).  Avoid that by splitting the
+# files to clean into several lists using different variable names.
+# __cleanuse is an internal target in bsd.clean.mk; the way we
+# use it here mimics the way it's used by the clean target in
+# bsd.clean.mk.
+#
+clean: libclean1 libclean2 libclean3 libclean4 libclean5
+libclean1: .PHONY .MADE __cleanuse LIBCLEANFILES1
+libclean2: .PHONY .MADE __cleanuse LIBCLEANFILES2
+libclean3: .PHONY .MADE __cleanuse LIBCLEANFILES3
+libclean4: .PHONY .MADE __cleanuse LIBCLEANFILES4
+libclean5: .PHONY .MADE __cleanuse LIBCLEANFILES5
 CLEANFILES+= a.out [Ee]rrs mklog core *.core
-CLEANFILES+= lib${LIB}.a ${STOBJS}
-CLEANFILES+= lib${LIB}_p.a ${POBJS}
-CLEANFILES+= lib${LIB}_g.a ${GOBJS}
-CLEANFILES+= lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${_LIB.debug} ${SOBJS}
-CLEANFILES+= ${STOBJS:=.tmp} ${POBJS:=.tmp} ${SOBJS:=.tmp} ${GOBJS:=.tmp}
-CLEANFILES+= llib-l${LIB}.ln ${LOBJS}
-
+LIBCLEANFILES1+= lib${LIB}.a   ${STOBJS} ${STOBJS:=.tmp}
+LIBCLEANFILES2+= lib${LIB}_p.a ${POBJS}  ${POBJS:=.tmp}
+LIBCLEANFILES3+= lib${LIB}_g.a ${GOBJS}  ${GOBJS:=.tmp}
+LIBCLEANFILES4+= lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${_LIB.debug}
+LIBCLEANFILES4+= ${SOBJS} ${SOBJS:=.tmp}
+LIBCLEANFILES5+= llib-l${LIB}.ln ${LOBJS}
 
 .if !target(libinstall)			# {
 # Make sure it gets defined, in case MKPIC==no  MKLINKLIB==no



CVS commit: src/sys/netinet

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep 25 11:54:28 UTC 2011

Modified Files:
src/sys/netinet: rfc6056.c

Log Message:
make this build without INET6.
also, fix the rfc6056algo passed to sysctl_rfc6056_helper
(it was backwards for inet4/inet6.)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/rfc6056.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet/rfc6056.c
diff -u src/sys/netinet/rfc6056.c:1.2 src/sys/netinet/rfc6056.c:1.3
--- src/sys/netinet/rfc6056.c:1.2	Sat Sep 24 18:32:23 2011
+++ src/sys/netinet/rfc6056.c	Sun Sep 25 11:54:28 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rfc6056.c,v 1.2 2011/09/24 18:32:23 christos Exp $	*/
+/*	$NetBSD: rfc6056.c,v 1.3 2011/09/25 11:54:28 mrg Exp $	*/
 
 /*
  * Copyright 2011 Vlad Balan
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rfc6056.c,v 1.2 2011/09/24 18:32:23 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: rfc6056.c,v 1.3 2011/09/25 11:54:28 mrg Exp $);
 
 #include opt_inet.h
 
@@ -231,12 +231,14 @@ check_suitable_port(uint16_t port, struc
 kauth_cred_t cred)
 {
 	struct inpcbtable *table;
-	struct socket *so;
 #ifdef INET
 	vestigial_inpcb_t vestigial;
 #endif
 	int error;
+#ifdef INET6
+	struct socket *so;
 	int wild = 0;
+#endif
 
 	DPRINTF(%s called for argument %d\n, __func__, port);
 
@@ -567,7 +569,9 @@ Fhash(const struct inpcb_hdr *inp_hdr)
 static bool
 iscompletetuple(struct inpcb_hdr *inp_hdr)
 {
+#ifdef INET6
 	struct in6pcb *in6p;
+#endif
 
 	switch (inp_hdr-inph_af) {
 #ifdef INET
@@ -910,14 +914,16 @@ sysctl_rfc6056_helper(SYSCTLFN_ARGS, int
 int
 sysctl_rfc6056_selected(SYSCTLFN_ARGS)
 {
-	return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), inet6_rfc6056algo);
+	return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), inet4_rfc6056algo);
 }
 
+#ifdef INET6
 int
 sysctl_rfc6056_selected6(SYSCTLFN_ARGS)
 {
-	return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), inet4_rfc6056algo);
+	return sysctl_rfc6056_helper(SYSCTLFN_CALL(rnode), inet6_rfc6056algo);
 }
+#endif
 
 /*
  * The sysctl hook that returns the available



CVS commit: src/distrib/sets/lists/comp

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep 25 12:56:46 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: md.sparc64

Log Message:
fix the libgomp compat entries.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/lists/comp/md.sparc64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.123 src/distrib/sets/lists/comp/md.sparc64:1.124
--- src/distrib/sets/lists/comp/md.sparc64:1.123	Sun Sep 25 04:11:47 2011
+++ src/distrib/sets/lists/comp/md.sparc64	Sun Sep 25 12:56:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.123 2011/09/25 04:11:47 christos Exp $
+# $NetBSD: md.sparc64,v 1.124 2011/09/25 12:56:46 mrg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/sparccomp-c-include
@@ -430,8 +430,8 @@
 ./usr/lib/sparc/libgomp.a			comp-c-lib		compat,gcc=45
 ./usr/lib/sparc/libgomp.so			base-sys-shlib		compat,pic,gcc=45
 ./usr/lib/sparc/libgomp.a			-unknown-		compat,debuglib,gcc=45
-./usr/lib/sparc/libgomp.a			comp-c-proflib		compat,profile,gcc=45
-./usr/lib/sparc/libgomp.a			comp-c-piclib		compat,pic,gcc=45
+./usr/lib/sparc/libgomp_p.a			comp-c-proflib		compat,profile,gcc=45
+./usr/lib/sparc/libgomp_pic.a			comp-c-piclib		compat,pic,gcc=45
 ./usr/lib/sparc/libgssapi.a			comp-c-lib		compat,kerberos
 ./usr/lib/sparc/libgssapi.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/sparc/libgssapi_g.a			-unknown-		compat,debuglib,kerberos



CVS commit: src/external/gpl3/gcc/dist/gcc/config/alpha

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:32:18 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/alpha: elf.h

Log Message:
don't try to define LINK_EH_SPEC if it's already set,
netbsd.h already set it to what we want.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.1.1.1	Tue Jun 21 01:22:12 2011
+++ src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h	Sun Sep 25 13:32:17 2011
@@ -440,7 +440,7 @@ extern int alpha_this_gpdisp_sequence_nu
As of Jan 2002, only glibc 2.2.4 can actually make use of this, but
I imagine that other systems will catch up.  In the meantime, it
doesn't harm to make sure that the data exists to be used later.  */
-#if defined(HAVE_LD_EH_FRAME_HDR)
+#if defined(HAVE_LD_EH_FRAME_HDR)  !defined(LINK_EH_SPEC)
 #define LINK_EH_SPEC %{!static:--eh-frame-hdr} 
 #endif
 



CVS commit: src/external/gpl3/gcc/dist/gcc/config/m68k

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:33:43 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/m68k: netbsd-elf.h

Log Message:
define PREFERRED_STACK_BOUNDARY to be the same as STACK_BOUNDARY,
gcc 4.5 wants them both.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.4 src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h:1.4	Mon Jul 11 08:23:48 2011
+++ src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h	Sun Sep 25 13:33:43 2011
@@ -323,6 +323,8 @@ while (0)
 
 #undef STACK_BOUNDARY
 #define STACK_BOUNDARY 32
+#undef PREFERRED_STACK_BOUNDARY
+#define PREFERRED_STACK_BOUNDARY 32
 
 
 /* Alignment of field after `int : 0' in a structure.



CVS commit: src/external/gpl3/gcc/lib/libgcc

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:34:17 UTC 2011

Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc

Log Message:
m68k needs fpgnulib.c just like m68000 does.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libgcc/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.12 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.13
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.12	Mon Aug 15 18:31:20 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc	Sun Sep 25 13:34:16 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.12 2011/08/15 18:31:20 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2011/09/25 13:34:16 chs Exp $
 
 .if ${MKGCC} != no
 .if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -87,7 +87,7 @@ BUILDSYMLINKS+=	${file} ${file:T:S/.asm$
 .endfor
 
 # XXX
-.if ${MACHINE_ARCH} == m68000
+.if (${MACHINE_ARCH} == m68000 || ${MACHINE_ARCH} == m68k)
 CPICFLAGS:=
 BUILDSYMLINKS+=	${DIST}/gcc/config/m68k/fpgnulib.c fpgnulib.c
 BUILDSYMLINKS+=	${DIST}/gcc/config/m68k/fpgnulib.c xfgnulib.c



CVS commit: src/libexec/ld.elf_so/arch/hppa

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:34:54 UTC 2011

Modified Files:
src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c

Log Message:
gcc 4.5 generates an extra plabel in ld.elf_so,
so expand the array of preallocated ones.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.39 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.40
--- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.39	Fri Mar 25 18:07:05 2011
+++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c	Sun Sep 25 13:34:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: hppa_reloc.c,v 1.39 2011/03/25 18:07:05 joerg Exp $	*/
+/*	$NetBSD: hppa_reloc.c,v 1.40 2011/09/25 13:34:54 chs Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: hppa_reloc.c,v 1.39 2011/03/25 18:07:05 joerg Exp $);
+__RCSID($NetBSD: hppa_reloc.c,v 1.40 2011/09/25 13:34:54 chs Exp $);
 #endif /* not lint */
 
 #include stdlib.h
@@ -114,7 +114,7 @@ static SLIST_HEAD(hppa_plabel_head, _hpp
  * Because I'm hesitant to use NEW while relocating self,
  * this is a small pool of preallocated PLABELs.
  */
-#define	HPPA_PLABEL_PRE	(18)
+#define	HPPA_PLABEL_PRE	(32)
 static hppa_plabel hppa_plabel_pre[HPPA_PLABEL_PRE];
 static int hppa_plabel_pre_next = 0;
 



CVS commit: src/sys/arch/alpha

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:36:53 UTC 2011

Modified Files:
src/sys/arch/alpha/jensenio: jensenio_bus_intio.c
src/sys/arch/alpha/pci: pci_bwx_bus_io_chipdep.c
pci_bwx_bus_mem_chipdep.c pci_swiz_bus_io_chipdep.c
pci_swiz_bus_mem_chipdep.c
src/sys/arch/alpha/tc: tc_bus_mem.c

Log Message:
change inline to static inline to appease gcc 4.5.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/jensenio/jensenio_bus_intio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/tc/tc_bus_mem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/jensenio/jensenio_bus_intio.c
diff -u src/sys/arch/alpha/jensenio/jensenio_bus_intio.c:1.3 src/sys/arch/alpha/jensenio/jensenio_bus_intio.c:1.4
--- src/sys/arch/alpha/jensenio/jensenio_bus_intio.c:1.3	Fri Jul  1 19:22:35 2011
+++ src/sys/arch/alpha/jensenio/jensenio_bus_intio.c	Sun Sep 25 13:36:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_bus_intio.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $ */
+/* $NetBSD: jensenio_bus_intio.c,v 1.4 2011/09/25 13:36:53 chs Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: jensenio_bus_intio.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: jensenio_bus_intio.c,v 1.4 2011/09/25 13:36:53 chs Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -60,11 +60,11 @@ int		jensenio_intio_subregion(void *, bu
 	/* Not supported for Internal space */
 
 /* barrier */
-inline void	jensenio_intio_barrier(void *, bus_space_handle_t,
+static inline void	jensenio_intio_barrier(void *, bus_space_handle_t,
 		bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	jensenio_intio_read_1(void *, bus_space_handle_t, bus_size_t);
+static inline u_int8_t	jensenio_intio_read_1(void *, bus_space_handle_t, bus_size_t);
 
 /* read multiple */
 void		jensenio_intio_read_multi_1(void *, bus_space_handle_t,
@@ -74,7 +74,7 @@ void		jensenio_intio_read_multi_1(void *
 	/* Not supported for Internal space */
 
 /* write (single) */
-inline void	jensenio_intio_write_1(void *, bus_space_handle_t,
+static inline void	jensenio_intio_write_1(void *, bus_space_handle_t,
 		bus_size_t, u_int8_t);
 
 /* write multiple */
@@ -211,7 +211,7 @@ jensenio_intio_subregion(void *v, bus_sp
 	return (0);
 }
 
-inline void
+static inline void
 jensenio_intio_barrier(void *v, bus_space_handle_t h, bus_size_t o,
 bus_size_t l, int f)
 {
@@ -222,7 +222,7 @@ jensenio_intio_barrier(void *v, bus_spac
 		alpha_wmb();
 }
 
-inline u_int8_t
+static inline u_int8_t
 jensenio_intio_read_1(void *v, bus_space_handle_t ioh, bus_size_t off)
 {
 	register u_int32_t *port;
@@ -245,7 +245,7 @@ jensenio_intio_read_multi_1(void *v, bus
 	}
 }
 
-inline void
+static inline void
 jensenio_intio_write_1(void *v, bus_space_handle_t ioh, bus_size_t off,
 u_int8_t val)
 {

Index: src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
diff -u src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c:1.18 src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c:1.19
--- src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c:1.18	Sat Mar 14 14:45:53 2009
+++ src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c	Sun Sep 25 13:36:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.18 2009/03/14 14:45:53 dsl Exp $ */
+/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.19 2011/09/25 13:36:53 chs Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.18 2009/03/14 14:45:53 dsl Exp $);
+__KERNEL_RCSID(1, $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.19 2011/09/25 13:36:53 chs Exp $);
 
 #include sys/extent.h
 
@@ -112,17 +112,17 @@ void *		__C(CHIP,_io_vaddr)(void *, bus_
 paddr_t		__C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
 
 /* barrier */
-inline void	__C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+static inline void	__C(CHIP,_io_barrier)(void *, bus_space_handle_t,
 		bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	__C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+static inline u_int8_t	__C(CHIP,_io_read_1)(void *, bus_space_handle_t,
 		bus_size_t);
-inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+static inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
 		bus_size_t);
-inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+static inline u_int32_t 

CVS commit: src/sys/arch/alpha/mcbus

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:37:20 UTC 2011

Modified Files:
src/sys/arch/alpha/mcbus: mcbus.c

Log Message:
avoid array overrun, noticed by gcc 4.5.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/alpha/mcbus/mcbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/mcbus/mcbus.c
diff -u src/sys/arch/alpha/mcbus/mcbus.c:1.20 src/sys/arch/alpha/mcbus/mcbus.c:1.21
--- src/sys/arch/alpha/mcbus/mcbus.c:1.20	Wed Jul  9 21:25:59 2008
+++ src/sys/arch/alpha/mcbus/mcbus.c	Sun Sep 25 13:37:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcbus.c,v 1.20 2008/07/09 21:25:59 joerg Exp $ */
+/* $NetBSD: mcbus.c,v 1.21 2011/09/25 13:37:20 chs Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -37,7 +37,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: mcbus.c,v 1.20 2008/07/09 21:25:59 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: mcbus.c,v 1.21 2011/09/25 13:37:20 chs Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -129,7 +129,7 @@ mcbusattach(device_t parent, device_t se
 	bcs[mcbus_primary.mcbus_bcache] : Unknown);
 
 	mbp-mcbus_types[0] = MCBUS_TYPE_RES;
-	for (mid = 1; mid = MCBUS_MID_MAX; ++mid)
+	for (mid = 1; mid  MCBUS_MID_MAX; ++mid)
 		mbp-mcbus_types[mid] = MCBUS_TYPE_UNK;
 
 	/*



CVS commit: src/sys/compat/linux/common

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:40:07 UTC 2011

Modified Files:
src/sys/compat/linux/common: linux_termios.h

Log Message:
linux_termio c_cc array should be indexed by LINUX_OLD_V* rather than LINUX_V*.
fixes array overrun on alpha noticed by gcc 4.5.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/linux/common/linux_termios.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/compat/linux/common/linux_termios.h
diff -u src/sys/compat/linux/common/linux_termios.h:1.20 src/sys/compat/linux/common/linux_termios.h:1.21
--- src/sys/compat/linux/common/linux_termios.h:1.20	Mon Jul  4 12:39:36 2011
+++ src/sys/compat/linux/common/linux_termios.h	Sun Sep 25 13:40:07 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_termios.h,v 1.20 2011/07/04 12:39:36 mrg Exp $	*/
+/*	$NetBSD: linux_termios.h,v 1.21 2011/09/25 13:40:07 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -345,16 +345,16 @@ bsd_termios_to_linux_termio(struct termi
 	}
 	lt-c_cflag |= mask;
 
-	lt-c_cc[LINUX_VINTR] = bts-c_cc[VINTR];
-	lt-c_cc[LINUX_VQUIT] = bts-c_cc[VQUIT];
-	lt-c_cc[LINUX_VERASE] = bts-c_cc[VERASE];
-	lt-c_cc[LINUX_VKILL] = bts-c_cc[VKILL];
-#if LINUX_VEOF  LINUX_NCC
-	lt-c_cc[LINUX_VEOF] = bts-c_cc[VEOF];
+	lt-c_cc[LINUX_OLD_VINTR] = bts-c_cc[VINTR];
+	lt-c_cc[LINUX_OLD_VQUIT] = bts-c_cc[VQUIT];
+	lt-c_cc[LINUX_OLD_VERASE] = bts-c_cc[VERASE];
+	lt-c_cc[LINUX_OLD_VKILL] = bts-c_cc[VKILL];
+#if LINUX_OLD_VEOF  LINUX_NCC
+	lt-c_cc[LINUX_OLD_VEOF] = bts-c_cc[VEOF];
 #endif
-	lt-c_cc[LINUX_VTIME] = bts-c_cc[VTIME];
-	lt-c_cc[LINUX_VMIN] = bts-c_cc[VMIN];
-	lt-c_cc[LINUX_VSWTC] = 0;
+	lt-c_cc[LINUX_OLD_VTIME] = bts-c_cc[VTIME];
+	lt-c_cc[LINUX_OLD_VMIN] = bts-c_cc[VMIN];
+	lt-c_cc[LINUX_OLD_VSWTC] = 0;
 
 	/* XXX should be fixed someday */
 	lt-c_line = 0;



CVS commit: src/sys/kern

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:40:37 UTC 2011

Modified Files:
src/sys/kern: kern_descrip.c

Log Message:
in fd_allocfile(), free the fd if we fail to allocate a file.


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/kern/kern_descrip.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.216 src/sys/kern/kern_descrip.c:1.217
--- src/sys/kern/kern_descrip.c:1.216	Fri Jul 15 14:50:19 2011
+++ src/sys/kern/kern_descrip.c	Sun Sep 25 13:40:37 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.216 2011/07/15 14:50:19 christos Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.217 2011/09/25 13:40:37 chs Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.216 2011/07/15 14:50:19 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.217 2011/09/25 13:40:37 chs Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -291,7 +291,7 @@ fd_used(filedesc_t *fdp, unsigned fd)
 	KASSERT(ff-ff_file == NULL);
 	KASSERT(!ff-ff_allocated);
 
-	ff-ff_allocated = 1;
+	ff-ff_allocated = true;
 	fdp-fd_lomap[off] |= 1  (fd  NDENTRYMASK);
 	if (__predict_false(fdp-fd_lomap[off] == ~0)) {
 		KASSERT((fdp-fd_himap[off  NDENTRYSHIFT] 
@@ -337,7 +337,7 @@ fd_unused(filedesc_t *fdp, unsigned fd)
 	}
 	KASSERT((fdp-fd_lomap[off]  (1  (fd  NDENTRYMASK))) != 0);
 	fdp-fd_lomap[off] = ~(1  (fd  NDENTRYMASK));
-	ff-ff_allocated = 0;
+	ff-ff_allocated = false;
 
 	KASSERT(fd = fdp-fd_lastfile);
 	if (fd == fdp-fd_lastfile) {
@@ -1083,6 +1083,7 @@ fd_allocfile(file_t **resultfp, int *res
 
 	fp = pool_cache_get(file_cache, PR_WAITOK);
 	if (fp == NULL) {
+		fd_abort(p, NULL, *resultfd);
 		return ENFILE;
 	}
 	KASSERT(fp-f_count == 0);



CVS commit: src/sys/netsmb

2011-09-25 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Sun Sep 25 13:42:31 UTC 2011

Modified Files:
src/sys/netsmb: smb_subr.c

Log Message:
don't mix static and non-static MALLOC_DEFINE()s in the same file,
it fails to compile with gcc 4.5 on alpha.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/netsmb/smb_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netsmb/smb_subr.c
diff -u src/sys/netsmb/smb_subr.c:1.35 src/sys/netsmb/smb_subr.c:1.36
--- src/sys/netsmb/smb_subr.c:1.35	Mon Jul 12 02:58:01 2010
+++ src/sys/netsmb/smb_subr.c	Sun Sep 25 13:42:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_subr.c,v 1.35 2010/07/12 02:58:01 christos Exp $	*/
+/*	$NetBSD: smb_subr.c,v 1.36 2011/09/25 13:42:30 chs Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_subr.c,v 1.35 2010/07/12 02:58:01 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_subr.c,v 1.36 2011/09/25 13:42:30 chs Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -60,7 +60,8 @@ __KERNEL_RCSID(0, $NetBSD: smb_subr.c,v
 
 const smb_unichar smb_unieol = 0;
 
-static MALLOC_DEFINE(M_SMBSTR, smbstr, SMB strings);
+/* XXX M_SMBSTR could be static but that doesn't work with gcc 4.5 on alpha. */
+MALLOC_DEFINE(M_SMBSTR, smbstr, SMB strings);
 MALLOC_DEFINE(M_SMBTEMP, smbtemp, Temp netsmb data);
 
 void



CVS commit: src/sys/arch/x86/x86

2011-09-25 Thread Jean-Yves Migeon
Module Name:src
Committed By:   jym
Date:   Sun Sep 25 18:39:31 UTC 2011

Modified Files:
src/sys/arch/x86/x86: pmap.c

Log Message:
Fix a small typo in comment: pmaps_lock is the lock that keeps all
pmaps in sync for kernel mappings (including when they are obtained from
pool caches).


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/x86/x86/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.130 src/sys/arch/x86/x86/pmap.c:1.131
--- src/sys/arch/x86/x86/pmap.c:1.130	Tue Sep 20 00:12:23 2011
+++ src/sys/arch/x86/x86/pmap.c	Sun Sep 25 18:39:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.130 2011/09/20 00:12:23 jym Exp $	*/
+/*	$NetBSD: pmap.c,v 1.131 2011/09/25 18:39:30 jym Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.130 2011/09/20 00:12:23 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.131 2011/09/25 18:39:30 jym Exp $);
 
 #include opt_user_ldt.h
 #include opt_lockdebug.h
@@ -1982,7 +1982,7 @@ pmap_pdp_ctor(void *arg, void *v, int fl
 #endif
 
 	/*
-	 * NOTE: The `pmap_lock' is held when the PDP is allocated.
+	 * NOTE: The `pmaps_lock' is held when the PDP is allocated.
 	 */
 
 #if defined(XEN)  defined(__x86_64__)



CVS commit: src/external/gpl3/gdb/dist

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 25 19:09:31 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/bfd/doc: bfd.info
src/external/gpl3/gdb/dist/gdb: amd64nbsd-tdep.c

Log Message:
make amd64 compile.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/bfd/doc/bfd.info
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/bfd/doc/bfd.info
diff -u src/external/gpl3/gdb/dist/bfd/doc/bfd.info:1.1.1.1 src/external/gpl3/gdb/dist/bfd/doc/bfd.info:1.2
--- src/external/gpl3/gdb/dist/bfd/doc/bfd.info:1.1.1.1	Sat Sep 24 15:47:50 2011
+++ src/external/gpl3/gdb/dist/bfd/doc/bfd.info	Sun Sep 25 15:09:30 2011
@@ -1,4 +1,7 @@
-This is bfd.info, produced by makeinfo version 4.8 from bfd.texinfo.
+This is
+/usr/src/tools/gdb/../../external/gpl3/gdb/dist/bfd/doc/bfd.info,
+produced by makeinfo version 4.8 from
+/usr/src/tools/gdb/../../external/gpl3/gdb/dist/bfd/doc/bfd.texinfo.
 
 INFO-DIR-SECTION Software development
 START-INFO-DIR-ENTRY
@@ -10102,8 +10105,8 @@ BFD Index
 * bfd_get_section_by_name_if:section prototypes. (line   31)
 * bfd_get_section_contents:  section prototypes. (line  237)
 * bfd_get_sign_extend_vma:   BFD front end.  (line  484)
-* bfd_get_size 1:  Internal.   (line   25)
-* bfd_get_size:  BFD front end.  (line  860)
+* bfd_get_size 1:  BFD front end.  (line  860)
+* bfd_get_size:  Internal.   (line   25)
 * bfd_get_symtab_upper_bound:symbol handling functions.
  (line6)
 * bfd_get_target_info:   bfd_target. (line  472)
@@ -11606,67 +11609,67 @@ BFD Index
 
 
 Tag Table:
-Node: Top1089
-Node: Overview1428
-Node: History2479
-Node: How It Works3425
-Node: What BFD Version 2 Can Do4968
-Node: BFD information loss6283
-Node: Canonical format8815
-Node: BFD front end13187
-Node: Memory Usage45266
-Node: Initialization46494
-Node: Sections46953
-Node: Section Input47436
-Node: Section Output48801
-Node: typedef asection51287
-Node: section prototypes76599
-Node: Symbols86494
-Node: Reading Symbols88089
-Node: Writing Symbols89196
-Node: Mini Symbols90905
-Node: typedef asymbol91879
-Node: symbol handling functions97938
-Node: Archives103280
-Node: Formats107006
-Node: Relocations109954
-Node: typedef arelent110681
-Node: howto manager126317
-Node: Core Files203149
-Node: Targets205187
-Node: bfd_target207157
-Node: Architectures229550
-Node: Opening and Closing253308
-Node: Internal264764
-Node: File Caching271097
-Node: Linker Functions273011
-Node: Creating a Linker Hash Table274684
-Node: Adding Symbols to the Hash Table276422
-Node: Differing file formats277322
-Node: Adding symbols from an object file279047
-Node: Adding symbols from an archive281198
-Node: Performing the Final Link284127
-Node: Information provided by the linker285369
-Node: Relocating the section contents286523
-Node: Writing the symbol table288274
-Node: Hash Tables292289
-Node: Creating and Freeing a Hash Table293487
-Node: Looking Up or Entering a String294737
-Node: Traversing a Hash Table295990
-Node: Deriving a New Hash Table Type296779
-Node: Define the Derived Structures297845
-Node: Write the Derived Creation Routine298926
-Node: Write Other Derived Routines301550
-Node: BFD back ends302865
-Node: What to Put Where303135
-Node: aout303315
-Node: coff309633
-Node: elf338066
-Node: mmo338467
-Node: File layout339395
-Node: Symbol-table345042
-Node: mmo section mapping348811
-Node: GNU Free Documentation License352463
-Node: BFD Index377546
+Node: Top1201
+Node: Overview1540
+Node: History2591
+Node: How It Works3537
+Node: What BFD Version 2 Can Do5080
+Node: BFD information loss6395
+Node: Canonical format8927
+Node: BFD front end13299
+Node: Memory Usage45378
+Node: Initialization46606
+Node: Sections47065
+Node: Section Input47548
+Node: Section Output48913
+Node: typedef asection51399
+Node: section prototypes76711
+Node: Symbols86606
+Node: Reading Symbols88201
+Node: Writing Symbols89308
+Node: Mini Symbols91017
+Node: typedef asymbol91991
+Node: symbol handling functions98050
+Node: Archives103392
+Node: Formats107118
+Node: Relocations110066
+Node: typedef arelent110793
+Node: howto manager126429
+Node: Core Files203261
+Node: Targets205299
+Node: bfd_target207269
+Node: Architectures229662
+Node: Opening and Closing253420
+Node: Internal264876
+Node: File Caching271209
+Node: Linker Functions273123
+Node: Creating a Linker Hash Table274796
+Node: Adding Symbols to the Hash Table276534
+Node: Differing 

CVS commit: src/external/gpl3/binutils/dist/binutils/doc

2011-09-25 Thread Alan Barrett
Module Name:src
Committed By:   apb
Date:   Sun Sep 25 19:40:36 UTC 2011

Modified Files:
src/external/gpl3/binutils/dist/binutils/doc: Makefile.in

Log Message:
Disable rebuilding of elfedit.1


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/dist/binutils/doc/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/binutils/doc/Makefile.in
diff -u src/external/gpl3/binutils/dist/binutils/doc/Makefile.in:1.4 src/external/gpl3/binutils/dist/binutils/doc/Makefile.in:1.5
--- src/external/gpl3/binutils/dist/binutils/doc/Makefile.in:1.4	Sun Sep 25 04:32:36 2011
+++ src/external/gpl3/binutils/dist/binutils/doc/Makefile.in	Sun Sep 25 19:40:36 2011
@@ -842,6 +842,8 @@ NetBSD_DISABLED_strip.1:
 	rm -f strip.pod
 
 elfedit.1:	$(binutils_TEXI) $(binutils_TEXINFOS)
+	@echo NOT REBUILDING $@
+NetBSD_DISABLED_elfedit.1:
 	touch $@
 	-$(TEXI2POD) $(MANCONF) -Delfedit  $(binutils_TEXI)  elfedit.pod
 	-($(POD2MAN) elfedit.pod | sed -e '/^.if n .na/d'  $@.T  \



CVS commit: src/external/gpl3/gdb/dist/intl

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 25 20:23:51 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/intl: Makefile.in

Log Message:
disable .y.c rule.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/intl/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/intl/Makefile.in
diff -u src/external/gpl3/gdb/dist/intl/Makefile.in:1.1.1.1 src/external/gpl3/gdb/dist/intl/Makefile.in:1.2
--- src/external/gpl3/gdb/dist/intl/Makefile.in:1.1.1.1	Sat Sep 24 16:05:46 2011
+++ src/external/gpl3/gdb/dist/intl/Makefile.in	Sun Sep 25 16:23:51 2011
@@ -133,8 +133,8 @@ libintl.h: $(srcdir)/libgnuintl.h
 	$(COMPILE) $
 
 .y.c:
-	$(YACC) $(YFLAGS) --output $@ $
-	rm -f $*.h
+#	$(YACC) $(YFLAGS) --output $@ $
+#	rm -f $*.h
 
 INCLUDES = -I. -I$(srcdir)
 



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 25 20:25:08 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: bsd-kvm.c

Log Message:
- fix missing argument
- expose struct lwp by #define _KMEMUSER


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/bsd-kvm.c
diff -u src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.2 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.3
--- src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.2	Sun Sep 25 12:30:24 2011
+++ src/external/gpl3/gdb/dist/gdb/bsd-kvm.c	Sun Sep 25 16:25:08 2011
@@ -37,6 +37,7 @@
 #include paths.h
 #include readline/readline.h
 #include sys/param.h
+#define _KMEMUSER
 #include sys/proc.h
 #include sys/user.h
 
@@ -238,7 +239,7 @@ bsd_kvm_fetch_registers (struct target_o
   if (kvm_read (core_kd, nl[0].n_value, paddr, sizeof paddr) == -1)
 	error ((%s), kvm_geterr (core_kd));
 
-  bsd_kvm_fetch_pcb (paddr);
+  bsd_kvm_fetch_pcb (regcache, paddr);
   return;
 }
 #endif



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 25 20:26:04 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: configure configure.ac

Log Message:
#define _KMEMUSER so that the struct lwp test works.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/configure \
src/external/gpl3/gdb/dist/gdb/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/configure
diff -u src/external/gpl3/gdb/dist/gdb/configure:1.1.1.1 src/external/gpl3/gdb/dist/gdb/configure:1.2
--- src/external/gpl3/gdb/dist/gdb/configure:1.1.1.1	Sat Sep 24 16:09:43 2011
+++ src/external/gpl3/gdb/dist/gdb/configure	Sun Sep 25 16:26:04 2011
@@ -13009,6 +13009,7 @@ else
   cat confdefs.h - _ACEOF conftest.$ac_ext
 /* end confdefs.h.  */
 #include sys/param.h
+#define _KMEMUSER
 #include sys/lwp.h
 int
 main ()
Index: src/external/gpl3/gdb/dist/gdb/configure.ac
diff -u src/external/gpl3/gdb/dist/gdb/configure.ac:1.1.1.1 src/external/gpl3/gdb/dist/gdb/configure.ac:1.2
--- src/external/gpl3/gdb/dist/gdb/configure.ac:1.1.1.1	Sat Sep 24 16:09:44 2011
+++ src/external/gpl3/gdb/dist/gdb/configure.ac	Sun Sep 25 16:26:04 2011
@@ -1137,6 +1137,7 @@ AC_CHECK_MEMBERS([struct thread.td_pcb],
 # See if sys/lwp.h defines `struct lwp`.
 AC_CACHE_CHECK([for struct lwp], gdb_cv_struct_lwp,
 [AC_TRY_COMPILE([#include sys/param.h
+#define _KMEMUSER
 #include sys/lwp.h], [struct lwp l;],
 gdb_cv_struct_lwp=yes, gdb_cv_struct_lwp=no)])
 if test $gdb_cv_struct_lwp = yes; then



CVS commit: src/sys/lib/libkern

2011-09-25 Thread Jean-Yves Migeon
Module Name:src
Committed By:   jym
Date:   Sun Sep 25 20:31:18 UTC 2011

Modified Files:
src/sys/lib/libkern: libkern.h

Log Message:
Do as Joerg said and kill the __STDC__ blocks. They only make sense for
things used by assembler, which won't be the case for these macros.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/lib/libkern/libkern.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.99 src/sys/lib/libkern/libkern.h:1.100
--- src/sys/lib/libkern/libkern.h:1.99	Thu Sep  1 22:35:17 2011
+++ src/sys/lib/libkern/libkern.h	Sun Sep 25 20:31:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: libkern.h,v 1.99 2011/09/01 22:35:17 jym Exp $	*/
+/*	$NetBSD: libkern.h,v 1.100 2011/09/25 20:31:18 jym Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -177,13 +177,8 @@ tolower(int ch)
 #ifdef NDEBUG		/* tradition! */
 #define	assert(e)	((void)0)
 #else
-#ifdef __STDC__
 #define	assert(e)	(__predict_true((e)) ? (void)0 :		\
 			kern_assert(, __FILE__, __LINE__, #e))
-#else
-#define	assert(e)	(__predict_true((e)) ? (void)0 :		\
-			kern_assert(, __FILE__, __LINE__, e))
-#endif
 #endif
 
 #ifdef __COVERITY__
@@ -209,13 +204,8 @@ tolower(int ch)
 	if (__predict_false(!(e)))	\
 		panic msg;		\
 	} while (/*CONSTCOND*/ 0)
-#ifdef __STDC__
 #define	KASSERT(e)	(__predict_true((e)) ? (void)0 :		\
 			kern_assert(diagnostic , __FILE__, __LINE__, #e))
-#else
-#define	KASSERT(e)	(__predict_true((e)) ? (void)0 :		\
-			kern_assert(diagnostic , __FILE__, __LINE__,e))
-#endif
 #endif
 
 #ifndef DEBUG
@@ -231,13 +221,8 @@ tolower(int ch)
 	if (__predict_false(!(e)))	\
 		panic msg;		\
 	} while (/*CONSTCOND*/ 0)
-#ifdef __STDC__
 #define	KDASSERT(e)	(__predict_true((e)) ? (void)0 :		\
 			kern_assert(debugging , __FILE__, __LINE__, #e))
-#else
-#define	KDASSERT(e)	(__predict_true((e)) ? (void)0 :		\
-			kern_assert(debugging , __FILE__, __LINE__, e))
-#endif
 #endif
 /*
  * XXX: For compatibility we use SMALL_RANDOM by default.



CVS commit: src/etc

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 25 21:47:22 UTC 2011

Modified Files:
src/etc: sysctl.conf

Log Message:
mention kern.tty.qsize requested by Matthew Mondor.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/sysctl.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/sysctl.conf
diff -u src/etc/sysctl.conf:1.7 src/etc/sysctl.conf:1.8
--- src/etc/sysctl.conf:1.7	Wed Apr  1 12:20:55 2009
+++ src/etc/sysctl.conf	Sun Sep 25 17:47:22 2011
@@ -1,6 +1,6 @@
 #!/sbin/sysctl -f
 #
-# $NetBSD: sysctl.conf,v 1.7 2009/04/01 16:20:55 martin Exp $
+# $NetBSD: sysctl.conf,v 1.8 2011/09/25 21:47:22 christos Exp $
 #
 # sysctl(8) variables to set at boot time.
 
@@ -17,3 +17,7 @@ ddb.onpanic?=0
 
 # Number of kernel threads to use for NFS client
 #vfs.nfs.iothreads=4
+
+# Default tty/pty character queue sizes. Should be bumped to 32K or so if
+# used in networking (ppp/pppoe)
+#kern.tty.qsize=1024



CVS commit: src/sys/conf

2011-09-25 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sun Sep 25 22:26:33 UTC 2011

Modified Files:
src/sys/conf: Makefile.kern.inc

Log Message:
Allow analyze to work by including bsd.clang-analyze.mk for kernels


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/conf/Makefile.kern.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.148 src/sys/conf/Makefile.kern.inc:1.149
--- src/sys/conf/Makefile.kern.inc:1.148	Wed Aug 31 20:16:43 2011
+++ src/sys/conf/Makefile.kern.inc	Sun Sep 25 22:26:33 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.148 2011/08/31 20:16:43 plunky Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.149 2011/09/25 22:26:33 joerg Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -532,6 +532,7 @@ CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
 CWARNFLAGS+=	${CWARNFLAGS.${.IMPSRC:T}}
 
 .include bsd.files.mk
+.include bsd.clang-analyze.mk
 
 ##
 ## the end



CVS commit: src/distrib/sets/lists/comp

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Sep 26 00:07:26 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: md.sparc64

Log Message:
fix the spelling of libgomp_g.a.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/comp/md.sparc64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.124 src/distrib/sets/lists/comp/md.sparc64:1.125
--- src/distrib/sets/lists/comp/md.sparc64:1.124	Sun Sep 25 12:56:46 2011
+++ src/distrib/sets/lists/comp/md.sparc64	Mon Sep 26 00:07:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.124 2011/09/25 12:56:46 mrg Exp $
+# $NetBSD: md.sparc64,v 1.125 2011/09/26 00:07:26 mrg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/sparccomp-c-include
@@ -429,7 +429,7 @@
 ./usr/lib/sparc/libgnumalloc_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/sparc/libgomp.a			comp-c-lib		compat,gcc=45
 ./usr/lib/sparc/libgomp.so			base-sys-shlib		compat,pic,gcc=45
-./usr/lib/sparc/libgomp.a			-unknown-		compat,debuglib,gcc=45
+./usr/lib/sparc/libgomp_g.a			-unknown-		compat,debuglib,gcc=45
 ./usr/lib/sparc/libgomp_p.a			comp-c-proflib		compat,profile,gcc=45
 ./usr/lib/sparc/libgomp_pic.a			comp-c-piclib		compat,pic,gcc=45
 ./usr/lib/sparc/libgssapi.a			comp-c-lib		compat,kerberos



CVS commit: src/libexec/ld.elf_so/arch/powerpc

2011-09-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Sep 26 01:52:22 UTC 2011

Modified Files:
src/libexec/ld.elf_so/arch/powerpc: rtld_start.S

Log Message:
match END() with a relevant ENTRY*().  gas 2.21 complains about the
non-constant-ness of the symbol otherwise.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/libexec/ld.elf_so/arch/powerpc/rtld_start.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/arch/powerpc/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/powerpc/rtld_start.S:1.16 src/libexec/ld.elf_so/arch/powerpc/rtld_start.S:1.17
--- src/libexec/ld.elf_so/arch/powerpc/rtld_start.S:1.16	Fri Mar  4 00:40:48 2011
+++ src/libexec/ld.elf_so/arch/powerpc/rtld_start.S	Mon Sep 26 01:52:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld_start.S,v 1.16 2011/03/04 00:40:48 matt Exp $	*/
+/*	$NetBSD: rtld_start.S,v 1.17 2011/09/26 01:52:22 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1998	Tsubai Masanari
@@ -124,7 +124,7 @@ ENTRY_NOPROFILE(_rtld_bind_bssplt_start)
 
 	addi	%r1,%r1,160
 	bctr
-END(_rtld_bind_start)
+END(_rtld_bind_secureplt_start)
 
 	.globl	_rtld_powerpc_pltcall
 	.globl	_rtld_powerpc_pltresolve



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Sep 26 02:35:33 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: amd64nbsd-tdep.c

Log Message:
Disable our custom stack unwinder for now. It is completely broken now because
gdb asserts when a frame returns 0. In previous versions of gdb, it just
printed 0, and stopped scanning. Our unwinder produces the same results in
both versions of gdb, i.e. it is broken and worse than the current gdb
default. We will need to revisit this for kernel debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c:1.3 src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c:1.4
--- src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c:1.3	Sun Sep 25 15:09:31 2011
+++ src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c	Sun Sep 25 22:35:33 2011
@@ -291,9 +291,10 @@ amd64nbsd_init_abi (struct gdbarch_info 
   /* NetBSD uses SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
 (gdbarch, svr4_lp64_fetch_link_map_offsets);
-
+#ifdef notyet
   /* Unwind kernel trap frames correctly.  */
   frame_unwind_prepend_unwinder (gdbarch, amd64nbsd_trapframe_unwind);
+#endif
 }
 
 



CVS commit: src/tools/gdb

2011-09-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Sep 26 02:36:20 UTC 2011

Modified Files:
src/tools/gdb: Makefile README.mknative mknative-gdb

Log Message:
mknative for gdb7


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tools/gdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gdb/README.mknative
cvs rdiff -u -r1.2 -r1.3 src/tools/gdb/mknative-gdb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.18 src/tools/gdb/Makefile:1.19
--- src/tools/gdb/Makefile:1.18	Fri Dec 24 08:12:09 2010
+++ src/tools/gdb/Makefile	Sun Sep 25 22:36:19 2011
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.18 2010/12/24 13:12:09 njoly Exp $
+#	$NetBSD: Makefile,v 1.19 2011/09/26 02:36:19 christos Exp $
 
 .include bsd.own.mk
 
-MODULE=		gdb6
+MODULE=		gdb
+GNUHOSTDIST=${.CURDIR}/../../external/gpl3/gdb/dist
 
 FIND_ARGS=	\! \( -type d -name sim -prune \)
 
@@ -16,8 +17,11 @@ INSTALL_TARGET=	install-gdb
 
 .include ${.CURDIR}/../Makefile.gnuhost
 
-CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -B${DESTDIR}/usr/lib/
-LDADDFLAGS=	-L${DESTDIR}/lib -L${DESTDIR}/usr/lib -Wl,-rpath-link,${DESTDIR}/usr/lib
+.if ${HAVE_GCC} = 45
+CCADDFLAGS=	--sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
+.else
+CCADDFLAGS=	${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.endif
 
 NEWCONFIGDIR?=	${.CURDIR}/../..
 MKNATIVE?=	${.CURDIR}/mknative-gdb

Index: src/tools/gdb/README.mknative
diff -u src/tools/gdb/README.mknative:1.4 src/tools/gdb/README.mknative:1.5
--- src/tools/gdb/README.mknative:1.4	Thu Nov 23 18:33:56 2006
+++ src/tools/gdb/README.mknative	Sun Sep 25 22:36:19 2011
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.4 2006/11/23 23:33:56 uwe Exp $
+$NetBSD: README.mknative,v 1.5 2011/09/26 02:36:19 christos Exp $
 
 This file describes how to use the cross-compiler to generate the
 native files for GDB on a target platform.
@@ -37,11 +37,11 @@ work.
native-to-NetBSD GDB on a cross host, and mknative pulls glue data
from this.
 
-   NOTE: this step writes files under src/gnu/usr.bin/gdb6, so you
+   NOTE: this step writes files under src/external/gpl3/gdb/bin/gdb, so you
need to do it in a writable src tree!
 
 7. Try out a full build using nbmake-MACHINE in
-   src/gnu/usr.bin/gdb6; the result should include a native GDB.
+   src/external/gpl3/bin/gdb; the result should include a native GDB.
 
 8. If all is well, commit the glue files and directories added to
-   src/gnu/usr.bin/gdb6.
+   src/external/gpl3/gdb/bin/gdb.

Index: src/tools/gdb/mknative-gdb
diff -u src/tools/gdb/mknative-gdb:1.2 src/tools/gdb/mknative-gdb:1.3
--- src/tools/gdb/mknative-gdb:1.2	Mon Feb 19 13:26:22 2007
+++ src/tools/gdb/mknative-gdb	Sun Sep 25 22:36:20 2011
@@ -1,8 +1,8 @@
 #!/bin/sh
-#	$NetBSD: mknative-gdb,v 1.2 2007/02/19 18:26:22 chs Exp $
+#	$NetBSD: mknative-gdb,v 1.3 2011/09/26 02:36:20 christos Exp $
 #
 # Shell script for generating all the constants needed for a native
-# platform build of src/gnu/dist/gdb6.
+# platform build of src/external/gpl3/gdb
 #
 
 # initialise
@@ -11,117 +11,139 @@ _TMPDIR=$2
 _TOP=$3
 _PLATFORM=$4
 _VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ 	]*,,'`
+_GDB=external/gpl3/gdb
 
 . $_TOP/tools/gcc/mknative.common
 
-# gnu/usr.bin/gdb6/bfd #
+# gdb/lib/libbfd #
 
 get_gdb_libbfd () {
-	mkdir -p $_TOP/gnu/usr.bin/gdb6/bfd/arch/$MACHINE_ARCH
+	local _BFD=$_GDB/lib/libbfd
+	mkdir -p $_TOP/$_BFD/arch/$MACHINE_ARCH
 
 	{
 		getvars bfd/Makefile \
 			libbfd_la_DEPENDENCIES libbfd_la_OBJECTS DEFS \
 			INCLUDES TDEFAULTS
-	} | write_mk gnu/usr.bin/gdb6/bfd/arch/$MACHINE_ARCH/defs.mk
+	} | write_mk $_BFD/arch/$MACHINE_ARCH/defs.mk
 
-	write_c gnu/usr.bin/gdb6/bfd/arch/$MACHINE_ARCH/bfd.h $_TMPDIR/bfd/bfd.h
-	write_c gnu/usr.bin/gdb6/bfd/arch/$MACHINE_ARCH/bfdver.h $_TMPDIR/bfd/bfdver.h
-
-	{
-		cat $_TMPDIR/bfd/config.h
-	} | write_c gnu/usr.bin/gdb6/bfd/arch/$MACHINE_ARCH/config.h
+	for i in bfd-in3.h bfd_stdint.h config.h bfd.h bfdver.h targmatch.h 
+	do
+	write_c $_BFD/arch/$MACHINE_ARCH/$i $_TMPDIR/bfd/$i
+	done
 }
 
-# gnu/lib/opcodes #
+# gdb/lib/libopcodes #
 
 get_gdb_libopcodes () {
-	mkdir -p $_TOP/gnu/usr.bin/gdb6/opcodes/arch/$MACHINE_ARCH
+	local _OPCODES=$_GDB/lib/libopcodes
+	mkdir -p $_TOP/$_OPCODES/arch/$MACHINE_ARCH
 
 	{
 		getvars opcodes/Makefile \
 			archdefs BFD_MACHINES libopcodes_la_SOURCES
-	} | write_mk gnu/usr.bin/gdb6/opcodes/arch/$MACHINE_ARCH/defs.mk
+	} | write_mk $_GDB/lib/libopcodes//arch/$MACHINE_ARCH/defs.mk
 
 	{
 		cat $_TMPDIR/opcodes/config.h
-	} | write_c gnu/usr.bin/gdb6/opcodes/arch/$MACHINE_ARCH/config.h
+	} | write_c $_OPCODES/arch/$MACHINE_ARCH/config.h
 }
 
-# gnu/lib/libiberty #
+# gdb/lib/libiberty #