CVS commit: src/external/gpl3/binutils/usr.bin/ld/arch

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Fri Oct  4 03:38:32 UTC 2013

Modified Files:
src/external/gpl3/binutils/usr.bin/ld/arch/armeb: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/earm: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/earmeb: defs.mk

Log Message:
regenerate with G_enable_initfini_array fix.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/armeb/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/ld/arch/earm/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/ld/arch/earmeb/defs.mk

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/usr.bin/ld/arch/armeb/defs.mk
diff -u src/external/gpl3/binutils/usr.bin/ld/arch/armeb/defs.mk:1.2 src/external/gpl3/binutils/usr.bin/ld/arch/armeb/defs.mk:1.3
--- src/external/gpl3/binutils/usr.bin/ld/arch/armeb/defs.mk:1.2	Mon Sep 26 09:33:46 2011
+++ src/external/gpl3/binutils/usr.bin/ld/arch/armeb/defs.mk	Fri Oct  4 03:38:32 2013
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp 
+# Generated from: 	NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_DEFS=-DHAVE_CONFIG_H
@@ -10,3 +10,4 @@ G_OFILES=ldgram.o ldlex-wrapper.o lexsup
 G_STRINGIFY=astring.sed
 G_TEXINFOS=ld.texinfo
 G_target_alias=armeb--netbsdelf
+G_enable_initfini_array=no

Index: src/external/gpl3/binutils/usr.bin/ld/arch/earm/defs.mk
diff -u src/external/gpl3/binutils/usr.bin/ld/arch/earm/defs.mk:1.1 src/external/gpl3/binutils/usr.bin/ld/arch/earm/defs.mk:1.2
--- src/external/gpl3/binutils/usr.bin/ld/arch/earm/defs.mk:1.1	Sun Aug  5 16:34:06 2012
+++ src/external/gpl3/binutils/usr.bin/ld/arch/earm/defs.mk	Fri Oct  4 03:38:32 2013
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp 
+# Generated from: 	NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_DEFS=-DHAVE_CONFIG_H
@@ -10,3 +10,4 @@ G_OFILES=ldgram.o ldlex-wrapper.o lexsup
 G_STRINGIFY=astring.sed
 G_TEXINFOS=ld.texinfo
 G_target_alias=arm--netbsdelf-eabi
+G_enable_initfini_array=no

Index: src/external/gpl3/binutils/usr.bin/ld/arch/earmeb/defs.mk
diff -u src/external/gpl3/binutils/usr.bin/ld/arch/earmeb/defs.mk:1.1 src/external/gpl3/binutils/usr.bin/ld/arch/earmeb/defs.mk:1.2
--- src/external/gpl3/binutils/usr.bin/ld/arch/earmeb/defs.mk:1.1	Fri Apr 26 11:01:31 2013
+++ src/external/gpl3/binutils/usr.bin/ld/arch/earmeb/defs.mk	Fri Oct  4 03:38:32 2013
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp 
+# Generated from: 	NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_DEFS=-DHAVE_CONFIG_H
@@ -10,3 +10,4 @@ G_OFILES=ldgram.o ldlex-wrapper.o lexsup
 G_STRINGIFY=astring.sed
 G_TEXINFOS=ld.texinfo
 G_target_alias=armeb--netbsdelf-eabi
+G_enable_initfini_array=no

CVS commit: src/external/gpl3/binutils/usr.bin/ld/arch/earmhf

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Fri Oct  4 01:41:20 UTC 2013

Modified Files:
src/external/gpl3/binutils/usr.bin/ld/arch/earmhf: defs.mk

Log Message:
regenerate for G_enable_initfini_array fix.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/defs.mk

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/usr.bin/ld/arch/earmhf/defs.mk
diff -u src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/defs.mk:1.1 src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/defs.mk:1.2
--- src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/defs.mk:1.1	Sun Feb  3 01:58:15 2013
+++ src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/defs.mk	Fri Oct  4 01:41:20 2013
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp 
+# Generated from: 	NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_DEFS=-DHAVE_CONFIG_H
@@ -10,3 +10,4 @@ G_OFILES=ldgram.o ldlex-wrapper.o lexsup
 G_STRINGIFY=astring.sed
 G_TEXINFOS=ld.texinfo
 G_target_alias=arm--netbsdelf-eabihf
+G_enable_initfini_array=no

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

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Fri Oct  4 01:09:06 UTC 2013

Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/coldfire: bfd-in3.h bfd.h
bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/earmeb: bfd-in3.h bfd.h bfdver.h
config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/m68k: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb: bfd-in3.h bfd.h
bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mipseb: bfd-in3.h bfd.h bfdver.h
config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sh3eb: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sh3el: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/coldfire: config.h
src/external/gpl3/gdb/lib/libdecnumber/arch/earmeb: config.h
src/external/gpl3/gdb/lib/libdecnumber/arch/m68k: config.h gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb: config.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb: config.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sh3eb: config.h gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sh3el: config.h gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/coldfire: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/earmeb: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/m68k: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/mipseb: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/powerpc: init.c
src/external/gpl3/gdb/lib/libgdb/arch/sh3eb: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/sh3el: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/x86_64: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/x86_64/build-gnulib: config.h
src/external/gpl3/gdb/lib/libiberty/arch/coldfire: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/earmeb: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/m68k: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/mips64eb: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/mipseb: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/sh3eb: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/sh3el: config.h defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/coldfire: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/earmeb: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/m68k: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/mips64eb: config.h defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/mipseb: config.h defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/sh3eb: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/sh3el: config.h
src/external/gpl3/gdb/lib/libreadline/arch/coldfire: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/earmeb: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/m68k: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/mips64eb: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/mipseb: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/sh3eb: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/sh3el: config.h defs.mk
Added Files:
src/external/gpl3/gdb/lib/libgdb/arch/coldfire: jit-reader.h
src/external/gpl3/gdb/lib/libgdb/arch/coldfire/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arch/earmeb: jit-reader.h
src/external/gpl3/gdb/lib/libgdb/arch/earmeb/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arch/m68k: jit-reader.h
src/external/gpl3/gdb/lib/libgdb/arch/m68k/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb: jit-reader.h
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arch/mipseb: jit-reader.h
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/build-gnulib: config.h
src/external/gpl3/gdb/lib/libgdb/arc

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

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Fri Oct  4 00:42:13 UTC 2013

Removed Files:
src/external/gpl3/gdb/dist/gdb: ada-exp.c ada-lex.c c-exp.c
cp-name-parser.c f-exp.c go-exp.c jv-exp.c m2-exp.c p-exp.c

Log Message:
delete generated files; they mess with r/o source trees and builds
that happen in src/tools/gdb.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 src/external/gpl3/gdb/dist/gdb/ada-exp.c \
src/external/gpl3/gdb/dist/gdb/c-exp.c \
src/external/gpl3/gdb/dist/gdb/cp-name-parser.c \
src/external/gpl3/gdb/dist/gdb/f-exp.c \
src/external/gpl3/gdb/dist/gdb/jv-exp.c \
src/external/gpl3/gdb/dist/gdb/m2-exp.c \
src/external/gpl3/gdb/dist/gdb/p-exp.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/gpl3/gdb/dist/gdb/ada-lex.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb/dist/gdb/go-exp.c

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

CVS commit: src/sys/arch/zaurus/conf

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 23:48:34 UTC 2013

Modified Files:
src/sys/arch/zaurus/conf: ldscript.zaurus

Log Message:
delete eh_frame gunk, which hopefully will make the kernel small enough to boot.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/ldscript.zaurus

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/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.3 src/sys/arch/zaurus/conf/ldscript.zaurus:1.4
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.3	Fri Jan 20 10:00:27 2012
+++ src/sys/arch/zaurus/conf/ldscript.zaurus	Thu Oct  3 19:48:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldscript.zaurus,v 1.3 2012/01/20 15:00:27 nonaka Exp $	*/
+/*	$NetBSD: ldscript.zaurus,v 1.4 2013/10/03 23:48:34 christos Exp $	*/
 
 OUTPUT_ARCH(arm)
 ENTRY(KERNEL_BASE_phys)
@@ -76,4 +76,10 @@ SECTIONS
   {
 KEEP(*(.note.netbsd.ident));
   }
+  /DISCARD/ : {
+*(.eh_frame_hdr)
+*(.eh_frame)
+*(.rel.eh_frame)
+*(.rela.eh_frame)
+  }
 }

CVS commit: src/external/gpl3/binutils

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Thu Oct  3 23:42:39 UTC 2013

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/vax: bfd_stdint.h
src/external/gpl3/binutils/usr.bin/gas/arch/arm: targ-env.h
src/external/gpl3/binutils/usr.bin/gas/arch/vax: config.h
src/external/gpl3/binutils/usr.bin/ld: Makefile
src/external/gpl3/binutils/usr.bin/ld/arch/alpha: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/arm: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/coldfire: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/earmhfeb: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/hppa: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/i386: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/m68000: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/m68k: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/mips64eb: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/mips64el: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/mipseb: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/mipsel: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/powerpc: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/sh3eb: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/sh3el: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/sparc: defs.mk
src/external/gpl3/binutils/usr.bin/ld/arch/sparc64: defs.mk

Log Message:
regenerate most of the binutils mknative files, and remove the
G_enable_initfini_array hack from ld/Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd_stdint.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/gas/arch/arm/targ-env.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/usr.bin/gas/arch/vax/config.h
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/alpha/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/arm/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/ld/arch/coldfire/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/ld/arch/earmhfeb/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/hppa/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/i386/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/m68000/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/m68k/defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/usr.bin/ld/arch/mips64eb/defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/usr.bin/ld/arch/mips64el/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/mipseb/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/mipsel/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/powerpc/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/sh3eb/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/sh3el/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/sparc/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/sparc64/defs.mk

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/lib/libbfd/arch/vax/bfd_stdint.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd_stdint.h:1.2 src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd_stdint.h:1.3
--- src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd_stdint.h:1.2	Sun Sep 29 14:20:35 2013
+++ src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd_stdint.h	Thu Oct  3 23:42:38 2013
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp  */
+/* Generated from: 	NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
 
 /* generated for  vax--netbsdelf-gcc (GCC) 4.1.3 20080704 (prerelease) (NetBSD nb3 2007) */

Index: src/external/gpl3/binutils/usr.bin/gas/arch/arm/targ-env.h
diff -u src/external/gpl3/binutils/usr.bin/gas/arch/arm/targ-env.h:1.1 src/external/gpl3/binutils/usr.bin/gas/arch/arm/targ-env.h:1.2
--- src/external/gpl3/binutils/usr.bin/gas/arch/arm/targ-env.h:1.1	Tue Aug 18 20:22:11 2009
+++ src/external/gpl3/binutils/usr.bin/gas/arch/arm/targ-env.h	Thu Oct  3 23:42:38 2013
@@ -1,4 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: mknative,v 1.9 2003/02/07 01:52:54 lukem Exp  */
+/* Ge

CVS commit: src/sys/arch/evbppc/explora

2013-10-03 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Thu Oct  3 22:28:38 UTC 2013

Modified Files:
src/sys/arch/evbppc/explora: explora_start.S

Log Message:
Binutils 2.23.2 doesn't do the right thing HI16/LO16 reloc using .
So do it manually to appease gas.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/explora_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/sys/arch/evbppc/explora/explora_start.S
diff -u src/sys/arch/evbppc/explora/explora_start.S:1.10 src/sys/arch/evbppc/explora/explora_start.S:1.11
--- src/sys/arch/evbppc/explora/explora_start.S:1.10	Mon Jun 20 19:56:11 2011
+++ src/sys/arch/evbppc/explora/explora_start.S	Thu Oct  3 22:28:38 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: explora_start.S,v 1.10 2011/06/20 19:56:11 matt Exp $	*/
+/*	$NetBSD: explora_start.S,v 1.11 2013/10/03 22:28:38 matt Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -126,8 +126,13 @@ _next:
 
 /* Jump into the staging area so we can remap the dram. */
 
+#if 0
 	lis	0,stage1reloc@h
 	ori	0,0,stage1reloc@l
+#else
+	lis	0,((stage1reloc >> 16) & 0x)
+	ori	0,0,(stage1reloc & 0x)
+#endif
 	mtlr	0
 	blr

CVS commit: src/sys/arch/sparc/conf

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Thu Oct  3 22:01:04 UTC 2013

Modified Files:
src/sys/arch/sparc/conf: Makefile.sparc

Log Message:
add -Wa,-Av8 to CFLAGS and AFLAGS to fix kernel build with binutils 2.23.2.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc/conf/Makefile.sparc

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/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.88 src/sys/arch/sparc/conf/Makefile.sparc:1.89
--- src/sys/arch/sparc/conf/Makefile.sparc:1.88	Mon Jan 17 18:11:10 2011
+++ src/sys/arch/sparc/conf/Makefile.sparc	Thu Oct  3 22:01:04 2013
@@ -1,4 +1,4 @@
-# 	$NetBSD: Makefile.sparc,v 1.88 2011/01/17 18:11:10 joerg Exp $
+# 	$NetBSD: Makefile.sparc,v 1.89 2013/10/03 22:01:04 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -34,7 +34,9 @@ GENASSYM_CONF=	${SPARC}/sparc/genassym.c
 # work around GCC (egcs-2.91.66) bug which is liable
 # to use FPU registers as temporaries:
 CFLAGS+=	-mno-fpu
+CFLAGS+=	-Wa,-Av8
 AFLAGS+=	-x assembler-with-cpp
+AFLAGS+=	-Wa,-Av8
 
 ##
 ## (3) libkern and compat

CVS commit: src/external/gpl3/gdb/lib/libgdb/arch/sparc

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 21:18:48 UTC 2013

Added Files:
src/external/gpl3/gdb/lib/libgdb/arch/sparc: jit-reader.h

Log Message:
forgot one


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc/jit-reader.h

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

Added files:

Index: src/external/gpl3/gdb/lib/libgdb/arch/sparc/jit-reader.h
diff -u /dev/null src/external/gpl3/gdb/lib/libgdb/arch/sparc/jit-reader.h:1.1
--- /dev/null	Thu Oct  3 17:18:48 2013
+++ src/external/gpl3/gdb/lib/libgdb/arch/sparc/jit-reader.h	Thu Oct  3 17:18:48 2013
@@ -0,0 +1,350 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+/* JIT declarations for GDB, the GNU Debugger.
+
+   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .  */
+
+#ifndef GDB_JIT_READER_H
+#define GDB_JIT_READER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Versioning information.  See gdb_reader_funcs.  */
+
+#define GDB_READER_INTERFACE_VERSION 1
+
+/* Readers must be released under a GPL compatible license.  To
+   declare that the reader is indeed released under a GPL compatible
+   license, invoke the macro GDB_DECLARE_GPL_COMPATIBLE in a source
+   file.  */
+
+#ifdef __cplusplus
+#define GDB_DECLARE_GPL_COMPATIBLE_READER   \
+  extern "C" {  \
+  extern int plugin_is_GPL_compatible (void);   \
+  extern int plugin_is_GPL_compatible (void)\
+  { \
+return 0;   \
+  } \
+  }
+
+#else
+
+#define GDB_DECLARE_GPL_COMPATIBLE_READER   \
+  extern int plugin_is_GPL_compatible (void);   \
+  extern int plugin_is_GPL_compatible (void)\
+  { \
+return 0;   \
+  }
+
+#endif
+
+/* Represents an address on the target system.  */
+
+typedef unsigned long long GDB_CORE_ADDR;
+
+/* Return status codes.  */
+
+enum gdb_status {
+  GDB_FAIL = 0,
+  GDB_SUCCESS = 1
+};
+
+struct gdb_object;
+struct gdb_symtab;
+struct gdb_block;
+struct gdb_symbol_callbacks;
+
+/* An array of these are used to represent a map from code addresses to line
+   numbers in the source file.  */
+
+struct gdb_line_mapping
+{
+  int line;
+  GDB_CORE_ADDR pc;
+};
+
+/* Create a new GDB code object.  Each code object can have one or
+   more symbol tables, each representing a compiled source file.  */
+
+typedef struct gdb_object *(gdb_object_open) (struct gdb_symbol_callbacks *cb);
+
+/* The callback used to create new symbol table.  CB is the
+   gdb_symbol_callbacks which the structure is part of.  FILE_NAME is
+   an (optionally NULL) file name to associate with this new symbol
+   table.
+
+   Returns a new instance to gdb_symtab that can later be passed to
+   gdb_block_new, gdb_symtab_add_line_mapping and gdb_symtab_close.  */
+
+typedef struct gdb_symtab *(gdb_symtab_open) (struct gdb_symbol_callbacks *cb,
+  struct gdb_object *obj,
+  const char *file_name);
+
+/* Creates a new block in a given symbol table.  A symbol table is a
+   forest of blocks, each block representing an code address range and
+   a corresponding (optionally NULL) NAME.  In case the block
+   corresponds to a function, the NAME passed should be the name of
+   the function.
+
+   If the new block to be created is a child of (i.e. is nested in)
+   another block, the parent block can be passed in PARENT.  SYMTAB is
+   the symbol table the new block is to belong in.  BEGIN, END is the
+   code address range the block corresponds to.
+
+   Returns a new instance of gdb_block, which, as of now, has no use.
+   Note that the gdb_block returned must not be freed by the
+   caller.  */
+
+typedef struct gdb_block *(gdb_block_open) (struct gdb_symbol_callbacks *cb,
+struct gdb_symtab *symtab,
+

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

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 21:08:49 UTC 2013

Modified Files:
src/external/gpl3/gdb/dist/gdb: sparcnbsd-nat.c

Log Message:
fix sparc


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/sparcnbsd-nat.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/sparcnbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c:1.4 src/external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c:1.5
--- src/external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c:1.4	Thu Oct  3 14:30:44 2013
+++ src/external/gpl3/gdb/dist/gdb/sparcnbsd-nat.c	Thu Oct  3 17:08:49 2013
@@ -51,7 +51,7 @@ supply_gregset (struct regcache *regcach
 void
 supply_fpregset (struct regcache *regcache, const fpregset_t *fpregs)
 {
-  sparc_supply_fpregset (regcache, -1, fpregs);
+  sparc_supply_fpregset (sparc_fpregset, regcache, -1, fpregs);
 }
 
 void
@@ -63,7 +63,7 @@ fill_gregset (const struct regcache *reg
 void
 fill_fpregset (const struct regcache *regcache, fpregset_t *fpregs, int regnum)
 {
-  sparc_collect_fpregset (regcache, regnum, fpregs);
+  sparc_collect_fpregset (sparc_fpregset, regcache, regnum, fpregs);
 }
 
 static int

CVS commit: src/sys/netinet6

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 20:27:55 UTC 2013

Modified Files:
src/sys/netinet6: ip6_output.c

Log Message:
check sockopt_get() error, from logan.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/ip6_output.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/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.154 src/sys/netinet6/ip6_output.c:1.155
--- src/sys/netinet6/ip6_output.c:1.154	Sat Jun 29 17:06:58 2013
+++ src/sys/netinet6/ip6_output.c	Thu Oct  3 16:27:55 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_output.c,v 1.154 2013/06/29 21:06:58 rmind Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.155 2013/10/03 20:27:55 christos Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.154 2013/06/29 21:06:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.155 2013/10/03 20:27:55 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1594,7 +1594,11 @@ else 	\
 break;
 			}
 
-			sockopt_get(sopt, optbuf, optbuflen);
+			error = sockopt_get(sopt, optbuf, optbuflen);
+			if (error) {
+free(optbuf, M_IP6OPT);
+break;
+			}
 			optp = &in6p->in6p_outputopts;
 			error = ip6_pcbopt(optname, optbuf, optbuflen,
 			optp, kauth_cred_get(), uproto);

CVS commit: src/external/bsd/bind

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 20:17:47 UTC 2013

Modified Files:
src/external/bsd/bind: Makefile.inc

Log Message:
simplify.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/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/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.17 src/external/bsd/bind/Makefile.inc:1.18
--- src/external/bsd/bind/Makefile.inc:1.17	Thu Oct  3 16:11:34 2013
+++ src/external/bsd/bind/Makefile.inc	Thu Oct  3 16:17:47 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.17 2013/10/03 20:11:34 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.18 2013/10/03 20:17:47 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -100,15 +100,9 @@ LDADD+= -lgssapi -lkrb5 -lhx509 -lheimnt
 DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
 	${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
 .else
-LIBDPLIBS+=	gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi \
-		krb5 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libkrb5 \
-		hx509 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libhx509 \
-		heimntlm ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libheimntlm \
-		heimbase ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libheimbase \
-		com_err ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libcom_err \
-		roken ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libroken \
-		asn1 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libasn1 \
-		wind ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libwind
+.for L in gssapi krb5 hx509 heimntlm heimbase com_err roken asn1 wind
+LIBDPLIBS+=	$L ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/lib$L
+.endfor
 .endif
 .endif
 .if !defined (LIB) || empty(LIB)

CVS commit: src/lib

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Thu Oct  3 20:02:58 UTC 2013

Modified Files:
src/lib: Makefile

Log Message:
move netpgp, lua and npf libraries to depenancy points after the
libraries they depend upon.  netpgp wants libz, lua wants libm,
and npf wants libnpf.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/lib/Makefile

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

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.207 src/lib/Makefile:1.208
--- src/lib/Makefile:1.207	Wed Sep 11 23:04:10 2013
+++ src/lib/Makefile	Thu Oct  3 20:02:58 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.207 2013/09/11 23:04:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.208 2013/10/03 20:02:58 mrg Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include 
@@ -56,11 +56,6 @@ SUBDIR+=	librumpclient
 SUBDIR+=	libskey
 .endif
 
-.if (${MKCRYPTO} != "no")
-SUBDIR+=	../crypto/external/bsd/netpgp/libmj
-SUBDIR+=	../crypto/external/bsd/netpgp/lib/verify
-.endif
-
 .if (${MKMDNS} != "no")
 SUBDIR+=	../external/apache2/mDNSResponder/lib
 .endif
@@ -73,7 +68,6 @@ SUBDIR+=	../external/bsd/libelf/lib
 SUBDIR+=	../external/bsd/liblzf/lib
 SUBDIR+=	../external/bsd/libpcap/lib
 
-SUBDIR+=	../external/mit/lua/lib
 SUBDIR+=	../external/mit/expat/lib
 
 SUBDIR+=	../external/public-domain/sqlite/lib
@@ -104,7 +98,13 @@ SUBDIR+=	../external/lgpl2/mpc/lib/libmp
 # 1st library dependency barrier 
 SUBDIR+=	.WAIT
 
+.if (${MKCRYPTO} != "no")
+SUBDIR+=	../crypto/external/bsd/netpgp/libmj
+SUBDIR+=	../crypto/external/bsd/netpgp/lib/verify # depends on libz
+.endif
+
 SUBDIR+=	../external/bsd/libdwarf/lib # depends on libelf
+SUBDIR+=	../external/mit/lua/lib # depends on libm
 SUBDIR+=	libcurses	# depends on libterminfo
 SUBDIR+=	libdm		# depends on libprop
 SUBDIR+=	libedit		# depends on libterminfo
@@ -121,7 +121,6 @@ SUBDIR+=	librumphijack	# depends on libr
 
 .if (${MKNPF} != "no")
 SUBDIR+=	libnpf		# depends on libprop
-SUBDIR+=	npf
 .endif
 
 .if (${MKCRYPTO} != "no")
@@ -161,6 +160,10 @@ SUBDIR+=	../external/gpl3/gcc/lib/libsup
 # 2nd library dependency barrier 
 SUBDIR+=	.WAIT
 
+.if (${MKNPF} != "no")
+SUBDIR+=	npf		# depends on libnpf
+.endif
+
 .if (${MKATF} != "no")
 SUBDIR+=	../external/bsd/atf/lib		# depends on libstdc++
 .endif

CVS commit: src/external/bsd/bind

2013-10-03 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Thu Oct  3 20:11:34 UTC 2013

Modified Files:
src/external/bsd/bind: Makefile.inc

Log Message:
use LIBDPLIBS instead of LDADD/DPADD to link against the heimdal
libraries.  fixes build issues.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/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/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.16 src/external/bsd/bind/Makefile.inc:1.17
--- src/external/bsd/bind/Makefile.inc:1.16	Sun Aug 11 14:42:04 2013
+++ src/external/bsd/bind/Makefile.inc	Thu Oct  3 20:11:34 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.16 2013/08/11 14:42:04 tsutsui Exp $
+#	$NetBSD: Makefile.inc,v 1.17 2013/10/03 20:11:34 mrg Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -94,10 +94,22 @@ CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
 CPPFLAGS+=-DGSSAPI
 .endif
 .if ${MKKERBEROS} != "no"
+.if !defined (LIB) || empty(LIB)
 LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
 	-lcom_err  -lroken -lasn1 -lwind
 DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
 	${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
+.else
+LIBDPLIBS+=	gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi \
+		krb5 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libkrb5 \
+		hx509 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libhx509 \
+		heimntlm ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libheimntlm \
+		heimbase ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libheimbase \
+		com_err ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libcom_err \
+		roken ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libroken \
+		asn1 ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libasn1 \
+		wind ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libwind
+.endif
 .endif
 .if !defined (LIB) || empty(LIB)
 LDADD+= -lcrypto -lcrypt

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

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 20:11:16 UTC 2013

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

Log Message:
fix bad merge


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/sh-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/sh-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/sh-tdep.c:1.3 src/external/gpl3/gdb/dist/gdb/sh-tdep.c:1.4
--- src/external/gpl3/gdb/dist/gdb/sh-tdep.c:1.3	Thu Oct  3 14:30:44 2013
+++ src/external/gpl3/gdb/dist/gdb/sh-tdep.c	Thu Oct  3 16:11:16 2013
@@ -643,12 +643,6 @@ sh_analyze_prologue (struct gdbarch *gdb
 	}
   else if (IS_FPUSH (inst))
 	{
-	  if (!have_fpscr)
-	{
-	  fpscr = get_frame_register_unsigned (fpscr_frame, FPSCR_REGNUM);
-	  have_fpscr = 1;
-	}
-
 	  if (fpscr & FPSCR_SZ)
 	{
 	  cache->sp_offset += 8;

CVS commit: src/sys/dev/usb

2013-10-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Oct  3 19:04:00 UTC 2013

Modified Files:
src/sys/dev/usb: usbdivar.h

Log Message:
Update a comment. Thanks mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/usb/usbdivar.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/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.106 src/sys/dev/usb/usbdivar.h:1.107
--- src/sys/dev/usb/usbdivar.h:1.106	Thu Oct  3 07:35:37 2013
+++ src/sys/dev/usb/usbdivar.h	Thu Oct  3 19:04:00 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdivar.h,v 1.106 2013/10/03 07:35:37 skrll Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.107 2013/10/03 19:04:00 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -325,7 +325,7 @@ void		usb_needs_reattach(usbd_device_han
 void		usb_schedsoftintr(struct usbd_bus *);
 
 /*
- * These macros help while not all host controllers are ported to the MP code.
+ * These macros reflect the current locking scheme.  They might change.
  */
 
 #define usbd_lock_pipe(p)	mutex_enter((p)->device->bus->lock)

CVS commit: src/tools/gdb

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:58:37 UTC 2013

Modified Files:
src/tools/gdb: mknative-gdb

Log Message:
more files needed


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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/mknative-gdb
diff -u src/tools/gdb/mknative-gdb:1.5 src/tools/gdb/mknative-gdb:1.6
--- src/tools/gdb/mknative-gdb:1.5	Sun Nov  6 14:46:12 2011
+++ src/tools/gdb/mknative-gdb	Thu Oct  3 14:58:37 2013
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gdb,v 1.5 2011/11/06 19:46:12 christos Exp $
+#	$NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/external/gpl3/gdb
@@ -100,7 +100,7 @@ get_gdb_libdecnumber () {
 
 get_gdb_libgdb () {
 	local _GDBP=$_GDB/lib/libgdb
-	mkdir -p $_TOP/$_GDBP/arch/$MACHINE_ARCH
+	mkdir -p $_TOP/$_GDBP/arch/$MACHINE_ARCH/build-gnulib
 
 	{
 		getvars gdb/Makefile \
@@ -111,7 +111,8 @@ get_gdb_libgdb () {
 #		INTERNAL_CFLAGS OBS \
 #		| write_mk $_GDB/bin/gdb/arch/$MACHINE_ARCH/gdbserver.mk
 
-	for i in config.h observer.h observer.inc version.c init.c xml-builtin.c
+	for i in config.h observer.h observer.inc version.c init.c \
+	xml-builtin.c build-gnulib/config.h jit-reader.h
 	do
 	write_c $_GDBP/arch/$MACHINE_ARCH/$i \
 		< $_TMPDIR/gdb/$i

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

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:39:33 UTC 2013

Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/arm: bfd-in3.h bfd.h bfd_stdint.h
bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/i386: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/m68000: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mipsel: bfd-in3.h bfd.h bfdver.h
config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc64: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/vax: bfd-in3.h bfd.h bfdver.h
config.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/x86_64: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/arm: config.h gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/i386: config.h gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/m68000: config.h gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mipsel: config.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64: config.h gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/vax: config.h
src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64: config.h gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/arm: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/i386: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/m68000: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/mipsel: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/sparc64: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/vax: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/x86_64: config.h defs.mk init.c
observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libiberty/arch/arm: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/i386: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/m68000: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/mipsel: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/sparc64: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/vax: config.h defs.mk
src/external/gpl3/gdb/lib/libiberty/arch/x86_64: config.h defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/arm: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/i386: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/m68000: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/mipsel: config.h defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/sparc64: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/vax: config.h
src/external/gpl3/gdb/lib/libopcodes/arch/x86_64: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/arm: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/i386: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/m68000: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/mipsel: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/sparc64: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/vax: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/x86_64: config.h defs.mk

Log Message:
regen...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd-in3.h \
src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd.h \
src/external/gpl3/gdb/lib/libbfd/arch/arm/bfdver.h \
src/external/gpl3/gdb/lib/libbfd/arch/arm/config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/lib/libbfd/arch/arm/bfd_stdint.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/lib/libbfd/arch/arm/defs.mk \
src/external/gpl3/gdb/lib/libbfd/arch/arm/targmatch.h
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libbfd/arch/i386/bfd-in3.h \
src/external/gpl3/gdb/lib/libbfd/arch/i386/bfd.h \
src/external/gpl3/gdb/lib/libbfd/arch/i386/bfdver.h \
src/external/gpl3/gdb/lib/libbfd/arch/i386/config.h \
src/external/gpl3/gdb/lib/libbfd/arch/i386/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libbfd/arch/i386/bfd_stdint.h \
src/external/gpl3/gdb/lib/libbfd/arch/i386/targmatch.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl

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

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:30:46 UTC 2013

Modified Files:
src/external/gpl3/gdb/dist: config.guess config.sub
src/external/gpl3/gdb/dist/bfd: bfdio.c config.bfd elf.c elf32-i386.c
netbsd-core.c
src/external/gpl3/gdb/dist/bfd/doc: Makefile.in bfd.info
src/external/gpl3/gdb/dist/gdb: alphabsd-nat.c alphanbsd-tdep.c
amd64bsd-nat.c amd64nbsd-nat.c amd64nbsd-tdep.c armnbsd-nat.c
bsd-kvm.c configure configure.ac configure.host configure.tgt
hppa-tdep.c hppa-tdep.h hppanbsd-nat.c hppanbsd-tdep.c
i386bsd-nat.c i386bsd-nat.h i386nbsd-nat.c i386nbsd-tdep.c
inf-ptrace.c m68kbsd-nat.c m68kbsd-tdep.c mips-tdep.h
mipsnbsd-nat.c mipsnbsd-tdep.c nbsd-thread.c objfiles.c
ppcnbsd-nat.c regcache.c sh-tdep.c shnbsd-nat.c shnbsd-tdep.c
sparc-nat.c sparc64nbsd-nat.c sparcnbsd-nat.c ui-file.c user-regs.c
vaxbsd-nat.c
src/external/gpl3/gdb/dist/gdb/tui: tui-stack.c
src/external/gpl3/gdb/dist/opcodes: configure configure.in
src/external/gpl3/gdb/dist/readline: display.c rltty.c terminal.c
xmalloc.h
src/external/gpl3/gdb/dist/sim: configure
src/external/gpl3/gdb/dist/sim/common: callback.c
src/external/gpl3/gdb/dist/sim/mips: Makefile.in
src/external/gpl3/gdb/dist/sim/mn10300: Makefile.in
src/external/gpl3/gdb/dist/sim/ppc: emul_netbsd.c events.c
src/external/gpl3/gdb/dist/sim/v850: Makefile.in
Removed Files:
src/external/gpl3/gdb/dist/bfd: coff-pmac.c xcoff-target.h
src/external/gpl3/gdb/dist/cgen/cpu: ChangeLog cris.cpu frv.cpu frv.opc
iq10.cpu iq2000.cpu iq2000.opc iq2000m.cpu lm32.cpu lm32.opc
m32c.cpu m32c.opc m32r.cpu m32r.opc mt.cpu mt.opc sh.cpu sh.opc
sh64-compact.cpu sh64-media.cpu simplify.inc xc16x.cpu xc16x.opc
src/external/gpl3/gdb/dist/config: mh-interix
src/external/gpl3/gdb/dist/gdb: call-cmds.h cc-with-index.sh
copyright.sh gdb_assert.h gdb_dirent.h gdb_locale.h gdb_stat.h
gdb_string.h gdb_thread_db.h gdb_wait.h gdbinit.in i386-stub.c
libunwind-frame.c libunwind-frame.h m32r-stub.c m68k-stub.c
objc-exp.c objc-exp.y ravenscar-sparc-thread.c sh-stub.c
sparc-stub.c stamp-h1 vec.c vec.h wrapper.c wrapper.h
src/external/gpl3/gdb/dist/gdb/gnulib: Makefile.am dummy.c memchr.c
memchr.valgrind memmem.c stddef.in.h stdint.in.h str-two-way.h
string.in.h wchar.in.h
src/external/gpl3/gdb/dist/gdb/gnulib/extra: arg-nonnull.h c++defs.h
warn-on-use.h
src/external/gpl3/gdb/dist/gdb/gnulib/m4: 00gnulib.m4 extensions.m4
gnulib-cache.m4 gnulib-common.m4 gnulib-comp.m4 gnulib-tool.m4
include_next.m4 longlong.m4 memchr.m4 memmem.m4 mmap-anon.m4
multiarch.m4 onceonly.m4 stddef_h.m4 stdint.m4 string_h.m4
warn-on-use.m4 wchar_h.m4 wchar_t.m4 wint_t.m4
src/external/gpl3/gdb/dist/gdb/osf-share: README cma_attr.h
cma_deb_core.h cma_debug_client.h cma_errors.h cma_handle.h
cma_init.h cma_list.h cma_mutex.h cma_sched.h cma_semaphore_defs.h
cma_sequence.h cma_stack.h cma_stack_int.h cma_tcb_defs.h
cma_util.h
src/external/gpl3/gdb/dist/gdb/osf-share/AT386: cma_thread_io.h
src/external/gpl3/gdb/dist/gdb/osf-share/HP800: cma_thread_io.h
src/external/gpl3/gdb/dist/gdb/osf-share/RIOS: cma_thread_io.h
src/external/gpl3/gdb/dist/gdb/testsuite: .gdbinit
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.base: regs.exp
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.hp/gdb.aCC: exception.exp
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.mi: mi2-basics.exp
mi2-break.exp mi2-cli.exp mi2-console.exp mi2-disassemble.exp
mi2-eval.exp mi2-file.exp mi2-hack-cli.exp mi2-pthreads.exp
mi2-read-memory.exp mi2-regs.exp mi2-return.exp mi2-simplerun.exp
mi2-stack.exp mi2-stepi.exp mi2-syn-frame.exp mi2-until.exp
mi2-var-block.exp mi2-var-cmd.exp mi2-var-display.exp mi2-watch.exp
src/external/gpl3/gdb/dist/gdb/testsuite/gdb.threads: attachstop-mt.c
attachstop-mt.exp step.c step.exp step2.exp
src/external/gpl3/gdb/dist/gdb/tui: tui-main.c
src/external/gpl3/gdb/dist/readline/doc: inc-hist.texinfo
src/external/gpl3/gdb/dist/sim/common: common.m4
src/external/gpl3/gdb/dist/sim/m32c: configure.in
src/external/gpl3/gdb/dist/sim/rx: configure.in

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/config.guess
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/config.sub
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/bfd/bfdio.c \
src/external/gpl3/gdb/dist/bfd/elf.c \

CVS commit: src/doc

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:24:28 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new gdb


To generate a diff of this commit:
cvs rdiff -u -r1.1057 -r1.1058 src/doc/3RDPARTY
cvs rdiff -u -r1.1850 -r1.1851 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1057 src/doc/3RDPARTY:1.1058
--- src/doc/3RDPARTY:1.1057	Sun Sep 29 10:05:05 2013
+++ src/doc/3RDPARTY	Thu Oct  3 14:24:28 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1057 2013/09/29 14:05:05 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1058 2013/10/03 18:24:28 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -390,8 +390,8 @@ for GCC 4.5:
 		gcc/testsuite/gnat.dg
 
 Package:	gdb
-Version:	6.5/7.3.1
-Current Vers:	7.6
+Version:	7.6.1
+Current Vers:	7.6.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gdb/
 Home Page:	http://www.gnu.org/software/gdb/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1850 src/doc/CHANGES:1.1851
--- src/doc/CHANGES:1.1850	Sun Sep 29 10:05:05 2013
+++ src/doc/CHANGES	Thu Oct  3 14:24:28 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1850 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1851 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -284,3 +284,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	dhcpcd(8): Import dhcpcd-6.1.0 [roy 20130920]
 	postfix(1): Import version 2.10.2 [tron 20130925]
 	binutils: updated to FSF binutils 2.23.2.  [christos 20130929]
+	gdb(1): Updated to 7.6.1.  [christos 20131003]
+

CVS commit: src/external/gpl3/gdb/lib/libgdb

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:07:32 UTC 2013

Added Files:
src/external/gpl3/gdb/lib/libgdb: common-agent.c

Log Message:
work around 2 kluges:
1. having the same named file in two different directories (agent.c)
2. trying to override fnmatch twice (easier than making configure mechanism
   to not overwrite).


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/common-agent.c

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

Added files:

Index: src/external/gpl3/gdb/lib/libgdb/common-agent.c
diff -u /dev/null src/external/gpl3/gdb/lib/libgdb/common-agent.c:1.1
--- /dev/null	Thu Oct  3 14:07:32 2013
+++ src/external/gpl3/gdb/lib/libgdb/common-agent.c	Thu Oct  3 14:07:32 2013
@@ -0,0 +1,11 @@
+#include "common/agent.c"
+
+/* XXX
+ * Gdb wants to use its internal fnmatch that does wide characters overriding
+ * the one from libiberty. This is madness, let's use ours!
+ */
+int
+gnu_fnmatch(const char *pattern, const char *string, int flags)
+{
+	return fnmatch(pattern, string, flags);
+}

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

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:06:11 UTC 2013

Modified Files:
src/external/gpl3/gdb/bin/gdb: Makefile

Log Message:
need more includes and libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/bin/gdb/Makefile

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/bin/gdb/Makefile
diff -u src/external/gpl3/gdb/bin/gdb/Makefile:1.6 src/external/gpl3/gdb/bin/gdb/Makefile:1.7
--- src/external/gpl3/gdb/bin/gdb/Makefile:1.6	Sun Aug  4 19:41:43 2013
+++ src/external/gpl3/gdb/bin/gdb/Makefile	Thu Oct  3 14:06:11 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2013/08/04 23:41:43 matt Exp $
+#	$NetBSD: Makefile,v 1.7 2013/10/03 18:06:11 christos Exp $
 
 .include 
 .include "../Makefile.inc"
@@ -12,6 +12,7 @@ SRCS=		gdb.c
 CPPFLAGS+=	-I${.CURDIR} \
 		-I${GDBARCHDIR} \
 		-I${DIST}/gdb \
+		-I${DIST}/gdb/common \
 		-I${DIST}/gdb/config \
 		-I${DIST}/include/opcode \
 		-I${DIST} \
@@ -80,8 +81,8 @@ DPADD+=	${LIBOPCODESDIR}/libopcodes.a \
 	${LIBTERMINFO} \
 	${LIBIBERTYDIR}/libiberty.a
 
-LDADD+=		-lz -lcurses -lintl -lm -lkvm
-DPADD+=		${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM}
+LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm
+DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM}
 
 LDADD+=-lpthread_dbg

CVS commit: src/external/gpl3/gdb/bin/gdbtui

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:05:48 UTC 2013

Added Files:
src/external/gpl3/gdb/bin/gdbtui: tui-main.c

Log Message:
use the main from the previous version of gdb because it is now gone


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/bin/gdbtui/tui-main.c

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

Added files:

Index: src/external/gpl3/gdb/bin/gdbtui/tui-main.c
diff -u /dev/null src/external/gpl3/gdb/bin/gdbtui/tui-main.c:1.1
--- /dev/null	Thu Oct  3 14:05:48 2013
+++ src/external/gpl3/gdb/bin/gdbtui/tui-main.c	Thu Oct  3 14:05:48 2013
@@ -0,0 +1,37 @@
+/* Main function for TUI gdb.
+
+   Copyright (C) 2002, 2004, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .  */
+
+#include "defs.h"
+#include "main.h"
+#include "gdb_string.h"
+#include "interps.h"
+
+int
+main (int argc, char **argv)
+{
+  struct captured_main_args args;
+
+  memset (&args, 0, sizeof args);
+  args.argc = argc;
+  args.argv = argv;
+  args.use_windows = 0;
+  args.interpreter_p = INTERP_TUI;
+  return gdb_main (&args);
+}

CVS commit: src/external/gpl3/gdb/bin/gdbtui

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 18:05:27 UTC 2013

Modified Files:
src/external/gpl3/gdb/bin/gdbtui: Makefile

Log Message:
need more libraries and directories


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/bin/gdbtui/Makefile

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/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.4 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.5
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.4	Sun Aug  4 19:41:43 2013
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile	Thu Oct  3 14:05:27 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2013/08/04 23:41:43 matt Exp $
+#	$NetBSD: Makefile,v 1.5 2013/10/03 18:05:27 christos Exp $
 
 .include "../Makefile.inc"
 
@@ -11,6 +11,7 @@ SRCS=		tui-main.c
 CPPFLAGS+=	-I${.CURDIR} \
 		-I${GDBARCHDIR} \
 		-I${DIST}/gdb \
+		-I${DIST}/gdb/common \
 		-I${DIST}/gdb/config \
 		-I${DIST}/include/opcode \
 		-I${DIST} \
@@ -66,8 +67,8 @@ DPADD+=	${LIBOPCODESDIR}/libopcodes.a \
 	${LIBTERMINFO} \
 	${LIBIBERTYDIR}/libiberty.a
 
-LDADD+=		-lz -lcurses -lintl -lm -lkvm
-DPADD+=		${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM}
+LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm
+DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM}
 
 LDADD+=-lpthread_dbg

CVS commit: src/external/gpl3/binutils/usr.bin/ld/arch/vax

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 15:43:18 UTC 2013

Modified Files:
src/external/gpl3/binutils/usr.bin/ld/arch/vax: defs.mk

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/ld/arch/vax/defs.mk

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/usr.bin/ld/arch/vax/defs.mk
diff -u src/external/gpl3/binutils/usr.bin/ld/arch/vax/defs.mk:1.2 src/external/gpl3/binutils/usr.bin/ld/arch/vax/defs.mk:1.3
--- src/external/gpl3/binutils/usr.bin/ld/arch/vax/defs.mk:1.2	Sun Sep 25 07:10:46 2011
+++ src/external/gpl3/binutils/usr.bin/ld/arch/vax/defs.mk	Thu Oct  3 11:43:18 2013
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-binutils,v 1.8 2011/09/25 04:00:58 christos Exp 
+# Generated from: 	NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_DEFS=-DHAVE_CONFIG_H
@@ -10,3 +10,4 @@ G_OFILES=ldgram.o ldlex-wrapper.o lexsup
 G_STRINGIFY=astring.sed
 G_TEXINFOS=ld.texinfo
 G_target_alias=vax--netbsdelf
+G_enable_initfini_array=no

CVS commit: src/sys/arch/amiga/conf

2013-10-03 Thread Radoslaw Kujawa 
Module Name:src
Committed By:   rkujawa
Date:   Thu Oct  3 13:40:26 UTC 2013

Modified Files:
src/sys/arch/amiga/conf: WSCONS

Log Message:
Enable USB keyboard and mouse in the WSCONS kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/conf/WSCONS

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/amiga/conf/WSCONS
diff -u src/sys/arch/amiga/conf/WSCONS:1.66 src/sys/arch/amiga/conf/WSCONS:1.67
--- src/sys/arch/amiga/conf/WSCONS:1.66	Fri Aug 17 20:11:38 2012
+++ src/sys/arch/amiga/conf/WSCONS	Thu Oct  3 13:40:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.66 2012/08/17 20:11:38 abs Exp $
+# $NetBSD: WSCONS,v 1.67 2013/10/03 13:40:26 rkujawa Exp $
 
 # GENERIC with wscons(4)
 #
@@ -15,8 +15,14 @@ options 	FONT_VT220ISO8x16
 
 wskbd0		at kbd0 console ?
 
+ukbd*		at uhidev? reportid ?  
+wskbd*		at ukbd? console ?
+
 wsmouse*	at ms?
 
+ums*		at uhidev? reportid ? 
+wsmouse*	at ums?
+
 no grfcc0	at mainbus0
 no grfrt0	at zbus0
 no grfrh0	at zbus0

CVS commit: src/sys/dev

2013-10-03 Thread KIYOHARA Takashi 
Module Name:src
Committed By:   kiyohara
Date:   Thu Oct  3 13:23:03 UTC 2013

Modified Files:
src/sys/dev/ic: com.c comreg.h comvar.h ns16550reg.h
src/sys/dev/marvell: com_mv.c

Log Message:
Revirt 'Move the Marvell extension to com_mv.c' at Sun Sep 1 04:51:24 UTC 2013.
  build test only.


To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/sys/dev/ic/com.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/comreg.h
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/ic/comvar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/ns16550reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/com_mv.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/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.316 src/sys/dev/ic/com.c:1.317
--- src/sys/dev/ic/com.c:1.316	Thu Sep 12 12:54:39 2013
+++ src/sys/dev/ic/com.c	Thu Oct  3 13:23:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.316 2013/09/12 12:54:39 martin Exp $ */
+/* $NetBSD: com.c,v 1.317 2013/10/03 13:23:03 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.316 2013/09/12 12:54:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.317 2013/10/03 13:23:03 kiyohara Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -247,7 +247,17 @@ void	com_kgdb_putc(void *, int);
 #define	COM_REG_16550	{ \
 	com_data, com_data, com_dlbl, com_dlbh, com_ier, com_iir, com_fifo, \
 	com_efr, com_lcr, com_mcr, com_lsr, com_msr }
+/* 16750-specific register set, additional UART status register */
+#define	COM_REG_16750	{ \
+	com_data, com_data, com_dlbl, com_dlbh, com_ier, com_iir, com_fifo, \
+	com_efr, com_lcr, com_mcr, com_lsr, com_msr, 0, 0, 0, 0, 0, 0, 0, 0, \
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, com_usr }
+
+#ifdef COM_16750
+const bus_size_t com_std_map[32] = COM_REG_16750;
+#else
 const bus_size_t com_std_map[16] = COM_REG_16550;
+#endif /* COM_16750 */
 #endif /* COM_REGMAP */
 
 #define	COMUNIT_MASK	0x7
@@ -405,7 +415,10 @@ com_attach_subr(struct com_softc *sc)
 			(u_long)comcons_info.regs.cr_iobase);
 		}
 
-		sc->sc_lcr = cflag2lcr(comcons_info.cflag);
+#ifdef COM_16750
+		/* Use in comintr(). */
+ 		sc->sc_lcr = cflag2lcr(comcons_info.cflag);
+#endif
 
 		/* Make sure the console is always "hardwired". */
 		delay(1);			/* wait for output to finish */
@@ -1511,19 +1524,19 @@ com_iflush(struct com_softc *sc)
 		aprint_error_dev(sc->sc_dev, "com_iflush timeout %02x\n", reg);
 #endif
 
-	if (sc->sc_type == COM_TYPE_ARMADAXP) {
-		uint8_t fifo;
-		/*
-		 * Reset all Rx/Tx FIFO, preserve current FIFO length.
-		 * This should prevent triggering busy interrupt while
-		 * manipulating divisors.
-		 */
-		fifo = CSR_READ_1(regsp, COM_REG_FIFO) & (FIFO_TRIGGER_1 |
-		FIFO_TRIGGER_4 | FIFO_TRIGGER_8 | FIFO_TRIGGER_14);
-		CSR_WRITE_1(regsp, COM_REG_FIFO,
-		fifo | FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST);
-		delay(100);
-	}
+#ifdef COM_16750
+	uint8_t fifo;
+	/*
+	 * Reset all Rx/Tx FIFO, preserve current FIFO length.
+	 * This should prevent triggering busy interrupt while
+	 * manipulating divisors.
+	 */
+	fifo = CSR_READ_1(regsp, COM_REG_FIFO) & (FIFO_TRIGGER_1 |
+	FIFO_TRIGGER_4 | FIFO_TRIGGER_8 | FIFO_TRIGGER_14);
+	CSR_WRITE_1(regsp, COM_REG_FIFO, fifo | FIFO_ENABLE | FIFO_RCV_RST |
+	FIFO_XMT_RST);
+	delay(100);
+#endif
 }
 
 void
@@ -1951,6 +1964,26 @@ comintr(void *arg)
 	mutex_spin_enter(&sc->sc_lock);
 	iir = CSR_READ_1(regsp, COM_REG_IIR);
 
+	/* Handle ns16750-specific busy interrupt. */
+#ifdef COM_16750
+	int timeout;
+	if ((iir & IIR_BUSY) == IIR_BUSY) {
+		for (timeout = 1;
+		(CSR_READ_1(regsp, COM_REG_USR) & 0x1) != 0; timeout--)
+			if (timeout <= 0) {
+aprint_error_dev(sc->sc_dev,
+"timeout while waiting for BUSY interrupt "
+"acknowledge\n");
+mutex_spin_exit(&sc->sc_lock);
+return (0);
+			}
+
+		CSR_WRITE_1(regsp, COM_REG_LCR, sc->sc_lcr);
+		iir = CSR_READ_1(regsp, COM_REG_IIR);
+	}
+#endif /* COM_16750 */
+
+
 	if (ISSET(iir, IIR_NOPEND)) {
 		mutex_spin_exit(&sc->sc_lock);
 		return (0);

Index: src/sys/dev/ic/comreg.h
diff -u src/sys/dev/ic/comreg.h:1.21 src/sys/dev/ic/comreg.h:1.22
--- src/sys/dev/ic/comreg.h:1.21	Tue Sep  3 15:32:55 2013
+++ src/sys/dev/ic/comreg.h	Thu Oct  3 13:23:03 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: comreg.h,v 1.21 2013/09/03 15:32:55 jmcneill Exp $	*/
+/*	$NetBSD: comreg.h,v 1.22 2013/10/03 13:23:03 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -56,8 +56,6 @@
 /* interrupt identification register */
 #define	IIR_IMASK	0xf
 #define	IIR_RXTOUT	0xc
-/* ARMADAXP's ns16550 ports have extra value in this register */
-#define IIR_BUSY	0x7	/* Busy indicator */
 #define	IIR_RLS		0x6	/* Line status change */
 #define	IIR_RXRDY	0x4	/* Receiver ready */
 #define	IIR_TXRDY	0x2	/* Transmitter ready */
@@

CVS commit: src/sys/dev/ic

2013-10-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Oct  3 13:19:24 UTC 2013

Modified Files:
src/sys/dev/ic: sl811hs.c

Log Message:
Remove incorrect KASSERT.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/ic/sl811hs.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/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.44 src/sys/dev/ic/sl811hs.c:1.45
--- src/sys/dev/ic/sl811hs.c:1.44	Wed Oct  2 23:27:50 2013
+++ src/sys/dev/ic/sl811hs.c	Thu Oct  3 13:19:24 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: sl811hs.c,v 1.44 2013/10/02 23:27:50 skrll Exp $	*/
+/*	$NetBSD: sl811hs.c,v 1.45 2013/10/03 13:19:24 skrll Exp $	*/
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.44 2013/10/02 23:27:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.45 2013/10/03 13:19:24 skrll Exp $");
 
 #include "opt_slhci.h"
 
@@ -1497,8 +1497,6 @@ slhci_callback_entry(void *arg)
 
 	sc = (struct slhci_softc *)arg;
 
-	KASSERT(mutex_owned(&sc->sc_lock));
-
 	mutex_enter(&sc->sc_intr_lock);
 	t = &sc->sc_transfers;
 	DLOG(D_SOFT, "callback_entry flags %#x", t->flags, 0,0,0);

CVS commit: src/sys/arch/arm/pic

2013-10-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Oct  3 12:53:29 UTC 2013

Modified Files:
src/sys/arch/arm/pic: armadaxp_splfuncs.c

Log Message:
Update to reflect the move of armadaxpreg.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/pic/armadaxp_splfuncs.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/arm/pic/armadaxp_splfuncs.c
diff -u src/sys/arch/arm/pic/armadaxp_splfuncs.c:1.2 src/sys/arch/arm/pic/armadaxp_splfuncs.c:1.3
--- src/sys/arch/arm/pic/armadaxp_splfuncs.c:1.2	Wed May 29 23:50:35 2013
+++ src/sys/arch/arm/pic/armadaxp_splfuncs.c	Thu Oct  3 12:53:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadaxp_splfuncs.c,v 1.2 2013/05/29 23:50:35 rkujawa Exp $	*/
+/*	$NetBSD: armadaxp_splfuncs.c,v 1.3 2013/10/03 12:53:29 skrll Exp $	*/
 /***
 Copyright (C) Marvell International Ltd. and its affiliates
 
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_splfuncs.c,v 1.2 2013/05/29 23:50:35 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_splfuncs.c,v 1.3 2013/10/03 12:53:29 skrll Exp $");
 
 #define _INTR_PRIVATE
 
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: armadaxp_spl
 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include

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

2013-10-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Oct  3 12:06:04 UTC 2013

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

Log Message:
Apply rev 1.5 again, from Matt Thomas:
Fix problem leading to triggering a BFD assert: when allocating space in the
got, do not allocate slots for symbols without default visibility.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.9
--- src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.8	Sun Sep 29 14:03:29 2013
+++ src/external/gpl3/binutils/dist/bfd/elf32-vax.c	Thu Oct  3 12:06:04 2013
@@ -1314,6 +1314,7 @@ elf_vax_instantiate_got_entries (struct 
 
   if (!elf_hash_table (info)->dynamic_sections_created
   || (info->shared && info->symbolic)
+  || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
   || h->forced_local)
 {
   h->got.refcount = 0;
@@ -1334,9 +1335,7 @@ elf_vax_instantiate_got_entries (struct 
 
   dyn = elf_hash_table (info)->dynamic_sections_created;
   /* Allocate space in the .got and .rela.got sections.  */
-  if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-	  && (info->shared
-	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+  if (info->shared || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
 	{
 	  sgot->size += 4;
 	  srelgot->size += sizeof (Elf32_External_Rela);

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

2013-10-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Oct  3 10:45:57 UTC 2013

Modified Files:
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c

Log Message:
The R_SPARC_L44 relocation type is documented to be truncating and
calculated as "(S + A) & 0xfff" - so while it (usually) sets a "imm13" field
in the opcode, only 12 bits of the calculated value can be used.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/libexec/ld.elf_so/arch/sparc64/mdreloc.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/sparc64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.54 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.55
--- src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.54	Mon Sep 23 21:00:35 2013
+++ src/libexec/ld.elf_so/arch/sparc64/mdreloc.c	Thu Oct  3 10:45:57 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdreloc.c,v 1.54 2013/09/23 21:00:35 martin Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.55 2013/10/03 10:45:57 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 Eduardo Horvath.
@@ -32,7 +32,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.54 2013/09/23 21:00:35 martin Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.55 2013/10/03 10:45:57 martin Exp $");
 #endif /* not lint */
 
 #include 
@@ -183,7 +183,7 @@ static const long reloc_target_bitmask[]
 	_BM(7), _BM(5), _BM(6),		/* _7, _5, _6 */
 	-1, -1,/* DISP64, PLT64 */
 	_BM(22), _BM(13),		/* HIX22, LOX10 */
-	_BM(22), _BM(10), _BM(13),	/* H44, M44, L44 */
+	_BM(22), _BM(10), _BM(12),	/* H44, M44, L44 */
 	-1, -1, _BM(16),		/* REGISTER, UA64, UA16 */
 #undef _BM
 };

CVS commit: src/sys/dev/usb

2013-10-03 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Oct  3 07:35:37 UTC 2013

Modified Files:
src/sys/dev/usb: usb_subr.c usbdi.c usbdivar.h

Log Message:
Simply the code now that all (real) HCDs provide a get_lock method.


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/usb/usbdivar.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/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.194 src/sys/dev/usb/usb_subr.c:1.195
--- src/sys/dev/usb/usb_subr.c:1.194	Thu Sep 26 07:25:31 2013
+++ src/sys/dev/usb/usb_subr.c	Thu Oct  3 07:35:37 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.194 2013/09/26 07:25:31 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.195 2013/10/03 07:35:37 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.194 2013/09/26 07:25:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.195 2013/10/03 07:35:37 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -780,8 +780,6 @@ usbd_setup_pipe_flags(usbd_device_handle
 void
 usbd_kill_pipe(usbd_pipe_handle pipe)
 {
-	int s;
-
 	usbd_abort_pipe(pipe);
 	usbd_lock_pipe(pipe);
 	pipe->methods->close(pipe);

Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.157 src/sys/dev/usb/usbdi.c:1.158
--- src/sys/dev/usb/usbdi.c:1.157	Thu Sep 26 10:31:02 2013
+++ src/sys/dev/usb/usbdi.c	Thu Oct  3 07:35:37 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.157 2013/09/26 10:31:02 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.158 2013/10/03 07:35:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.157 2013/09/26 10:31:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.158 2013/10/03 07:35:37 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -228,7 +228,6 @@ usbd_open_pipe_intr(usbd_interface_handl
 usbd_status
 usbd_close_pipe(usbd_pipe_handle pipe)
 {
-	int s;
 
 #ifdef DIAGNOSTIC
 	if (pipe == NULL) {
@@ -263,7 +262,6 @@ usbd_transfer(usbd_xfer_handle xfer)
 	usb_dma_t *dmap = &xfer->dmabuf;
 	usbd_status err;
 	unsigned int size, flags;
-	int s;
 
 	DPRINTFN(5,("usbd_transfer: xfer=%p, flags=%#x, pipe=%p, running=%d\n",
 		xfer, xfer->flags, pipe, pipe->running));
@@ -324,15 +322,9 @@ usbd_transfer(usbd_xfer_handle xfer)
 
 		err = 0;
 		if ((flags & USBD_SYNCHRONOUS_SIG) != 0) {
-			if (pipe->device->bus->lock)
-err = cv_wait_sig(&xfer->cv, pipe->device->bus->lock);
-			else
-err = tsleep(xfer, PZERO|PCATCH, "usbsyn", 0);
+			err = cv_wait_sig(&xfer->cv, pipe->device->bus->lock);
 		} else {
-			if (pipe->device->bus->lock)
-cv_wait(&xfer->cv, pipe->device->bus->lock);
-			else
-err = tsleep(xfer, PRIBIO, "usbsyn", 0);
+			cv_wait(&xfer->cv, pipe->device->bus->lock);
 		}
 		if (err) {
 			if (!xfer->done)
@@ -557,7 +549,6 @@ usbd_status
 usbd_abort_pipe(usbd_pipe_handle pipe)
 {
 	usbd_status err;
-	int s;
 	usbd_xfer_handle intrxfer = pipe->intrxfer;
 
 #ifdef DIAGNOSTIC
@@ -762,7 +753,7 @@ usbd_ar_pipe(usbd_pipe_handle pipe)
 {
 	usbd_xfer_handle xfer;
 
-	KASSERT(pipe->device->bus->lock == NULL || mutex_owned(pipe->device->bus->lock));
+	KASSERT(mutex_owned(pipe->device->bus->lock));
 
 	DPRINTFN(2,("usbd_ar_pipe: pipe=%p\n", pipe));
 #ifdef USB_DEBUG
@@ -797,8 +788,7 @@ usb_transfer_complete(usbd_xfer_handle x
 	DPRINTFN(5, ("usb_transfer_complete: pipe=%p xfer=%p status=%d "
 		 "actlen=%d\n", pipe, xfer, xfer->status, xfer->actlen));
 
-	KASSERT(polling || pipe->device->bus->lock == NULL ||
-	mutex_owned(pipe->device->bus->lock));
+	KASSERT(polling || mutex_owned(pipe->device->bus->lock));
 
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_ONQU) {
@@ -870,7 +860,7 @@ usb_transfer_complete(usbd_xfer_handle x
 
 	if (repeat) {
 		if (xfer->callback) {
-			if (pipe->device->bus->lock && !polling)
+			if (!polling)
 mutex_exit(pipe->device->bus->lock);
 
 			if (!(pipe->flags & USBD_MPSAFE))
@@ -879,14 +869,14 @@ usb_transfer_complete(usbd_xfer_handle x
 			if (!(pipe->flags & USBD_MPSAFE))
 KERNEL_UNLOCK_ONE(curlwp);
 
-			if (pipe->device->bus->lock && !polling)
+			if (!polling)
 mutex_enter(pipe->device->bus->lock);
 		}
 		pipe->methods->done(xfer);
 	} else {
 		pipe->methods->done(xfer);
 		if (xfer->callback) {
-			if (pipe->device->bus->lock && !polling)
+			if (!polling)
 mutex_exit(pipe->device->bus->lock);
 
 			if (!(pipe->flags & USBD_MPSAFE))
@@ -895,16 +885,13 @@ usb_transfer_complete(usbd_xfer_handle x
 			if (!(pipe->flags & USBD_MPSAFE))
 KERNEL_UNLOCK_ONE(curlwp);
 
-			if (pipe->device->bus->lock && !polling)
+			if (!polling)
 mutex_enter

CVS commit: src/share/man/man4

2013-10-03 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Thu Oct  3 07:09:54 UTC 2013

Modified Files:
src/share/man/man4: tcp.4

Log Message:
Clarify that setting the initial window size complies to RFC 3390.
>From Loganaden Vevindron .


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/share/man/man4/tcp.4

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

Modified files:

Index: src/share/man/man4/tcp.4
diff -u src/share/man/man4/tcp.4:1.25 src/share/man/man4/tcp.4:1.26
--- src/share/man/man4/tcp.4:1.25	Mon Mar 22 18:58:31 2010
+++ src/share/man/man4/tcp.4	Thu Oct  3 07:09:54 2013
@@ -1,4 +1,4 @@
-.\"	$NetBSD: tcp.4,v 1.25 2010/03/22 18:58:31 joerg Exp $
+.\"	$NetBSD: tcp.4,v 1.26 2013/10/03 07:09:54 mbalmer Exp $
 .\"	$FreeBSD: tcp.4,v 1.11.2.16 2004/02/16 22:21:47 bms Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -297,7 +297,7 @@ Default maximum segment size (MSS)
 .It
 SYN cache parameters
 .It
-Initial window size
+Initial window size (RFC 3390)
 .It
 Hughes/Touch/Heidemann Congestion Window Monitoring algorithm
 .It