$NetBSD$

--- libstdc++-v3/config/os/generic/error_constants.h.orig	Thu Apr  9 23:23:07 2009
+++ libstdc++-v3/config/os/generic/error_constants.h
@@ -51,12 +51,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 #endif
 
       broken_pipe = 				EPIPE,
+#ifdef _GLIBCXX_HAVE_ECONNABORTED
       connection_aborted = 			ECONNABORTED,
+#endif
       connection_already_in_progress = 		EALREADY,
       connection_refused = 			ECONNREFUSED,
       connection_reset = 			ECONNRESET,
       cross_device_link = 			EXDEV,
+#ifdef _GLIBCXX_HAVE_EDESTADDRREQ
       destination_address_required = 		EDESTADDRREQ,
+#endif
       device_or_resource_busy = 		EBUSY,
       directory_not_empty = 			ENOTEMPTY,
       executable_format_error = 		ENOEXEC,
@@ -79,7 +83,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       is_a_directory = 				EISDIR,
       message_size = 				EMSGSIZE,
       network_down = 				ENETDOWN,
+#ifdef _GLIBCXX_HAVE_ENETRESET
       network_reset = 				ENETRESET,
+#endif
       network_unreachable = 			ENETUNREACH,
       no_buffer_space = 			ENOBUFS,
       no_child_process = 			ECHILD,
@@ -94,7 +100,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       no_message_available = 			ENODATA, 
 #endif
 
+#ifdef _GLIBCXX_HAVE_ENOMSG
       no_message = 				ENOMSG, 
+#endif
       no_protocol_option = 			ENOPROTOOPT,
       no_space_on_device = 			ENOSPC,
 
--- libjava/configure.host.orig	2011-02-25 16:07:42.000000000 +0100
+++ libjava/configure.host
@@ -310,6 +310,9 @@
   *-*-freebsd*)
 	slow_pthread_self=
 	;;
+  *-*-netbsd*)
+	slow_pthread_self=
+	;;
   *-mingw*)
         libgcj_flags="${libgcj_flags} -fno-omit-frame-pointer"
   	# FIXME: win32_exception_handler( ) in win32.cc does not do the