Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

81 files changed, 7832 insertions, 2765 deletions

diff --git a/libjava/classpath/native/jni/.cvsignore b/libjava/classpath/native/jni/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/Makefile.am b/libjava/classpath/native/jni/Makefile.am
index 2b205826c1b..1105407993f 100644
--- a/libjava/classpath/native/jni/Makefile.am
+++ b/libjava/classpath/native/jni/Makefile.am
@@ -1,7 +1,7 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 if CREATE_CORE_JNI_LIBRARIES
-  JNIDIRS = java-io java-lang java-net java-nio java-util
+  JNIDIRS = native-lib java-io java-lang java-net java-nio java-util
 endif
 
 if CREATE_ALSA_LIBRARIES
@@ -32,7 +32,8 @@ SUBDIRS = classpath $(JNIDIRS) \
   $(ALSADIR) $(DSSIDIR) $(GTKDIR) $(CLASSPATH_QT_PEER_DIR) $(XMLJDIR) \
   $(CLASSPATH_GCONF_PEER_DIR)
 DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
-               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi
+               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi \
+               native-lib
 
 all-local:
 	cd $(top_srcdir) && $(SHELL) ./scripts/check_jni_methods.sh
diff --git a/libjava/classpath/native/jni/Makefile.in b/libjava/classpath/native/jni/Makefile.in
index 61ae690f4da..705bb8107ed 100644
--- a/libjava/classpath/native/jni/Makefile.in
+++ b/libjava/classpath/native/jni/Makefile.in
@@ -41,12 +41,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -165,6 +167,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -286,9 +290,8 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
-@CREATE_CORE_JNI_LIBRARIES_TRUE@JNIDIRS = java-io java-lang java-net java-nio java-util
+@CREATE_CORE_JNI_LIBRARIES_TRUE@JNIDIRS = native-lib java-io java-lang java-net java-nio java-util
 @CREATE_ALSA_LIBRARIES_TRUE@ALSADIR = midi-alsa
 @CREATE_DSSI_LIBRARIES_TRUE@DSSIDIR = midi-dssi
 @CREATE_GTK_PEER_LIBRARIES_TRUE@GTKDIR = gtk-peer
@@ -300,7 +303,8 @@ SUBDIRS = classpath $(JNIDIRS) \
   $(CLASSPATH_GCONF_PEER_DIR)
 
 DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
-               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi
+               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi \
+               native-lib
 
 all: all-recursive
 
diff --git a/libjava/classpath/native/jni/classpath/.cvsignore b/libjava/classpath/native/jni/classpath/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/classpath/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/classpath/Makefile.in b/libjava/classpath/native/jni/classpath/Makefile.in
index 435bb6d1647..681f5c1950e 100644
--- a/libjava/classpath/native/jni/classpath/Makefile.in
+++ b/libjava/classpath/native/jni/classpath/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -175,6 +177,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -296,7 +300,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 
 # Header needed for jawt implementations such as the one found in ../gtk-peer.
diff --git a/libjava/classpath/native/jni/classpath/classpath_jawt.h b/libjava/classpath/native/jni/classpath/classpath_jawt.h
index 32a04dc5cd7..35c734a57a3 100644
--- a/libjava/classpath/native/jni/classpath/classpath_jawt.h
+++ b/libjava/classpath/native/jni/classpath/classpath_jawt.h
@@ -54,6 +54,7 @@ jint     classpath_jawt_get_awt_version (void);
 Display* classpath_jawt_get_default_display (JNIEnv* env, jobject canvas);
 Drawable classpath_jawt_get_drawable (JNIEnv* env, jobject canvas);
 VisualID classpath_jawt_get_visualID (JNIEnv* env, jobject canvas);
+int      classpath_jawt_get_depth (JNIEnv* env, jobject canvas);
 jint     classpath_jawt_lock (void);
 void     classpath_jawt_unlock (void);
 
diff --git a/libjava/classpath/native/jni/classpath/jcl.c b/libjava/classpath/native/jni/classpath/jcl.c
index e28c6631bad..cd3f5161d06 100644
--- a/libjava/classpath/native/jni/classpath/jcl.c
+++ b/libjava/classpath/native/jni/classpath/jcl.c
@@ -1,5 +1,5 @@
 /* jcl.c
-   Copyright (C) 1998, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,6 +48,57 @@ exception statement from your version. */
   #endif
 #endif
 
+/*
+ * Cached Pointer class info.
+ */
+static jclass rawDataClass = NULL;
+static jfieldID rawData_fid = NULL;
+static jmethodID rawData_mid = NULL;
+
+/*
+ * JNI OnLoad constructor.
+ */
+JNIEXPORT jint JNICALL
+JNI_OnLoad (JavaVM *vm, void *reserved __attribute__((unused)))
+{
+  JNIEnv *env;
+  void *envp;
+
+  if ((*vm)->GetEnv (vm, &envp, JNI_VERSION_1_4) != JNI_OK)
+    {
+      return JNI_VERSION_1_4;
+    }
+  env = (JNIEnv *) envp;
+#if SIZEOF_VOID_P == 8
+  rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer64");
+  if (rawDataClass != NULL)
+    rawDataClass = (*env)->NewGlobalRef (env, rawDataClass);
+
+  if (rawDataClass != NULL)
+    {
+      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "J");
+      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(J)V");
+    }
+#else
+#if SIZEOF_VOID_P == 4
+  rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer32");
+  if (rawDataClass != NULL)
+    rawDataClass = (*env)->NewGlobalRef (env, rawDataClass);
+
+  if (rawDataClass != NULL)
+    {
+      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "I");
+      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(I)V");
+    }
+#else
+#error "Pointer size is not supported."
+#endif /* SIZEOF_VOID_P == 4 */
+#endif /* SIZEOF_VOID_P == 8 */
+
+  return JNI_VERSION_1_4;
+}
+
+
 JNIEXPORT void JNICALL
 JCL_ThrowException (JNIEnv * env, const char *className, const char *errMsg)
 {
@@ -183,78 +234,17 @@ JCL_FindClass (JNIEnv * env, const char *className)
 
 
 /*
- * Build a Pointer object. The function caches the class type 
+ * Build a Pointer object.
  */
 
-static jclass rawDataClass;
-static jfieldID rawData_fid;
-static jmethodID rawData_mid;
-
 JNIEXPORT jobject JNICALL
 JCL_NewRawDataObject (JNIEnv * env, void *data)
 {
-  if (rawDataClass == NULL)
+  if (rawDataClass == NULL || rawData_mid == NULL)
     {
-      jclass tmp;
-#if SIZEOF_VOID_P == 8
-      rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer64");
-      if (rawDataClass == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal class");
-	  return NULL;
-	}
-
-      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(J)V");
-      if (rawData_mid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal constructor");
-	  return NULL;
-	}
-
-      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "J");
-      if (rawData_fid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal field");
-	  return NULL;
-	}
-#else
-      rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer32");
-      if (rawDataClass == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal class");
-	  return NULL;
-	}
-
-      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(I)V");
-      if (rawData_mid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal constructor");
-	  return NULL;
-	}
-
-      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "I");
-      if (rawData_fid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal field");
-	  return NULL;
-	}
-
-#endif
-      tmp = (*env)->NewGlobalRef (env, rawDataClass);
-      if (tmp == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to create an internal global ref");
-	  return NULL;
-	}
-      (*env)->DeleteLocalRef(env, rawDataClass);
-      rawDataClass = tmp;
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "Pointer class was not properly initialized");
+      return NULL;
     }
 
 #if SIZEOF_VOID_P == 8
@@ -267,6 +257,13 @@ JCL_NewRawDataObject (JNIEnv * env, void *data)
 JNIEXPORT void * JNICALL
 JCL_GetRawData (JNIEnv * env, jobject rawdata)
 {
+  if (rawData_fid == NULL)
+    {
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "Pointer class was not properly initialized");
+      return NULL;
+    }
+
 #if SIZEOF_VOID_P == 8
   return (void *) (*env)->GetLongField (env, rawdata, rawData_fid);
 #else
diff --git a/libjava/classpath/native/jni/gconf-peer/.cvsignore b/libjava/classpath/native/jni/gconf-peer/.cvsignore
new file mode 100644
index 00000000000..799fc97856d
--- /dev/null
+++ b/libjava/classpath/native/jni/gconf-peer/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+*.lo
+*.la
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/gconf-peer/GConfNativePeer.c b/libjava/classpath/native/jni/gconf-peer/GConfNativePeer.c
index a442226cae6..42986c33a89 100644
--- a/libjava/classpath/native/jni/gconf-peer/GConfNativePeer.c
+++ b/libjava/classpath/native/jni/gconf-peer/GConfNativePeer.c
@@ -108,8 +108,8 @@ static jclass get_jlist_reference (JNIEnv * env, jclass jlist_class);
  * Method:    init_class
  * Signature: ()V
  */
-JNIEXPORT void
-JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class
+JNIEXPORT void JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class
   (JNIEnv *env, jclass clazz)
 {
   if (reference_count == 0)
@@ -127,8 +127,8 @@ JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class
  * Method:    init_id_chache
  * Signature: ()V
  */
-JNIEXPORT void
-JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
+JNIEXPORT void JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
   (JNIEnv *env, jclass clazz __attribute__ ((unused)))
 {
   reference_count++;
@@ -157,16 +157,19 @@ JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
 
 /*
  * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
- * Method:    gconf_client_gconf_client_all_keys
+ * Method:    gconf_client_all_keys
  * Signature: (Ljava/lang/String;)Ljava/util/List;
  */
 JNIEXPORT jobject JNICALL
-Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1all_1keys
   (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
 {
   /* TODO: check all the calls to gdk_threads_enter/leave */
   
   const char *dir = NULL;
+  const char *_val = NULL;
+  const char *_val_unescaped = NULL;
+  
   GError *err = NULL;
   GSList *entries = NULL;
   GSList *tmp;
@@ -208,12 +211,18 @@ Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all
   tmp = entries;
   while (tmp != NULL)
     {
-      const char *_val = gconf_entry_get_key (tmp->data);
+      _val = gconf_entry_get_key (tmp->data);
       _val = strrchr (_val, '/');
       ++_val;
+      
+      _val_unescaped = gconf_unescape_key (_val, strlen (_val));
+      
       (*env)->CallBooleanMethod (env, jlist, jlist_add_id,
-				 (*env)->NewStringUTF (env, _val));
+				 (*env)->NewStringUTF (env, _val_unescaped));
+         
       tmp = g_slist_next (tmp);
+      
+      g_free ((gpointer) _val_unescaped);
     }
 
   /* clean up things */
@@ -226,14 +235,17 @@ Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all
 
 /*
  * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
- * Method:    gconf_client_gconf_client_all_nodes
+ * Method:    gconf_client_all_nodes
  * Signature: (Ljava/lang/String;)Ljava/util/List;
  */
 JNIEXPORT jobject JNICALL
-Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1all_1nodes
   (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
 {
   const char *dir = NULL;
+  const char *_val = NULL;
+  const char *_val_unescaped = NULL;
+  
   GError *err = NULL;
   GSList *entries = NULL;
   GSList *tmp;
@@ -274,12 +286,19 @@ Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all
   tmp = entries;
   while (tmp != NULL)
     {
-      const char *_val = tmp->data;
+      _val = tmp->data;
+      
       _val = strrchr (_val, '/');
       ++_val;
+      
+      _val_unescaped = gconf_unescape_key (_val, strlen (_val));
+      
       (*env)->CallBooleanMethod (env, jlist, jlist_add_id,
-				 (*env)->NewStringUTF (env, _val));
+				 (*env)->NewStringUTF (env, _val_unescaped));
+      
       tmp = g_slist_next (tmp);
+      
+      g_free ((gpointer) _val_unescaped);
     }
 
   /* clean up things */
@@ -421,7 +440,7 @@ Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1set_1string
   gdk_threads_leave ();
   if (err != NULL)
   	{
-	  g_error_free (err);
+      g_error_free (err);
       err = NULL;
       result = JNI_FALSE;
   	}
@@ -511,8 +530,8 @@ Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists
  * Method:    finalize_class
  * Signature: ()V
  */
-JNIEXPORT void
-JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
+JNIEXPORT void JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
   (JNIEnv *env, jclass clazz __attribute__ ((unused)))
 {
   if (reference_count == 0)
@@ -534,6 +553,74 @@ JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
   reference_count--;
 }
 
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jstring JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key
+  (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring plain)
+{
+  const char *escaped = NULL;
+  const char *_plain = NULL;
+  jstring result = NULL;
+  
+  _plain = JCL_jstring_to_cstring (env, plain);
+  if (_plain == NULL)
+    {
+      return NULL;
+    }
+
+  gdk_threads_enter ();
+  escaped = gconf_escape_key (_plain, strlen (_plain));
+  gdk_threads_leave ();
+  
+  JCL_free_cstring (env, plain, _plain);
+  /* check for NULL, if so prevent string creation */
+  if (escaped != NULL)
+    {
+      result = (*env)->NewStringUTF (env, escaped);
+      g_free ((gpointer) escaped);
+    }
+  
+  return result;
+}
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jstring JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key
+  (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring escaped)
+{
+  const char *plain = NULL;
+  const char *_escaped = NULL;
+  jstring result = NULL;
+  
+  _escaped = JCL_jstring_to_cstring (env, escaped);
+  if (_escaped == NULL)
+    {
+      return NULL;
+    }
+
+  gdk_threads_enter ();
+  plain = gconf_unescape_key (_escaped, strlen (_escaped));
+  gdk_threads_leave ();
+  
+  JCL_free_cstring (env, escaped, _escaped);
+  /* check for NULL, if so prevent string creation */
+  if (plain != NULL)
+    {
+      result = (*env)->NewStringUTF (env, plain);
+      g_free ((gpointer) plain);
+    }
+  
+  return result;
+}
+
 /* ***** END: NATIVE FUNCTIONS ***** */
 
 /* ***** PRIVATE FUNCTIONS IMPLEMENTATION ***** */
diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.in b/libjava/classpath/native/jni/gconf-peer/Makefile.in
index 2e95e299d60..2e4074c778f 100644
--- a/libjava/classpath/native/jni/gconf-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -185,6 +187,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -306,7 +310,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libgconfpeer.la
 libgconfpeer_la_SOURCES = GConfNativePeer.c
diff --git a/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c b/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c
index 6dfbfcce4a9..62ffa1395ea 100644
--- a/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c
@@ -42,7 +42,8 @@ exception statement from your version. */
 #include <gtk/gtk.h>
 
 static GtkWidget * get_widget (GtkWidget *widget);
-  
+static void connect_signals_for_widget (GtkWidget *widget);
+                                         
 #define ACTION_COPY 1
 #define ACTION_MOVE 2
 #define ACTION_COPY_OR_MOVE  3
@@ -63,21 +64,35 @@ static GtkWidget * get_widget (GtkWidget *widget);
 #define AWT_HAND_CURSOR 12
 #define AWT_MOVE_CURSOR 13
 
+static jmethodID dragEnterID;
+static jmethodID dragExitID;
+static jmethodID dragDropEndID;
+static jmethodID dragMouseMovedID;
+static jmethodID dragOverID;
+static jmethodID dragActionChangedID;
+static jmethodID acceptDragID;
+static jmethodID rejectDragID;
+static jmethodID acceptDropID;
+static jmethodID rejectDropID;
+static jmethodID dropCompleteID;
+
 GtkWidget *widget;
+GtkWidget *tgt;
+jobject *gref;
+jobject javaObj;
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_create 
   (JNIEnv *env, jobject obj, jobject comp)
-{
-  void *ptr;
-  
+{  
   gdk_threads_enter ();
-  
+ 
+  javaObj = obj;
   NSA_SET_GLOBAL_REF (env, obj);  
   NSA_SET_GLOBAL_REF (env, comp);
   
-  ptr = NSA_GET_PTR (env, comp);
-  widget = get_widget (GTK_WIDGET (ptr));
+  gref = NSA_GET_PTR (env, comp);
+  widget = get_widget (GTK_WIDGET (gref));
 
   gdk_threads_leave ();
 }
@@ -93,6 +108,7 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor
 
   gdk_threads_enter ();
 
+  javaObj = obj;
   ptr = NSA_GET_GLOBAL_REF (env, obj);
   
   switch (type)
@@ -158,31 +174,81 @@ JNIEXPORT void JNICALL
 Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_connectSignals 
   (JNIEnv *env, jobject obj, jobject comp)
 {
-  jobject *gref;
-  void *ptr;
+  jclass gtkdragsourcecontextpeer;
+  jclass gtkdroptargetcontextpeer;
   
   gdk_threads_enter ();
 
-  ptr = NSA_GET_GLOBAL_REF (env, obj);
+  javaObj = obj;
   gref = NSA_GET_GLOBAL_REF (env, comp);
+  
+  connect_signals_for_widget (widget);
+
+  gtkdragsourcecontextpeer = (*cp_gtk_gdk_env())->FindClass (cp_gtk_gdk_env(),
+                         "gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer");
+  
+  dragEnterID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), 
+                                            gtkdragsourcecontextpeer,
+                                               "dragEnter", "(II)V");
+  dragExitID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), 
+                                            gtkdragsourcecontextpeer,
+                                               "dragExit", "(III)V");
+  dragDropEndID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), 
+                                             gtkdragsourcecontextpeer,
+                                               "dragDropEnd", "(IZII)V");
+  dragMouseMovedID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(),
+                                             gtkdragsourcecontextpeer,
+                                               "dragMouseMoved", "(II)V");
+  dragOverID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(),
+                                             gtkdragsourcecontextpeer,
+                                               "dragOver", "(II)V");
+  dragActionChangedID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(),
+                                             gtkdragsourcecontextpeer,
+                                               "dragActionChanged", "(II)V");
+
+
+  gtkdroptargetcontextpeer = (*cp_gtk_gdk_env())->FindClass (cp_gtk_gdk_env(),
+                         "gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer");
+                         
+  acceptDragID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), 
+                                            gtkdroptargetcontextpeer,
+                                               "acceptDrag", "(I)V");
+  rejectDragID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), 
+                                            gtkdroptargetcontextpeer,
+                                               "rejectDrag", "()V");
+  acceptDropID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(), 
+                                             gtkdroptargetcontextpeer,
+                                               "acceptDrop", "(I)V");
+  rejectDropID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(),
+                                             gtkdroptargetcontextpeer,
+                                               "rejectDrop", "()V");
+  dropCompleteID = (*cp_gtk_gdk_env())->GetMethodID (cp_gtk_gdk_env(),
+                                             gtkdroptargetcontextpeer,
+                                               "dropComplete", "(Z)V");
+  
+  gdk_threads_leave ();
+}
+
+static void
+connect_signals_for_widget (GtkWidget *w)
+{
+  /* FIXME: Not implemented. */
+  w = NULL;
+}
+
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_setTarget
+  (JNIEnv *env, jobject obj, jobject target)
+{
+  void *ptr;
+  
+  gdk_threads_enter ();
+  
+  javaObj = obj;
+  ptr = NSA_GET_PTR (env, target);
+  tgt = get_widget (GTK_WIDGET (ptr));
+  connect_signals_for_widget (tgt);
 
- /* Uncomment when needed:
-  g_signal_connect (G_OBJECT (widget), "drag_motion",
-                    G_CALLBACK (drag_motion_cb), *gref);
-  g_signal_connect (G_OBJECT (widget), "drag_begin",
-                    G_CALLBACK (drag_begin_cb), *gref);
-  g_signal_connect (G_OBJECT (widget), "drag_end",
-                    G_CALLBACK (drag_end_cb), *gref);
-  g_signal_connect (G_OBJECT (widget), "drag_data_get",
-                    G_CALLBACK (drag_data_get_cb), *gref);
-  g_signal_connect (G_OBJECT (widget), "drag_drop",
-                    G_CALLBACK (drag_drop_cb), *gref);
-  g_signal_connect (G_OBJECT (widget), "drag_data_delete",
-                    G_CALLBACK (drag_data_delete_cb), *gref);
-  g_signal_connect (G_OBJECT (widget), "drag_data_received",
-                    G_CALLBACK (drag_data_received_cb), *gref);
-  */
-                                 
   gdk_threads_leave ();
 }
 
@@ -200,7 +266,8 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag
   GdkDragAction action = GDK_ACTION_DEFAULT;
   
   gdk_threads_enter ();
-
+  
+  javaObj = obj;
   ptr = NSA_GET_GLOBAL_REF (env, obj);
 
   data = (*env)->GetStringUTFChars (env, target, NULL);
@@ -225,7 +292,9 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag
       action = GDK_ACTION_DEFAULT;
     }
 
-  gtk_drag_highlight (widget);
+  gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_ALL, tar,
+                                             sizeof (tar) / sizeof (GtkTargetEntry),
+                                             action);
   context = gtk_drag_begin (widget, 
              gtk_target_list_new (tar, sizeof (tar) / sizeof (GtkTargetEntry)), 
              action, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK, event);
@@ -235,6 +304,11 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag
     image = cp_gtk_image_get_pixbuf (env, img);
     gtk_drag_set_icon_pixbuf (context, image, x, y);
   }
+  
+  if (tgt != NULL)
+    gtk_drag_dest_set (tgt, GTK_DEST_DEFAULT_ALL, tar,
+                                        sizeof (tar) / sizeof (GtkTargetEntry),
+                                         action);
 
   gdk_event_free (event);
   (*env)->ReleaseStringUTFChars (env, target, data);  
diff --git a/libjava/classpath/native/jni/gtk-peer/Makefile.am b/libjava/classpath/native/jni/gtk-peer/Makefile.am
index b7e84144e7d..f925c18afce 100644
--- a/libjava/classpath/native/jni/gtk-peer/Makefile.am
+++ b/libjava/classpath/native/jni/gtk-peer/Makefile.am
@@ -1,4 +1,8 @@
-nativeexeclib_LTLIBRARIES = libgtkpeer.la
+## GCJ LOCAL: install this library in GCJ's versioned library
+## directory
+gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
+gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
+gcjversionedlib_LTLIBRARIES = libgtkpeer.la
 
 # GTK JNI sources.
 libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
@@ -49,9 +53,13 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
 			gtk_jawt.c \
 			gtkpeer.h
 
+## GCJ LOCAL: encode the library path and  use GCJ's library version
+libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
+	-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
+
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
 		       $(top_builddir)/native/jni/classpath/jcl.lo
-libgtkpeer_la_LDFLAGS = -avoid-version
+## libgtkpeer_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
diff --git a/libjava/classpath/native/jni/gtk-peer/Makefile.in b/libjava/classpath/native/jni/gtk-peer/Makefile.in
index fbc85e99295..a7f523f2d8a 100644
--- a/libjava/classpath/native/jni/gtk-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gtk-peer/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -59,9 +61,9 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
-nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(gcjversionedlibdir)"
+gcjversionedlibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(gcjversionedlib_LTLIBRARIES)
 libgtkpeer_la_DEPENDENCIES =  \
 	$(top_builddir)/native/jni/classpath/native_state.lo \
 	$(top_builddir)/native/jni/classpath/jcl.lo
@@ -224,6 +226,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -345,9 +349,10 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
-nativeexeclib_LTLIBRARIES = libgtkpeer.la
+gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
+gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
+gcjversionedlib_LTLIBRARIES = libgtkpeer.la
 
 # GTK JNI sources.
 libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
@@ -398,10 +403,12 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
 			gtk_jawt.c \
 			gtkpeer.h
 
+libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
+	-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
+
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
 		       $(top_builddir)/native/jni/classpath/jcl.lo
 
-libgtkpeer_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
 
@@ -446,35 +453,35 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
+install-gcjversionedlibLTLIBRARIES: $(gcjversionedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
-	@list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
+	test -z "$(gcjversionedlibdir)" || $(mkdir_p) "$(DESTDIR)$(gcjversionedlibdir)"
+	@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
+	    echo " $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gcjversionedlibdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gcjversionedlibdir)/$$f"; \
 	  else :; fi; \
 	done
 
-uninstall-nativeexeclibLTLIBRARIES:
+uninstall-gcjversionedlibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativeexeclibdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativeexeclibdir)/$$p"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gcjversionedlibdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gcjversionedlibdir)/$$p"; \
 	done
 
-clean-nativeexeclibLTLIBRARIES:
-	-test -z "$(nativeexeclib_LTLIBRARIES)" || rm -f $(nativeexeclib_LTLIBRARIES)
-	@list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
+clean-gcjversionedlibLTLIBRARIES:
+	-test -z "$(gcjversionedlib_LTLIBRARIES)" || rm -f $(gcjversionedlib_LTLIBRARIES)
+	@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libgtkpeer.la: $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_DEPENDENCIES) 
-	$(LINK) -rpath $(nativeexeclibdir) $(libgtkpeer_la_LDFLAGS) $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(gcjversionedlibdir) $(libgtkpeer_la_LDFLAGS) $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -635,7 +642,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(nativeexeclibdir)"; do \
+	for dir in "$(DESTDIR)$(gcjversionedlibdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -664,7 +671,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-nativeexeclibLTLIBRARIES \
+clean-am: clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -683,9 +690,9 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-gcjversionedlibLTLIBRARIES
 
-install-exec-am: install-nativeexeclibLTLIBRARIES
+install-exec-am:
 
 install-info: install-info-am
 
@@ -711,20 +718,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
+uninstall-am: uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-nativeexeclibLTLIBRARIES install-strip installcheck \
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am \
+	install-gcjversionedlibLTLIBRARIES install-info \
+	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-nativeexeclibLTLIBRARIES
+	tags uninstall uninstall-am \
+	uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libjava/classpath/native/jni/gtk-peer/cairographics2d.h b/libjava/classpath/native/jni/gtk-peer/cairographics2d.h
index 675bc0b1744..fc564a86a99 100644
--- a/libjava/classpath/native/jni/gtk-peer/cairographics2d.h
+++ b/libjava/classpath/native/jni/gtk-peer/cairographics2d.h
@@ -97,7 +97,8 @@ enum java_awt_rendering_hints_filter
     java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR = 1,
     java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED = 2,
     java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY = 3,
-    java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT = 4
+    java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT = 4,
+    java_awt_rendering_hints_VALUE_INTERPOLATION_BICUBIC = 5
  
   };
 
diff --git a/libjava/classpath/native/jni/gtk-peer/gdkfont.h b/libjava/classpath/native/jni/gtk-peer/gdkfont.h
index cf233301547..5545bccaaf4 100644
--- a/libjava/classpath/native/jni/gtk-peer/gdkfont.h
+++ b/libjava/classpath/native/jni/gtk-peer/gdkfont.h
@@ -92,7 +92,10 @@ extern struct state_table *cp_gtk_native_text_layout_state_table;
 #define FONT_METRICS_DESCENT     2
 #define FONT_METRICS_MAX_DESCENT 3
 #define FONT_METRICS_MAX_ADVANCE 4
-#define NUM_FONT_METRICS 5
+#define FONT_METRICS_HEIGHT 5
+#define FONT_METRICS_UNDERLINE_OFFSET 6
+#define FONT_METRICS_UNDERLINE_THICKNESS 7
+#define NUM_FONT_METRICS 8
 
 #define TEXT_METRICS_X_BEARING 0
 #define TEXT_METRICS_Y_BEARING 1
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
index 45cf4fbdaca..bd63ac36667 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
@@ -49,7 +49,6 @@ exception statement from your version. */
 #include <stdio.h>
 #include <stdlib.h>
 
-static void install_font_peer(cairo_t *cr, struct peerfont *pfont);
 static void update_pattern_transform (struct cairographics2d *gr);
 
 /**
@@ -134,7 +133,11 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
   cairo_pattern_add_color_stop_rgba(pattern, 1.0, r2 / 255.0, g2 / 255.0, 
 				    b2 / 255.0, a2 / 255.0);
 
-  extend = (cyclic == JNI_TRUE) ? CAIRO_EXTEND_REFLECT : CAIRO_EXTEND_NONE;
+  #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 2, 0)
+  	extend = (cyclic == JNI_TRUE) ? CAIRO_EXTEND_REFLECT : CAIRO_EXTEND_PAD;
+  #else
+  	extend = (cyclic == JNI_TRUE) ? CAIRO_EXTEND_REFLECT : CAIRO_EXTEND_NONE;
+  #endif
 
   cairo_pattern_set_extend( pattern, extend );
 
@@ -143,9 +146,10 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setPaintPixels
  (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
-  jlong pointer, jintArray jarr, jint w, jint h, jint stride)
+  jlong pointer, jintArray jarr, jint w, jint h, jint stride, jboolean repeat,
+  jint x, jint y)
 {
   struct cairographics2d *gr = NULL;
   jint *jpixels = NULL;
@@ -180,15 +184,21 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
   g_assert (gr->pattern_surface != NULL);
   gr->pattern = cairo_pattern_create_for_surface (gr->pattern_surface);
   g_assert (gr->pattern != NULL);
-  cairo_pattern_set_extend (gr->pattern, CAIRO_EXTEND_REPEAT);
-  cairo_set_source (gr->cr, gr->pattern);
+  
+  cairo_set_source_surface(gr->cr, gr->pattern_surface, x, y);
+  
+  if (repeat)
+  	cairo_pattern_set_extend(cairo_get_source(gr->cr), CAIRO_EXTEND_REPEAT);
+  else
+  	cairo_pattern_set_extend(cairo_get_source(gr->cr), CAIRO_EXTEND_NONE);
 }
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels 
 (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
  jlong pointer, jintArray java_pixels, 
- jint w, jint h, jint stride, jdoubleArray java_matrix, jdouble alpha)
+ jint w, jint h, jint stride, jdoubleArray java_matrix, jdouble alpha,
+ jint interpolation)
 {
   jint *native_pixels = NULL;
   jdouble *native_matrix = NULL;
@@ -215,8 +225,28 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels
 
    p = cairo_pattern_create_for_surface (surf);
    cairo_pattern_set_matrix (p, &mat);
-   if (gr->pattern)
-     cairo_pattern_set_filter (p, cairo_pattern_get_filter (gr->pattern));
+   switch ((enum java_awt_rendering_hints_filter) interpolation)
+     {
+     case java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_NEAREST);
+       break;
+     case java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_BILINEAR);
+       break; 
+     case java_awt_rendering_hints_VALUE_INTERPOLATION_BICUBIC:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_GAUSSIAN);
+       break; 
+     case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_FAST);
+       break;
+     case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_NEAREST);
+       break;
+     case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_BEST);
+       break;
+     }
+   
    cairo_set_source (gr->cr, p);
    if (alpha == 1.)
      cairo_paint (gr->cr);
@@ -297,8 +327,6 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
   pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
   g_assert (pfont != NULL);
 
-  install_font_peer(gr->cr, pfont);
-
   glyphs = g_malloc( sizeof(cairo_glyph_t) * n);
   g_assert (glyphs != NULL);
 
@@ -324,6 +352,37 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
 
 
 JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFont
+(JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)),
+ jlong pointer, jobject font)
+{
+  struct cairographics2d *gr = NULL;
+  struct peerfont *pfont = NULL;
+  FT_Face face = NULL;
+  cairo_font_face_t *ft = NULL;
+
+  gr = JLONG_TO_PTR(struct cairographics2d, pointer);
+  g_assert (gr != NULL);
+  
+  pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
+  g_assert (pfont != NULL);
+
+  face = pango_fc_font_lock_face( (PangoFcFont *)pfont->font );
+  g_assert (face != NULL);
+
+  ft = cairo_ft_font_face_create_for_ft_face (face, 0);
+  g_assert (ft != NULL);
+
+  cairo_set_font_face (gr->cr, ft);
+  cairo_set_font_size (gr->cr,
+                       (pango_font_description_get_size (pfont->desc) /
+                       (double)PANGO_SCALE));
+                       
+  cairo_font_face_destroy (ft);
+  pango_fc_font_unlock_face((PangoFcFont *)pfont->font);
+}
+
+JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator 
 (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
  jlong pointer, jint op)
@@ -679,37 +738,6 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter
-(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
- jlong pointer, jint filter)
-{
-  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
-  g_assert (gr != NULL);
-  
-  if (gr->pattern == NULL)
-    return;
-  
-  switch ((enum java_awt_rendering_hints_filter) filter)
-    {
-    case java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR:
-      cairo_pattern_set_filter (gr->pattern, CAIRO_FILTER_NEAREST);
-      break;
-    case java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR:
-      cairo_pattern_set_filter (gr->pattern, CAIRO_FILTER_BILINEAR);
-      break; 
-    case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED:
-      cairo_pattern_set_filter (gr->pattern, CAIRO_FILTER_FAST);
-      break;
-    case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT:
-      cairo_pattern_set_filter (gr->pattern, CAIRO_FILTER_NEAREST);
-      break;
-    case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY:
-      cairo_pattern_set_filter (gr->pattern, CAIRO_FILTER_BEST);
-      break;
-    }
-}
-
-JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawLine
 (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)),
  jlong pointer, jdouble x1, jdouble y1, jdouble x2, jdouble y2)
@@ -749,45 +777,6 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFillRect
   cairo_fill(gr->cr);
 }
 
-
-/************************** FONT STUFF ****************************/
-static void
-install_font_peer(cairo_t *cr,
-		  struct peerfont *pfont)
-{
-  cairo_font_face_t *ft;
-  FT_Face face = NULL;
-
-  g_assert(cr != NULL);
-  g_assert(pfont != NULL);
-
-  if (pfont->graphics_resource == NULL)
-    {
-      face = pango_fc_font_lock_face( (PangoFcFont *)pfont->font );
-      g_assert (face != NULL);
-
-      ft = cairo_ft_font_face_create_for_ft_face (face, 0);
-      g_assert (ft != NULL);
-
-      cairo_set_font_face (cr, ft);
-      /*      cairo_font_face_destroy (ft);*/
-      cairo_set_font_size (cr,
-                           (pango_font_description_get_size (pfont->desc) /
-                            (double)PANGO_SCALE));
-      ft = cairo_get_font_face (cr);
-      pango_fc_font_unlock_face( (PangoFcFont *)pfont->font );
-      pfont->graphics_resource = ft;
-    }
-  else
-    {
-      ft = (cairo_font_face_t *) pfont->graphics_resource;
-      cairo_set_font_face (cr, ft);
-      cairo_set_font_size (cr,
-                           (pango_font_description_get_size (pfont->desc) /
-                            (double)PANGO_SCALE));
-    }
-}
-
 static void 
 update_pattern_transform (struct cairographics2d *gr)
 {
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
index a25f764b4dd..350cd345a1d 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
@@ -181,7 +181,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface 
 (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
- jlong surfacePointer, jlong context, jdoubleArray java_matrix, double alpha)
+ jlong surfacePointer, jlong context, jdoubleArray java_matrix, double alpha,
+ jint interpolation)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, context);
   cairo_t *cr = gr->cr;
@@ -205,6 +206,27 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface
 
    p = cairo_pattern_create_for_surface (surface);
    cairo_pattern_set_matrix (p, &mat);
+   switch ((enum java_awt_rendering_hints_filter) interpolation)
+     {
+     case java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_NEAREST);
+       break;
+     case java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_BILINEAR);
+       break; 
+     case java_awt_rendering_hints_VALUE_INTERPOLATION_BICUBIC:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_GAUSSIAN);
+       break; 
+     case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_FAST);
+       break;
+     case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_NEAREST);
+       break;
+     case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY:
+       cairo_pattern_set_filter (p, CAIRO_FILTER_BEST);
+       break;
+     }
 
    cairo_set_source(cr, p);
    if (alpha == 1.0)
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
index ddaece1b278..0837ee13cdd 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
@@ -129,94 +129,48 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_releasePeerGraphicsResource
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkFontPeer_getFontMetrics
-   (JNIEnv *env, jobject java_font, jdoubleArray java_metrics)
+(JNIEnv *env, jobject java_font, jdoubleArray java_metrics)
 {
+  FT_Face face;
   struct peerfont *pfont = NULL;
   jdouble *native_metrics = NULL;
-  PangoFontMetrics *pango_metrics = NULL;
-  PangoLayout* layout = NULL;
-  PangoRectangle ink_rect;
-  PangoRectangle logical_rect;
-  PangoLayoutIter* iter = NULL;
-  int pango_ascent = 0;
-  int pango_descent = 0;
-  int pango_ink_ascent = 0;
-  int pango_ink_descent = 0;
-  int baseline = 0;
-  int java_ascent = 0;
-  int java_descent = 0;
+  short x_ppem;
+  short y_ppem;
+  short units_per_em;
+  double factorx;
+  double factory;
 
   gdk_threads_enter();
 
   pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, java_font);
   g_assert (pfont != NULL);
-
-  pango_metrics 
-    = pango_context_get_metrics (pfont->ctx, pfont->desc,
-				 gtk_get_default_language ());
+  face = pango_fc_font_lock_face ((PangoFcFont *)pfont->font);
 
   native_metrics 
     = (*env)->GetDoubleArrayElements (env, java_metrics, NULL);
 
   g_assert (native_metrics != NULL);
 
-  pango_ascent = PANGO_PIXELS (pango_font_metrics_get_ascent (pango_metrics));
-  pango_descent = PANGO_PIXELS (pango_font_metrics_get_descent (pango_metrics));
-
-  layout = pango_layout_new (pfont->ctx);
-
-  /* Pango seems to produce ascent and descent values larger than
-     those that Sun produces for the same-sized font.  It turns out
-     that an average of the "ink ascent" and "logical ascent" closely
-     approximates Sun's ascent values.  Likewise for descent values.
-     This is expensive but we cache GdkFontMetrics so this should only
-     run once per Font instance. */
-  pango_layout_set_text (layout, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL"
-                         "MNOPQRSTUVWXYZ0123456789", -1);
-  pango_layout_set_font_description (layout, pfont->desc);
-
-  pango_layout_get_pixel_extents (layout, &ink_rect, &logical_rect);
-
-  iter = pango_layout_get_iter (layout);
-
-  baseline = PANGO_PIXELS (pango_layout_iter_get_baseline (iter));
-
-  pango_ink_ascent = baseline - ink_rect.y;
-  pango_ink_descent = ink_rect.y + ink_rect.height - baseline;
+  x_ppem = face->size->metrics.x_ppem;
+  y_ppem = face->size->metrics.y_ppem;
+  units_per_em = face->units_per_EM;
+  factorx = units_per_em / x_ppem;
+  factory = units_per_em / y_ppem;
+  native_metrics[FONT_METRICS_ASCENT] = face->ascender / factory;
+  native_metrics[FONT_METRICS_MAX_ASCENT] = face->bbox.yMax / factory;
+  native_metrics[FONT_METRICS_DESCENT] = - face->descender / factory;
+  native_metrics[FONT_METRICS_MAX_DESCENT] = - face->bbox.yMin / factory;
+  native_metrics[FONT_METRICS_MAX_ADVANCE] = face->max_advance_width / factorx;
+  native_metrics[FONT_METRICS_HEIGHT] = face->height / factory;
+  native_metrics[FONT_METRICS_UNDERLINE_OFFSET] =
+    face->underline_position / factory;
+  native_metrics[FONT_METRICS_UNDERLINE_THICKNESS] =
+    face->underline_thickness / factory;
 
-  java_ascent = (pango_ascent + pango_ink_ascent) >> 1;
-  java_descent = (pango_descent + pango_ink_descent) >> 1;
-
-  java_ascent = MAX(0, java_ascent);
-  java_descent = MAX(0, java_descent);
-
-  pango_ascent = MAX(0, pango_ascent);
-  pango_descent = MAX(0, pango_descent);
-
-  /* Pango monospaced fonts have smaller ascent metrics than Sun's so
-     we return the logical ascent for monospaced fonts. */
-  if (!strcmp (pango_font_description_get_family (pfont->desc),
-               "Courier"))
-    native_metrics[FONT_METRICS_ASCENT] = pango_ascent;
-  else
-    native_metrics[FONT_METRICS_ASCENT] = java_ascent;
-
-  native_metrics[FONT_METRICS_MAX_ASCENT] = pango_ascent;
-
-  native_metrics[FONT_METRICS_DESCENT] = java_descent;
-
-  native_metrics[FONT_METRICS_MAX_DESCENT] = pango_descent;
-
-  native_metrics[FONT_METRICS_MAX_ADVANCE] 
-    = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width 
-		    (pango_metrics));
-	 
   (*env)->ReleaseDoubleArrayElements (env, 
 				      java_metrics, 
 				      native_metrics, 0);
 
-  pango_font_metrics_unref (pango_metrics);
-
   gdk_threads_leave();
 }
 
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
index c8d9fb5512c..b92d017a5d4 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
@@ -210,7 +210,8 @@ query_formats (JNIEnv *env, jclass clazz)
   jobject jformat;
   GSList *formats, *f;
   GdkPixbufFormat *format;
-  char **ch, *name;
+  gchar **ch, *name;
+  gint count;
 
   jclass formatClass;
   jmethodID addExtensionID;
@@ -240,14 +241,16 @@ query_formats (JNIEnv *env, jclass clazz)
       string = (*env)->NewStringUTF(env, name);
       g_assert(string != NULL);
 
-      jformat = (*env)->CallStaticObjectMethod 
+      jformat = (*env)->CallStaticObjectMethod
 	(env, clazz, registerFormatID, string,
 	 (jboolean) gdk_pixbuf_format_is_writable(format));
       (*env)->DeleteLocalRef(env, string);
+      g_free(name);
 
       g_assert(jformat != NULL);
-      
+
       ch = gdk_pixbuf_format_get_extensions(format);
+      count = 0;
       while (*ch)
 	{
 	  string = (*env)->NewStringUTF(env, *ch);
@@ -255,9 +258,12 @@ query_formats (JNIEnv *env, jclass clazz)
 	  (*env)->CallVoidMethod (env, jformat, addExtensionID, string);
 	  (*env)->DeleteLocalRef(env, string);
 	  ++ch;
+	  ++count;
 	}
-      
+      g_strfreev(ch - count);
+
       ch = gdk_pixbuf_format_get_mime_types(format);
+      count = 0;
       while (*ch)
 	{
 	  string = (*env)->NewStringUTF(env, *ch);
@@ -265,12 +271,13 @@ query_formats (JNIEnv *env, jclass clazz)
 	  (*env)->CallVoidMethod (env, jformat, addMimeTypeID, string);
 	  (*env)->DeleteLocalRef(env, string);
 	  ++ch;
+	  ++count;
 	}
-
+      g_strfreev(ch - count);
       (*env)->DeleteLocalRef(env, jformat);
     }
-  
-  g_slist_free(formats);  
+
+  g_slist_free(formats);
 }
 
 
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
index 6a9066cbe53..1099287e2ff 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
@@ -353,7 +353,7 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds
       /* ...and the label's size request. */
       gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (child)), width,
 						      height);
-      if (widget->parent != NULL)
+      if (widget->parent != NULL && GTK_IS_FIXED (widget->parent))
         gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
     }
 
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index 39524eea02c..d2025bb701f 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -659,16 +659,16 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds
   width = width < 0 ? 0 : width;
   height = height < 0 ? 0 : height;
 
-  if (GTK_IS_VIEWPORT (widget->parent))
-    gtk_widget_set_size_request (widget, width, height);
-  else
+  if (!(width == 0 && height == 0))
     {
-      if (!(width == 0 && height == 0))
-        {
-          gtk_widget_set_size_request (widget, width, height);
-          if (widget->parent != NULL)
-            gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
-        }
+      gtk_widget_set_size_request (widget, width, height);
+      /* The GTK_IS_FIXED check here prevents gtk_fixed_move being
+         called when our parent is a GtkScrolledWindow.  In that
+         case though, moving the child widget is invalid since a
+         ScrollPane only has one child and that child is always
+         located at (0, 0) in viewport coordinates. */
+      if (widget->parent != NULL && GTK_IS_FIXED (widget->parent))
+        gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
     }
 
   gdk_threads_leave ();
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
index 76696431424..144ca0e8a95 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
@@ -188,3 +188,47 @@ Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImage
 
   gdk_threads_leave ();
 }
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_maximize
+(JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  gdk_threads_enter ();
+  ptr = NSA_GET_PTR (env, obj);
+  gtk_window_maximize (GTK_WINDOW (ptr));
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_unmaximize
+(JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  gdk_threads_enter ();
+  ptr = NSA_GET_PTR (env, obj);
+  gtk_window_unmaximize (GTK_WINDOW (ptr));
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_iconify
+(JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  gdk_threads_enter ();
+  ptr = NSA_GET_PTR (env, obj);
+  gtk_window_iconify (GTK_WINDOW (ptr));
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_deiconify
+(JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  gdk_threads_enter ();
+  ptr = NSA_GET_PTR (env, obj);
+  gtk_window_deiconify (GTK_WINDOW (ptr));
+  gdk_threads_leave ();
+}
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
index 77021ceec0a..13473a9a8db 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
@@ -213,7 +213,7 @@ Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeBounds
       gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (widget)),
                                    width, height);
 
-      if (widget->parent != NULL)
+      if (widget->parent != NULL && GTK_IS_FIXED (widget->parent))
         gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
     }
 
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
index 8949fa92762..0f868eaed6a 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
@@ -77,8 +77,10 @@ struct state_table *cp_gtk_native_state_table;
 struct state_table *cp_gtk_native_global_ref_table;
 
 static jclass gtkgenericpeer;
+static jclass gtktoolkit;
 static JavaVM *java_vm;
 static jmethodID printCurrentThreadID;
+static jmethodID setRunningID;
 
 union env_union
 {
@@ -99,7 +101,9 @@ GtkWindowGroup *cp_gtk_global_window_group;
 double cp_gtk_dpi_conversion_factor;
 
 static void init_glib_threads(JNIEnv *, jint);
-
+static gboolean post_set_running_flag (gpointer);
+static gboolean set_running_flag (gpointer);
+static gboolean clear_running_flag (gpointer);
 static void init_dpi_conversion_factor (void);
 static void dpi_changed_cb (GtkSettings  *settings,
                             GParamSpec   *pspec);
@@ -199,6 +203,10 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env,
   cp_gtk_global_window_group = gtk_window_group_new ();
 
   init_dpi_conversion_factor ();
+
+  gtktoolkit = (*env)->FindClass(env, "gnu/java/awt/peer/gtk/GtkMainThread");
+  setRunningID = (*env)->GetStaticMethodID (env, gtktoolkit,
+                                            "setRunning", "(Z)V");
 }
 
 
@@ -324,11 +332,25 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkMain
 {
   gdk_threads_enter ();
 
+  gtk_init_add (post_set_running_flag, NULL);
+  gtk_quit_add (gtk_main_level (), clear_running_flag, NULL);
+
   gtk_main ();
 
   gdk_threads_leave ();
 }
 
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkQuit
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)))
+{
+  gdk_threads_enter ();
+
+  gtk_main_quit ();
+
+  gdk_threads_leave ();
+}
+
 
 static jint gdk_color_to_java_color (GdkColor color);
 
@@ -491,3 +513,28 @@ gdk_color_to_java_color (GdkColor gdk_color)
 
   return (jint) (0xff000000 | (red << 16) | (green << 8) | blue);
 }
+
+static gboolean
+post_set_running_flag (gpointer data __attribute__((unused)))
+{
+  g_idle_add (set_running_flag, NULL);
+  return FALSE;
+}
+
+static gboolean
+set_running_flag (gpointer data __attribute__((unused)))
+{
+  (*cp_gtk_gdk_env ())->CallStaticVoidMethod (cp_gtk_gdk_env (),
+                                              gtktoolkit,
+                                              setRunningID, TRUE);
+  return FALSE;
+}
+
+static gboolean
+clear_running_flag (gpointer data __attribute__((unused)))
+{
+  (*cp_gtk_gdk_env ())->CallStaticVoidMethod (cp_gtk_gdk_env (),
+                                              gtktoolkit,
+                                              setRunningID, FALSE);
+  return FALSE;
+}
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
index e391d64ecdd..3fb5331a23e 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
@@ -88,7 +88,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env,
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
-(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)),
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
  jlong pointer)
 {
   GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer);
@@ -110,10 +110,12 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
   /* jint *pixeldata, *jpixdata; */
   jint *jpixdata;
   GdkPixmap *pixmap;
+  GdkPixbuf *pixbuf;
   jintArray jpixels;
   int width, height, depth, size;
   jclass cls;
   jfieldID field;
+  guchar *pixels;
 
   cls = (*env)->GetObjectClass (env, obj);
   field = (*env)->GetFieldID (env, cls, "width", "I");
@@ -131,11 +133,19 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
 
   /* get depth in bytes */
   depth = gdk_drawable_get_depth( pixmap ) >> 3;
-  size = width * height * 4;
+  size = width * height;
   jpixels = (*env)->NewIntArray ( env, size );
   jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL);
-  /*  memcpy (jpixdata, pixeldata, size * sizeof( jint )); */
-
+  
+  pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, width, height );
+  gdk_pixbuf_get_from_drawable( pixbuf, pixmap, NULL, 0, 0, 0, 0, width, height );
+  
+  if (pixbuf != NULL)
+    {
+      pixels = gdk_pixbuf_get_pixels(pixbuf);
+      memcpy (jpixdata, pixels, size * sizeof(jint));
+    }
+    
   (*env)->ReleaseIntArrayElements (env, jpixels, jpixdata, 0);
 
   gdk_threads_leave();
@@ -148,7 +158,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
-(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)),
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
  jlong pointer, jint x, jint y, jint w, jint h, jint dx, jint dy)
 {
   GdkPixbuf *pixbuf;
@@ -169,7 +179,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
-(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)),
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
  jlong pointer, jlong srcptr, jint x, jint y, jint w, jint h)
 {
   GdkPixmap *dst, *src;
diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
index 3f288af5ce1..aa70b9d2dca 100644
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
@@ -44,7 +44,6 @@ exception statement from your version. */
 #include <X11/Xatom.h>
 #include <gdk/gdkkeysyms.h>
 
-#define AWT_WINDOW_OPENED 200
 #define AWT_WINDOW_CLOSING 201
 #define AWT_WINDOW_CLOSED 202
 #define AWT_WINDOW_ICONIFIED 203
@@ -55,6 +54,10 @@ exception statement from your version. */
 #define AWT_WINDOW_LOST_FOCUS 208
 #define AWT_WINDOW_STATE_CHANGED 209
 
+#define AWT_FRAME_NORMAL 0
+#define AWT_FRAME_ICONIFIED 1
+#define AWT_FRAME_MAXIMIZED_BOTH 6
+
 /* Virtual Keys */
 /* This list should be kept in the same order as the VK_ field
    declarations in KeyEvent.java. */
@@ -1046,7 +1049,6 @@ static gboolean window_delete_cb (GtkWidget *widget, GdkEvent *event,
 			      jobject peer);
 static void window_destroy_cb (GtkWidget *widget, GdkEvent *event,
 			       jobject peer);
-static void window_show_cb (GtkWidget *widget, jobject peer);
 static void window_focus_state_change_cb (GtkWidget *widget,
                                           GParamSpec *pspec,
                                           jobject peer);
@@ -1322,9 +1324,6 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals
   g_signal_connect (G_OBJECT (ptr), "destroy-event",
 		    G_CALLBACK (window_destroy_cb), *gref);
 
-  g_signal_connect (G_OBJECT (ptr), "show",
-		    G_CALLBACK (window_show_cb), *gref);
-
   g_signal_connect (G_OBJECT (ptr), "notify::has-toplevel-focus",
   		    G_CALLBACK (window_focus_state_change_cb), *gref);
 
@@ -1661,16 +1660,6 @@ window_destroy_cb (GtkWidget *widget __attribute__((unused)),
 }
 
 static void
-window_show_cb (GtkWidget *widget __attribute__((unused)),
-		jobject peer)
-{
-  (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), peer,
-			      postWindowEventID,
-			      (jint) AWT_WINDOW_OPENED,
-			      (jobject) NULL, (jint) 0);
-}
-
-static void
 window_focus_state_change_cb (GtkWidget *widget,
 			      GParamSpec *pspec __attribute__((unused)),
 			      jobject peer)
@@ -1718,41 +1707,24 @@ window_window_state_cb (GtkWidget *widget __attribute__((unused)),
 			GdkEvent *event,
 			jobject peer)
 {
-  jint new_state;
-
-  /* Handle WINDOW_ICONIFIED and WINDOW_DEICONIFIED events. */
-  if (event->window_state.changed_mask & GDK_WINDOW_STATE_ICONIFIED)
-    {
-      /* We've either been iconified or deiconified. */
-      if (event->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED)
-	{
-	  /* We've been iconified. */
-	  (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), peer,
-				      postWindowEventID,
-				      (jint) AWT_WINDOW_ICONIFIED,
-				      (jobject) NULL, (jint) 0);
-	}
-      else
-	{
-	  /* We've been deiconified. */
-	  (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), peer,
-				      postWindowEventID,
-				      (jint) AWT_WINDOW_DEICONIFIED,
-				      (jobject) NULL, (jint) 0);
-	}
-    }
-
-  /* Post a WINDOW_STATE_CHANGED event, passing the new frame state to
-     GtkWindowPeer. */
-  new_state = AWT_FRAME_STATE_NORMAL;
-
-  if (event->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED)
-    new_state |= AWT_FRAME_STATE_ICONIFIED;
+  jint new_java_state = 0;
+  /* Put together the new state and let the java side figure out what
+   * to post */
+  GdkWindowState new_state = event->window_state.new_window_state;
+  /* The window can be either iconfified, maximized, iconified + maximized
+   * or normal. */
+  if ((new_state & GDK_WINDOW_STATE_ICONIFIED) != 0)
+    new_java_state |= AWT_FRAME_ICONIFIED;
+  if ((new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0)
+    new_java_state |= AWT_FRAME_MAXIMIZED_BOTH;
+  if ((new_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_ICONIFIED))
+      == 0)
+    new_java_state = AWT_FRAME_NORMAL;
 
   (*cp_gtk_gdk_env())->CallVoidMethod (cp_gtk_gdk_env(), peer,
 			      postWindowEventID,
 			      (jint) AWT_WINDOW_STATE_CHANGED,
-			      (jobject) NULL, new_state);
+			      (jobject) NULL, new_java_state);
 
   return TRUE;
 }
diff --git a/libjava/classpath/native/jni/gtk-peer/gtk_jawt.c b/libjava/classpath/native/jni/gtk-peer/gtk_jawt.c
index 763db8d1e8b..2348a63fb04 100644
--- a/libjava/classpath/native/jni/gtk-peer/gtk_jawt.c
+++ b/libjava/classpath/native/jni/gtk-peer/gtk_jawt.c
@@ -122,6 +122,41 @@ classpath_jawt_get_visualID (JNIEnv* env, jobject canvas)
 
 /* Does not require locking: meant to be called after the drawing
    surface is locked. */
+int
+classpath_jawt_get_depth (JNIEnv* env, jobject canvas)
+{
+  GtkWidget *widget;
+  GdkVisual *visual;
+  void *ptr;
+  jobject peer;
+  jclass class_id;
+  jmethodID method_id;
+
+  class_id = (*env)->GetObjectClass (env, canvas);
+
+  method_id = (*env)->GetMethodID (env, class_id,
+				   "getPeer",
+				   "()Ljava/awt/peer/ComponentPeer;");
+
+  peer = (*env)->CallObjectMethod (env, canvas, method_id);
+
+  ptr = NSA_GET_PTR (env, peer);
+
+  widget = GTK_WIDGET (ptr);
+
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      visual = gtk_widget_get_visual (widget);
+      g_assert (visual != NULL);
+
+      return visual->depth;
+    }
+  else
+    return (VisualID) NULL;
+}
+
+/* Does not require locking: meant to be called after the drawing
+   surface is locked. */
 Drawable
 classpath_jawt_get_drawable (JNIEnv* env, jobject canvas)
 {
diff --git a/libjava/classpath/native/jni/java-io/.cvsignore b/libjava/classpath/native/jni/java-io/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/java-io/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/java-io/Makefile.am b/libjava/classpath/native/jni/java-io/Makefile.am
index ac7cf287247..637c74c61f3 100644
--- a/libjava/classpath/native/jni/java-io/Makefile.am
+++ b/libjava/classpath/native/jni/java-io/Makefile.am
@@ -4,7 +4,8 @@ libjavaio_la_SOURCES = 	java_io_VMFile.c \
 			java_io_VMObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
-libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
+libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
+		      $(top_builddir)/native/jni/native-lib/libclasspathnative.la
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
diff --git a/libjava/classpath/native/jni/java-io/Makefile.in b/libjava/classpath/native/jni/java-io/Makefile.in
index bf8d17a71a7..88f39846aa9 100644
--- a/libjava/classpath/native/jni/java-io/Makefile.in
+++ b/libjava/classpath/native/jni/java-io/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -63,7 +65,8 @@ am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
 nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
 libjavaio_la_DEPENDENCIES =  \
-	$(top_builddir)/native/jni/classpath/jcl.lo
+	$(top_builddir)/native/jni/classpath/jcl.lo \
+	$(top_builddir)/native/jni/native-lib/libclasspathnative.la
 am_libjavaio_la_OBJECTS = java_io_VMFile.lo \
 	java_io_VMObjectInputStream.lo java_io_VMObjectStreamClass.lo
 libjavaio_la_OBJECTS = $(am_libjavaio_la_OBJECTS)
@@ -185,6 +188,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -306,14 +311,15 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjavaio.la 
 libjavaio_la_SOURCES = java_io_VMFile.c \
 			java_io_VMObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
-libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
+libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
+		      $(top_builddir)/native/jni/native-lib/libclasspathnative.la
+
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
diff --git a/libjava/classpath/native/jni/java-io/java_io_VMFile.c b/libjava/classpath/native/jni/java-io/java_io_VMFile.c
index 7a3fdaf43a8..de1320b0cab 100644
--- a/libjava/classpath/native/jni/java-io/java_io_VMFile.c
+++ b/libjava/classpath/native/jni/java-io/java_io_VMFile.c
@@ -38,17 +38,20 @@ exception statement from your version. */
 /* do not move; needed here because of some macro definitions */
 #include <config.h>
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
 #include <jni.h>
 #include <jcl.h>
-
-#include "target_native.h"
-#ifndef WITHOUT_FILESYSTEM
-#include "target_native_file.h"
-#endif
-#include "target_native_math_int.h"
+#include "cpio.h"
+#include "cpnative.h"
 
 #include "java_io_VMFile.h"
 
@@ -75,26 +78,25 @@ Java_java_io_VMFile_create (JNIEnv * env,
   filename = JCL_jstring_to_cstring (env, name);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_OPEN_CREATE (filename, fd, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpio_openFile (filename, &fd, CPFILE_FLAG_CREATE|CPFILE_FLAG_WRITE, CPFILE_PERMISSION_NORMAL);
+  if (result != CPNATIVE_OK)
     {
-      /* XXX ??? NYI */
-      if (errno != EEXIST)
+      if (result != EEXIST)
 	JCL_ThrowException (env,
 			    "java/io/IOException",
-			    TARGET_NATIVE_LAST_ERROR_STRING ());
+			    cpnative_getErrorString (result));
       JCL_free_cstring (env, name, filename);
-      return (0);
+      return 0;
     }
-  TARGET_NATIVE_FILE_CLOSE (fd, result);
+  cpio_closeFile (fd);
 
   JCL_free_cstring (env, name, filename);
-  return (1);
+  return 1;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -123,22 +125,20 @@ Java_java_io_VMFile_canRead (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
   /* The lazy man's way out.  We actually do open the file for reading
      briefly to verify it can be done */
-  TARGET_NATIVE_FILE_OPEN_READ (filename, fd, result);
+  result = cpio_openFile (filename, &fd, CPFILE_FLAG_READ, 0);
   (*env)->ReleaseStringUTFChars (env, name, filename);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return (0);
-    }
-  TARGET_NATIVE_FILE_CLOSE (fd, result);
+  if (result != CPNATIVE_OK)
+    return 0;
+  cpio_closeFile (fd);
 
-  return (1);
+  return 1;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -167,22 +167,22 @@ Java_java_io_VMFile_canWrite (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
   /* The lazy man's way out.  We actually do open the file for writing
      briefly to verify it can be done */
-  TARGET_NATIVE_FILE_OPEN_READWRITE (filename, fd, result);
+  result = cpio_openFile (filename, &fd, CPFILE_FLAG_READWRITE, 0);
   (*env)->ReleaseStringUTFChars (env, name, filename);
-  if (result != TARGET_NATIVE_OK)
+  if (result != CPNATIVE_OK)
     {
-      return (0);
+      return 0;
     }
-  TARGET_NATIVE_FILE_CLOSE (fd, result);
+  cpio_closeFile (fd);
 
-  return (1);
+  return 1;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -210,15 +210,15 @@ Java_java_io_VMFile_setReadOnly (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_SET_MODE_READONLY (filename, result);
+  result = cpio_setFileReadonly (filename);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return result == CPNATIVE_OK ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -246,15 +246,15 @@ Java_java_io_VMFile_exists (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_EXISTS (filename, result);
+  result = cpio_isFileExists (filename);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return result == CPNATIVE_OK ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -277,21 +277,22 @@ Java_java_io_VMFile_isFile (JNIEnv * env,
 #ifndef WITHOUT_FILESYSTEM
   const char *filename;
   int result;
+  jint entryType;
 
   /* Don't use the JCL convert function because it throws an exception
      on failure */
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_IS_FILE (filename, result);
+  result = cpio_checkType (filename, &entryType);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -313,21 +314,22 @@ Java_java_io_VMFile_isDirectory (JNIEnv * env,
 #ifndef WITHOUT_FILESYSTEM
   const char *filename;
   int result;
+  jint entryType;
 
   /* Don't use the JCL convert function because it throws an exception
      on failure */
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
-
-  TARGET_NATIVE_FILE_IS_DIRECTORY (filename, result);
+  
+  result = cpio_checkType (filename, &entryType);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return result == CPNATIVE_OK && entryType == CPFILE_DIRECTORY ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -356,29 +358,26 @@ Java_java_io_VMFile_length (JNIEnv * env,
      on failure */
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
-    {
-      return (TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-    }
+    return 0;
 
   /* open file for reading, get size and close file */
-  TARGET_NATIVE_FILE_OPEN_READ (filename, tmpfd, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return (TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-    }
-  TARGET_NATIVE_FILE_SIZE (tmpfd, length, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpio_openFile (filename, &tmpfd, CPFILE_FLAG_READ, 0);
+  if (result != CPNATIVE_OK)
+    return 0;
+
+  result = cpio_getFileSize (tmpfd, &length);
+  if (result != CPNATIVE_OK)
     {
-      TARGET_NATIVE_FILE_CLOSE (tmpfd, result);
-      return (TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+      cpio_closeFile (tmpfd);
+      return 0;
     }
-  TARGET_NATIVE_FILE_CLOSE (tmpfd, result);
+
+  result = cpio_closeFile (tmpfd);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result ==
-	   TARGET_NATIVE_OK) ? length : TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+  return result == CPNATIVE_OK ? length : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -407,16 +406,15 @@ Java_java_io_VMFile_lastModified (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_GET_LAST_MODIFIED (filename, mtime, result);
+  result = cpio_getModificationTime (filename, &mtime);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result ==
-	   TARGET_NATIVE_OK) ? mtime : TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+  return result == CPNATIVE_OK ? mtime : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -444,15 +442,15 @@ Java_java_io_VMFile_setLastModified (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_SET_LAST_MODIFIED (filename, newtime, result);
+  result = cpio_setModificationTime (filename, newtime);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return result == CPNATIVE_OK ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -481,15 +479,15 @@ Java_java_io_VMFile_delete (JNIEnv * env,
   filename = (*env)->GetStringUTFChars (env, name, 0);
   if (filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_DELETE (filename, result);
+  result = cpio_removeFile (filename);
   (*env)->ReleaseStringUTFChars (env, name, filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return result == CPNATIVE_OK ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -517,15 +515,15 @@ Java_java_io_VMFile_mkdir (JNIEnv * env,
   pathname = (*env)->GetStringUTFChars (env, name, 0);
   if (pathname == NULL)
     {
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_MAKE_DIR (pathname, result);
+  result = cpio_mkdir (pathname);
   (*env)->ReleaseStringUTFChars (env, name, pathname);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return (result == CPNATIVE_OK) ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -553,23 +551,23 @@ Java_java_io_VMFile_renameTo (JNIEnv * env,
   old_filename = (*env)->GetStringUTFChars (env, t, 0);
   if (old_filename == NULL)
     {
-      return (0);
+      return 0;
     }
 
   new_filename = (*env)->GetStringUTFChars (env, d, 0);
   if (new_filename == NULL)
     {
       (*env)->ReleaseStringUTFChars (env, t, old_filename);
-      return (0);
+      return 0;
     }
 
-  TARGET_NATIVE_FILE_RENAME (old_filename, new_filename, result);
+  result = cpio_rename (old_filename, new_filename);
   (*env)->ReleaseStringUTFChars (env, d, new_filename);
   (*env)->ReleaseStringUTFChars (env, t, old_filename);
 
-  return ((result == TARGET_NATIVE_OK) ? 1 : 0);
+  return (result == CPNATIVE_OK) ? 1 : 0;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
@@ -595,7 +593,7 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
   int result;
   char **filelist;
   void *handle;
-  const char *filename;
+  char *filename = (char *) JCL_malloc (env, FILENAME_MAX);
   unsigned long int filelist_count, max_filelist_count;
   char **tmp_filelist;
   jclass str_clazz;
@@ -608,32 +606,32 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
   dirname = (*env)->GetStringUTFChars (env, name, 0);
   if (dirname == NULL)
     {
-      return (0);
+      return 0;
     }
 
   /* open directory for reading */
-  TARGET_NATIVE_FILE_OPEN_DIR (dirname, handle, result);
+  result = cpio_openDir (dirname, &handle);
 
   (*env)->ReleaseStringUTFChars (env, name, dirname);
 
-  if (result != TARGET_NATIVE_OK)
+  if (result != CPNATIVE_OK)
     {
-      return (0);
+      return 0;
     }
 
   /* allocate filelist */
   filelist = (char **) JCL_malloc (env, sizeof (char *) * REALLOC_SIZE);
   if (filelist == NULL)
     {
-      TARGET_NATIVE_FILE_CLOSE_DIR (handle, result);
-      return (0);
+      result = cpio_closeDir (handle);
+      return 0;
     }
   filelist_count = 0;
   max_filelist_count = REALLOC_SIZE;
 
   /* read the files from the directory */
-  TARGET_NATIVE_FILE_READ_DIR (handle, filename, result);
-  while (result == TARGET_NATIVE_OK)
+  result = cpio_readDir (handle, filename);
+  while (result == CPNATIVE_OK)
     {
       if ((strcmp (filename, ".") != 0) && (strcmp (filename, "..") != 0))
 	{
@@ -652,8 +650,8 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
 		      JCL_free (env, filelist[i]);
 		    }
 		  JCL_free (env, filelist);
-		  TARGET_NATIVE_FILE_CLOSE_DIR (handle, result);
-		  return (0);
+		  result = cpio_closeDir (handle);
+		  return 0;
 		}
 	      filelist = tmp_filelist;
 	      max_filelist_count += REALLOC_SIZE;
@@ -668,11 +666,13 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
 	}
 
       /* read next directory entry */
-      TARGET_NATIVE_FILE_READ_DIR (handle, filename, result);
+      result = cpio_readDir (handle, filename);
     }
 
+  JCL_free (env, filename);
+
   /* close directory */
-  TARGET_NATIVE_FILE_CLOSE_DIR (handle, result);
+  result = cpio_closeDir (handle);
 
   /* put the list of files into a Java String array and return it */
   str_clazz = (*env)->FindClass (env, "java/lang/String");
@@ -683,7 +683,7 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
 	  JCL_free (env, filelist[i]);
 	}
       JCL_free (env, filelist);
-      return (0);
+      return 0;
     }
   filearray = (*env)->NewObjectArray (env, filelist_count, str_clazz, 0);
   if (filearray == NULL)
@@ -693,8 +693,11 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
 	  JCL_free (env, filelist[i]);
 	}
       JCL_free (env, filelist);
-      return (0);
+      return 0;
     }
+
+  (*env)->DeleteLocalRef (env, str_clazz);
+
   for (i = 0; i < filelist_count; i++)
     {
       /* create new string */
@@ -708,7 +711,7 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
 	      JCL_free (env, filelist[i]);
 	    }
 	  JCL_free (env, filelist);
-	  return (0);
+	  return 0;
 	}
 
       /* save into array */
@@ -725,9 +728,9 @@ Java_java_io_VMFile_list (JNIEnv * env, jobject obj
     }
   JCL_free (env, filelist);
 
-  return (filearray);
+  return filearray;
 #else /* not WITHOUT_FILESYSTEM */
-  return (0);
+  return 0;
 #endif /* not WITHOUT_FILESYSTEM */
 }
 
diff --git a/libjava/classpath/native/jni/java-lang/.cvsignore b/libjava/classpath/native/jni/java-lang/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/java-lang/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/java-lang/Makefile.am b/libjava/classpath/native/jni/java-lang/Makefile.am
index 06deb62b810..366d72e4c12 100644
--- a/libjava/classpath/native/jni/java-lang/Makefile.am
+++ b/libjava/classpath/native/jni/java-lang/Makefile.am
@@ -7,7 +7,8 @@ libjavalang_la_SOURCES = java_lang_VMSystem.c \
 			 java_lang_VMProcess.c
 
 libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \
-			$(top_builddir)/native/jni/classpath/jcl.lo
+			$(top_builddir)/native/jni/classpath/jcl.lo \
+			$(top_builddir)/native/jni/native-lib/libclasspathnative.la
 
 libjavalangreflect_la_SOURCES = java_lang_reflect_VMArray.c
 
diff --git a/libjava/classpath/native/jni/java-lang/Makefile.in b/libjava/classpath/native/jni/java-lang/Makefile.in
index c8f3dabb291..4a99863f30b 100644
--- a/libjava/classpath/native/jni/java-lang/Makefile.in
+++ b/libjava/classpath/native/jni/java-lang/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -64,7 +66,8 @@ nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
 libjavalang_la_DEPENDENCIES = $(wildcard \
 	$(top_builddir)/native/fdlibm/*.lo) \
-	$(top_builddir)/native/jni/classpath/jcl.lo
+	$(top_builddir)/native/jni/classpath/jcl.lo \
+	$(top_builddir)/native/jni/native-lib/libclasspathnative.la
 am_libjavalang_la_OBJECTS = java_lang_VMSystem.lo java_lang_VMFloat.lo \
 	java_lang_VMDouble.lo java_lang_VMMath.lo \
 	java_lang_VMProcess.lo
@@ -191,6 +194,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -312,7 +317,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjavalang.la libjavalangreflect.la
 libjavalang_la_SOURCES = java_lang_VMSystem.c \
@@ -322,7 +326,8 @@ libjavalang_la_SOURCES = java_lang_VMSystem.c \
 			 java_lang_VMProcess.c
 
 libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \
-			$(top_builddir)/native/jni/classpath/jcl.lo
+			$(top_builddir)/native/jni/classpath/jcl.lo \
+			$(top_builddir)/native/jni/native-lib/libclasspathnative.la
 
 libjavalangreflect_la_SOURCES = java_lang_reflect_VMArray.c
 AM_LDFLAGS = @CLASSPATH_MODULE@
diff --git a/libjava/classpath/native/jni/java-lang/java_lang_VMDouble.c b/libjava/classpath/native/jni/java-lang/java_lang_VMDouble.c
index 8435c3fdba7..2ee1f31466b 100644
--- a/libjava/classpath/native/jni/java-lang/java_lang_VMDouble.c
+++ b/libjava/classpath/native/jni/java-lang/java_lang_VMDouble.c
@@ -37,6 +37,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
+#include <assert.h>
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -121,17 +122,8 @@ Java_java_lang_VMDouble_doubleToLongBits
 {
   jvalue val;
   jlong e, f;
-  val.d = doubleValue;
-
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
-  /* On little endian ARM processors when using FPA, word order of
-     doubles is still big endian. So take that into account here. When
-     using VFP, word order of doubles follows byte order. */
-
-#define SWAP_DOUBLE(a)    (((a) << 32) | (((a) >> 32) & 0x00000000ffffffff))
 
-  val.j = SWAP_DOUBLE(val.j);
-#endif
+  val.d = doubleValue;
 
   e = val.j & 0x7ff0000000000000LL;
   f = val.j & 0x000fffffffffffffLL;
@@ -153,11 +145,8 @@ Java_java_lang_VMDouble_doubleToRawLongBits
    jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
 {
   jvalue val;
-  val.d = doubleValue;
 
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
-  val.j = SWAP_DOUBLE(val.j);
-#endif
+  val.d = doubleValue;
 
   return val.j;
 }
@@ -173,52 +162,139 @@ Java_java_lang_VMDouble_longBitsToDouble
    jclass cls __attribute__ ((__unused__)), jlong longValue)
 {
   jvalue val;
-  val.j = longValue;
 
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
-  val.j = SWAP_DOUBLE(val.j);
-#endif
+  val.j = longValue;
 
   return val.d;
 }
 
-/*
- * Class:     java_lang_VMDouble
- * Method:    toString
- * Signature: (DZ)Ljava/lang/String;
+/**
+ * Parse a double from a char array.
  */
-JNIEXPORT jstring JNICALL
-Java_java_lang_VMDouble_toString
-  (JNIEnv * env, jclass cls __attribute__ ((__unused__)), jdouble value, jboolean isFloat)
+static jdouble
+parseDoubleFromChars(JNIEnv * env, const char * buf)
 {
-  char buffer[50], result[50];
-  int decpt, sign;
-  char *s, *d;
-  int i;
+  char *endptr;
+  jdouble val = 0.0;
+  const char *p = buf, *end, *last_non_ws, *temp;
+  int ok = 1;
 
 #ifdef DEBUG
-  fprintf (stderr, "java.lang.VMDouble.toString (%g)\n", value);
+  fprintf (stderr, "java.lang.VMDouble.parseDouble (%s)\n", buf);
 #endif
 
-  if ((*env)->CallStaticBooleanMethod (env, clsDouble, isNaNID, value))
-    return (*env)->NewStringUTF (env, "NaN");
+  /* Trim the buffer, similar to String.trim().  First the leading
+     characters.  */
+  while (*p && *p <= ' ')
+    ++p;
 
-  if (value == POSITIVE_INFINITY)
-    return (*env)->NewStringUTF (env, "Infinity");
+  /* Find the last non-whitespace character.  This method is safe
+     even with multi-byte UTF-8 characters.  */
+  end = p;
+  last_non_ws = NULL;
+  while (*end)
+    {
+      if (*end > ' ')
+	last_non_ws = end;
+      ++end;
+    }
 
-  if (value == NEGATIVE_INFINITY)
-    return (*env)->NewStringUTF (env, "-Infinity");
+  if (last_non_ws == NULL)
+    last_non_ws = p + strlen (p);
+  else
+    {
+      /* Skip past the last non-whitespace character.  */
+      ++last_non_ws;
+    }
 
-  _dtoa (value, 0, 20, &decpt, &sign, NULL, buffer, (int) isFloat);
+  /* Check for infinity and NaN */
+  temp = p;
+  if (temp[0] == '+' || temp[0] == '-')
+    temp++;
+  if (strncmp ("Infinity", temp, (size_t) 8) == 0)
+    {
+      if (p[0] == '-')
+	return NEGATIVE_INFINITY;
+      return POSITIVE_INFINITY;
+    }
+  if (strncmp ("NaN", temp, (size_t) 3) == 0)
+    return NaN;
+
+  /* Skip a trailing `f' or `d'.  */
+  if (last_non_ws > p
+      && (last_non_ws[-1] == 'f'
+	  || last_non_ws[-1] == 'F'
+	  || last_non_ws[-1] == 'd' || last_non_ws[-1] == 'D'))
+    --last_non_ws;
+
+  if (last_non_ws > p)
+    {
+      struct _Jv_reent reent;
+      memset (&reent, 0, sizeof reent);
+
+      val = _strtod_r (&reent, p, &endptr);
+
+#ifdef DEBUG
+      fprintf (stderr, "java.lang.VMDouble.parseDouble val = %g\n", val);
+      fprintf (stderr, "java.lang.VMDouble.parseDouble %i != %i ???\n",
+	       endptr, last_non_ws);
+#endif
+      if (endptr != last_non_ws)
+	ok = 0;
+    }
+  else
+    ok = 0;
+
+  if (!ok)
+    {
+      val = 0.0;
+      JCL_ThrowException (env,
+			  "java/lang/NumberFormatException",
+			  "unable to parse double");
+    }
+
+  return val;
+}
+
+#define MAXIMAL_DECIMAL_STRING_LENGTH 64
+
+/**
+ * Use _dtoa to print a double or a float as a string with the given precision.
+ */
+static void
+dtoa_toString
+(char * buffer, jdouble value, jint precision, jboolean isFloat)
+{
+  const int DTOA_MODE = 2;
+  char result[MAXIMAL_DECIMAL_STRING_LENGTH];
+  int decpt, sign;
+  char *s, *d;
+  int i;
+
+  /* use mode 2 to get at the digit stream, all other modes are useless
+   *
+   * since mode 2 only gives us as many digits as we need in precision, we need to
+   * add the digits in front of the floating point to it, if there is more than one
+   * to be printed. That's the case if the value is going to be printed using the
+   * normal notation, i.e. if it is 0 or >= 1.0e-3 and < 1.0e7.
+   */
+  int digits_in_front_of_floating_point = ceil(log10(value));
+
+  if (digits_in_front_of_floating_point > 1 && digits_in_front_of_floating_point < 7)
+    precision += digits_in_front_of_floating_point;
+
+  _dtoa (value, DTOA_MODE, precision, &decpt, &sign, NULL, buffer, (int) isFloat);
 
   value = fabs (value);
 
   s = buffer;
   d = result;
 
+  /* Handle negative sign */
   if (sign)
     *d++ = '-';
 
+  /* Handle normal represenation */
   if ((value >= 1e-3 && value < 1e7) || (value == 0))
     {
       if (decpt <= 0)
@@ -248,46 +324,111 @@ Java_java_lang_VMDouble_toString
 
       *d = 0;
 
-      return (*env)->NewStringUTF (env, result);
     }
+  /* Handle scientific representaiton */
+  else
+    {
+      *d++ = *s++;
+      decpt--;
+      *d++ = '.';
+
+      if (*s == 0)
+	*d++ = '0';
 
-  *d++ = *s++;
-  decpt--;
-  *d++ = '.';
+      while (*s)
+	*d++ = *s++;
 
-  if (*s == 0)
-    *d++ = '0';
+      *d++ = 'E';
 
-  while (*s)
-    *d++ = *s++;
+      if (decpt < 0)
+	{
+	  *d++ = '-';
+	  decpt = -decpt;
+	}
 
-  *d++ = 'E';
+      {
+	char exp[4];
+	char *e = exp + sizeof exp;
+
+	*--e = 0;
+	do
+	  {
+	    *--e = '0' + decpt % 10;
+	    decpt /= 10;
+	  }
+	while (decpt > 0);
+
+	while (*e)
+	  *d++ = *e++;
+      }
 
-  if (decpt < 0)
-    {
-      *d++ = '-';
-      decpt = -decpt;
+      *d = 0;
     }
 
-  {
-    char exp[4];
-    char *e = exp + sizeof exp;
+  /* copy the result into the buffer */
+  memcpy(buffer, result, MAXIMAL_DECIMAL_STRING_LENGTH);
+}
 
-    *--e = 0;
-    do
-      {
-	*--e = '0' + decpt % 10;
-	decpt /= 10;
-      }
-    while (decpt > 0);
+/*
+ * Class:     java_lang_VMDouble
+ * Method:    toString
+ * Signature: (DZ)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_java_lang_VMDouble_toString
+  (JNIEnv * env, jclass cls __attribute__ ((__unused__)), jdouble value, jboolean isFloat)
+{
+  char buf[MAXIMAL_DECIMAL_STRING_LENGTH];
+  const jint MAXIMAL_FLOAT_PRECISION = 10;
+  const jint MAXIMAL_DOUBLE_PRECISION = 19;
 
-    while (*e)
-      *d++ = *e++;
-  }
+  jint maximal_precision;
+  jint least_necessary_precision = 2;
+  jboolean parsed_value_unequal;
+
+  if ((*env)->CallStaticBooleanMethod (env, clsDouble, isNaNID, value))
+    return (*env)->NewStringUTF (env, "NaN");
+
+  if (value == POSITIVE_INFINITY)
+    return (*env)->NewStringUTF (env, "Infinity");
+
+  if (value == NEGATIVE_INFINITY)
+    return (*env)->NewStringUTF (env, "-Infinity");
+
+  if (isFloat)
+    maximal_precision = MAXIMAL_FLOAT_PRECISION;
+  else
+    maximal_precision = MAXIMAL_DOUBLE_PRECISION;
+
+  /* Try to find the 'good enough' precision, 
+   * that results in enough digits being printed to be able to
+   * convert the number back into the original double, but no 
+   * further digits. 
+   */
+
+  do {
+    jdouble parsed_value;
 
-  *d = 0;
+    assert(least_necessary_precision <= maximal_precision);
 
-  return (*env)->NewStringUTF (env, result);
+    /* Convert the value to a string and back. */
+    dtoa_toString(buf, value, least_necessary_precision, isFloat);
+
+    parsed_value = parseDoubleFromChars(env, buf);
+
+    /* Check whether the original value, and the value after conversion match. */
+    /* We need to cast floats to float to make sure that our ineqality check works
+     * well for floats as well as for doubles.
+     */
+    parsed_value_unequal = ( isFloat ? 
+			     (float) parsed_value != (float) value : 
+			     parsed_value != value);
+
+    least_necessary_precision++;
+  }
+  while (parsed_value_unequal);
+
+  return (*env)->NewStringUTF (env, buf);
 }
 
 /*
@@ -301,7 +442,6 @@ Java_java_lang_VMDouble_parseDouble
 {
   jboolean isCopy;
   const char *buf;
-  char *endptr;
   jdouble val = 0.0;
 
   if (str == NULL)
@@ -317,83 +457,7 @@ Java_java_lang_VMDouble_parseDouble
     }
   else
     {
-      const char *p = buf, *end, *last_non_ws, *temp;
-      int ok = 1;
-
-#ifdef DEBUG
-      fprintf (stderr, "java.lang.VMDouble.parseDouble (%s)\n", buf);
-#endif
-
-      /* Trim the buffer, similar to String.trim().  First the leading
-         characters.  */
-      while (*p && *p <= ' ')
-	++p;
-
-      /* Find the last non-whitespace character.  This method is safe
-         even with multi-byte UTF-8 characters.  */
-      end = p;
-      last_non_ws = NULL;
-      while (*end)
-	{
-	  if (*end > ' ')
-	    last_non_ws = end;
-	  ++end;
-	}
-
-      if (last_non_ws == NULL)
-	last_non_ws = p + strlen (p);
-      else
-	{
-	  /* Skip past the last non-whitespace character.  */
-	  ++last_non_ws;
-	}
-
-      /* Check for infinity and NaN */
-      temp = p;
-      if (temp[0] == '+' || temp[0] == '-')
-	temp++;
-      if (strncmp ("Infinity", temp, (size_t) 8) == 0)
-	{
-	  if (p[0] == '-')
-	    return NEGATIVE_INFINITY;
-	  return POSITIVE_INFINITY;
-	}
-      if (strncmp ("NaN", temp, (size_t) 3) == 0)
-	return NaN;
-
-      /* Skip a trailing `f' or `d'.  */
-      if (last_non_ws > p
-	  && (last_non_ws[-1] == 'f'
-	      || last_non_ws[-1] == 'F'
-	      || last_non_ws[-1] == 'd' || last_non_ws[-1] == 'D'))
-	--last_non_ws;
-
-      if (last_non_ws > p)
-	{
-	  struct _Jv_reent reent;
-	  memset (&reent, 0, sizeof reent);
-
-	  val = _strtod_r (&reent, p, &endptr);
-
-#ifdef DEBUG
-	  fprintf (stderr, "java.lang.VMDouble.parseDouble val = %g\n", val);
-	  fprintf (stderr, "java.lang.VMDouble.parseDouble %i != %i ???\n",
-		   endptr, last_non_ws);
-#endif
-	  if (endptr != last_non_ws)
-	    ok = 0;
-	}
-      else
-	ok = 0;
-
-      if (!ok)
-	{
-	  val = 0.0;
-	  JCL_ThrowException (env,
-			      "java/lang/NumberFormatException",
-			      "unable to parse double");
-	}
-
+      val = parseDoubleFromChars(env, buf);
       (*env)->ReleaseStringUTFChars (env, str, buf);
     }
 
diff --git a/libjava/classpath/native/jni/java-lang/java_lang_VMProcess.c b/libjava/classpath/native/jni/java-lang/java_lang_VMProcess.c
index f13a94f1889..a6076f2aea9 100644
--- a/libjava/classpath/native/jni/java-lang/java_lang_VMProcess.c
+++ b/libjava/classpath/native/jni/java-lang/java_lang_VMProcess.c
@@ -38,7 +38,7 @@ exception statement from your version. */
 #include <config.h>
 
 #include "java_lang_VMProcess.h"
-#include "gnu_java_nio_channels_FileChannelImpl.h"
+#include "gnu_java_nio_FileChannelImpl.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -50,10 +50,8 @@ exception statement from your version. */
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <jcl.h>
-
-#include "target_native.h"
-#include "target_native_misc.h"
+#include "cpnative.h"
+#include "cpproc.h"
 
 /* Internal functions */
 static char *copy_string (JNIEnv * env, jobject string);
@@ -65,7 +63,6 @@ static char *copy_elem (JNIEnv * env, jobject stringArray, jint i);
 static char *
 copy_string (JNIEnv * env, jobject string)
 {
-  char errbuf[64];
   const char *utf;
   jclass clazz;
   char *copy;
@@ -89,12 +86,10 @@ copy_string (JNIEnv * env, jobject string)
   /* Copy it */
   if ((copy = strdup (utf)) == NULL)
     {
-      TARGET_NATIVE_MISC_FORMAT_STRING1 (errbuf, sizeof (errbuf),
-					 "strdup: %s", strerror (errno));
       clazz = (*env)->FindClass (env, "java/lang/InternalError");
       if ((*env)->ExceptionOccurred (env))
 	return NULL;
-      (*env)->ThrowNew (env, clazz, errbuf);
+      (*env)->ThrowNew (env, clazz, "strdup returned NULL");
       (*env)->DeleteLocalRef (env, clazz);
     }
 
@@ -131,8 +126,8 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
 				      jobjectArray envArray, jobject dirFile,
 				      jboolean redirect)
 {
-  int fds[3][2] = { {-1, -1}, {-1, -1}, {-1, -1} };
-  jobject streams[3] = { NULL, NULL, NULL };
+  int fds[CPIO_EXEC_NUM_PIPES];
+  jobject streams[CPIO_EXEC_NUM_PIPES] = { NULL, NULL, NULL };
   jobject dirString = NULL;
   char **newEnviron = NULL;
   jsize cmdArrayLen = 0;
@@ -142,10 +137,11 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
   char *dir = NULL;
   pid_t pid = -1;
   char errbuf[64];
-  jmethodID method;
-  jclass clazz;
+  jmethodID method, vmmethod;
+  jclass clazz, vmclazz;
   int i;
   int pipe_count = redirect ? 2 : 3;
+  int err;
 
   /* Check for null */
   if (cmdArray == NULL)
@@ -182,9 +178,7 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
 			  + (dirString !=
 			     NULL ? 1 : 0)) * sizeof (*strings))) == NULL)
     {
-      TARGET_NATIVE_MISC_FORMAT_STRING1 (errbuf,
-					 sizeof (errbuf), "malloc: %s",
-					 strerror (errno));
+      strncpy (errbuf, "malloc failed", sizeof(errbuf));
       goto out_of_memory;
     }
 
@@ -209,125 +203,43 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
     {
       if ((dir = copy_string (env, dirString)) == NULL)
 	goto done;
-      strings[num_strings++] = dir;
     }
 
   /* Create inter-process pipes */
-  for (i = 0; i < pipe_count; i++)
-    {
-      if (pipe (fds[i]) == -1)
-	{
-	  TARGET_NATIVE_MISC_FORMAT_STRING1 (errbuf,
-					     sizeof (errbuf), "pipe: %s",
-					     strerror (errno));
-	  goto system_error;
-	}
-    }
-
-  /* Set close-on-exec flag for parent's ends of pipes */
-  (void) fcntl (fds[0][1], F_SETFD, 1);
-  (void) fcntl (fds[1][0], F_SETFD, 1);
-  if (pipe_count == 3)
-    (void) fcntl (fds[2][0], F_SETFD, 1);
-
-  /* Fork into parent and child processes */
-  if ((pid = fork ()) == (pid_t) - 1)
+  err = cpproc_forkAndExec(strings, newEnviron, fds, pipe_count, &pid, dir);
+  if (err != 0)
     {
-      TARGET_NATIVE_MISC_FORMAT_STRING1 (errbuf,
-					 sizeof (errbuf), "fork: %s",
-					 strerror (errno));
+      strncpy(errbuf, cpnative_getErrorString (err), sizeof(errbuf));
       goto system_error;
     }
 
-  /* Child becomes the new process */
-  if (pid == 0)
-    {
-      char *const path = strings[0];
-
-      /* Move file descriptors to standard locations */
-      if (fds[0][0] != 0)
-	{
-	  if (dup2 (fds[0][0], 0) == -1)
-	    {
-	      fprintf (stderr, "dup2: %s", strerror (errno));
-	      exit (127);
-	    }
-	  close (fds[0][0]);
-	}
-      if (fds[1][1] != 1)
-	{
-	  if (dup2 (fds[1][1], 1) == -1)
-	    {
-	      fprintf (stderr, "dup2: %s", strerror (errno));
-	      exit (127);
-	    }
-	  close (fds[1][1]);
-	}
-      if (pipe_count == 2)
-	{
-	  /* Duplicate stdout to stderr.  */
-	  if (dup2 (1, 2) == -1)
-	    {
-	      fprintf (stderr, "dup2: %s", strerror (errno));
-	      exit (127);
-	    }
-	}
-      else if (fds[2][1] != 2)
-	{
-	  if (dup2 (fds[2][1], 2) == -1)
-	    {
-	      fprintf (stderr, "dup2: %s", strerror (errno));
-	      exit (127);
-	    }
-	  close (fds[2][1]);
-	}
-
-      /* Change into destination directory */
-      if (dir != NULL && chdir (dir) == -1)
-	{
-	  fprintf (stderr, "%s: %s", dir, strerror (errno));
-	  exit (127);
-	}
-
-      /* Make argv[0] last component of executable pathname */
-      /* XXX should use "file.separator" property here XXX */
-      for (i = strlen (path); i > 0 && path[i - 1] != '/'; i--);
-      strings[0] = path + i;
-
-      /* Set new environment */
-      if (newEnviron != NULL)
-	environ = newEnviron;
-
-      /* Execute new program (this will close the parent end of the pipes) */
-      execvp (path, strings);
-
-      /* Failed */
-      fprintf (stderr, "%s: %s", path, strerror (errno));
-      exit (127);
-    }
-
   /* Create Input/OutputStream objects around parent file descriptors */
-  clazz = (*env)->FindClass (env, "gnu/java/nio/channels/FileChannelImpl");
+  vmclazz = (*env)->FindClass (env, "gnu/java/nio/VMChannel");
+  clazz = (*env)->FindClass (env, "gnu/java/nio/FileChannelImpl");
   if ((*env)->ExceptionOccurred (env))
     goto done;
-  method = (*env)->GetMethodID (env, clazz, "<init>", "(II)V");
+  vmmethod = (*env)->GetMethodID (env, vmclazz, "<init>", "(I)V");
+  method = (*env)->GetMethodID (env, clazz, "<init>", "(Lgnu/java/nio/VMChannel;I)V");
   if ((*env)->ExceptionOccurred (env))
     goto done;
   for (i = 0; i < pipe_count; i++)
     {
       /* Mode is WRITE (2) for in and READ (1) for out and err. */
-      const int fd = fds[i][i == 0];
-      const int mode = ((i == 0)
-			? gnu_java_nio_channels_FileChannelImpl_WRITE
-			: gnu_java_nio_channels_FileChannelImpl_READ);
+      const int fd = fds[i];
+      const int mode = ((i == CPIO_EXEC_STDIN) ? 2 : 1);
       jclass sclazz;
       jmethodID smethod;
 
-      jobject channel = (*env)->NewObject (env, clazz, method, fd, mode);
+      jobject vmchannel;
+      jobject channel;
+      vmchannel = (*env)->NewObject (env, vmclazz, vmmethod, fd);
+      if ((*env)->ExceptionOccurred (env))
+	goto done;
+      channel = (*env)->NewObject (env, clazz, method, vmchannel, mode);
       if ((*env)->ExceptionOccurred (env))
 	goto done;
 
-      if (mode == gnu_java_nio_channels_FileChannelImpl_WRITE)
+      if (mode == gnu_java_nio_FileChannelImpl_WRITE)
 	sclazz = (*env)->FindClass (env, "java/io/FileOutputStream");
       else
 	sclazz = (*env)->FindClass (env, "java/io/FileInputStream");
@@ -335,7 +247,7 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
 	goto done;
 
       smethod = (*env)->GetMethodID (env, sclazz, "<init>",
-				     "(Lgnu/java/nio/channels/FileChannelImpl;)V");
+				     "(Lgnu/java/nio/FileChannelImpl;)V");
       if ((*env)->ExceptionOccurred (env))
 	goto done;
 
@@ -355,7 +267,10 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
   if ((*env)->ExceptionOccurred (env))
     goto done;
   (*env)->CallVoidMethod (env, this, method,
-			  streams[0], streams[1], streams[2], (jlong) pid);
+			  streams[CPIO_EXEC_STDIN],
+			  streams[CPIO_EXEC_STDOUT],
+			  streams[CPIO_EXEC_STDERR],
+			  (jlong) pid);
   if ((*env)->ExceptionOccurred (env))
     goto done;
 
@@ -365,15 +280,6 @@ done:
    * parent process. Our goal is to clean up the mess we created.
    */
 
-  /* Close child's ends of pipes */
-  for (i = 0; i < pipe_count; i++)
-    {
-      const int fd = fds[i][i != 0];
-
-      if (fd != -1)
-	close (fd);
-    }
-
   /*
    * Close parent's ends of pipes if Input/OutputStreams never got created.
    * This can only happen in a failure case. If a Stream object
@@ -382,7 +288,7 @@ done:
    */
   for (i = 0; i < pipe_count; i++)
     {
-      const int fd = fds[i][i == 0];
+      const int fd = fds[i];
 
       if (fd != -1 && streams[i] == NULL)
 	close (fd);
@@ -392,7 +298,8 @@ done:
   while (num_strings > 0)
     free (strings[--num_strings]);
   free (strings);
-
+  if (dir != NULL)
+    free(dir);
   /* Done */
   return;
 
@@ -431,19 +338,20 @@ Java_java_lang_VMProcess_nativeReap (JNIEnv * env, jclass clazz)
   jfieldID field;
   jint status;
   pid_t pid;
+  int err;
 
   /* Try to reap a child process, but don't block */
-  if ((pid = waitpid ((pid_t) - 1, &status, WNOHANG)) == 0)
+  err = cpproc_waitpid((pid_t)-1, &status, &pid, WNOHANG);
+  if (err == 0 && pid == 0)
     return JNI_FALSE;
 
   /* Check result from waitpid() */
-  if (pid == (pid_t) - 1)
+  if (err != 0)
     {
-      if (errno == ECHILD || errno == EINTR)
+      if (err == ECHILD || err == EINTR)
 	return JNI_FALSE;
-      TARGET_NATIVE_MISC_FORMAT_STRING2 (ebuf,
-					 sizeof (ebuf), "waitpid(%ld): %s",
-					 (long) pid, strerror (errno));
+      snprintf(ebuf, sizeof (ebuf), "waitpid(%ld): %s",
+	       (long) pid, cpnative_getErrorString(errno));
       clazz = (*env)->FindClass (env, "java/lang/InternalError");
       if ((*env)->ExceptionOccurred (env))
 	return JNI_FALSE;
@@ -485,12 +393,13 @@ JNIEXPORT void JNICALL
 Java_java_lang_VMProcess_nativeKill (JNIEnv * env, jclass clazz, jlong pid)
 {
   char ebuf[64];
-
-  if (kill ((pid_t) pid, SIGKILL) == -1)
+  int err;
+  
+  err = cpproc_kill((pid_t) pid, SIGKILL);
+  if (err != 0)
     {
-      TARGET_NATIVE_MISC_FORMAT_STRING2 (ebuf,
-					 sizeof (ebuf), "kill(%ld): %s",
-					 (long) pid, strerror (errno));
+      snprintf (ebuf, sizeof (ebuf), "kill(%ld): %s",
+		(long) pid, cpnative_getErrorString (err));
       clazz = (*env)->FindClass (env, "java/lang/InternalError");
       if ((*env)->ExceptionOccurred (env))
 	return;
diff --git a/libjava/classpath/native/jni/java-net/.cvsignore b/libjava/classpath/native/jni/java-net/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/java-net/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/java-net/Makefile.am b/libjava/classpath/native/jni/java-net/Makefile.am
index 26bb64f73bf..1278b946c63 100644
--- a/libjava/classpath/native/jni/java-net/Makefile.am
+++ b/libjava/classpath/native/jni/java-net/Makefile.am
@@ -13,11 +13,12 @@ libjavanet_la_SOURCES = javanet.c \
 			java_net_VMInetAddress.c \
 			java_net_VMNetworkInterface.c \
 			java_net_VMURLConnection.c \
-			gnu_java_net_VMPlainDatagramSocketImpl.c \
                         gnu_java_net_VMPlainSocketImpl.c \
 			$(local_sources)
 
-libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo $(LIBMAGIC)
+libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
+		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
+		       $(LIBMAGIC)
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
diff --git a/libjava/classpath/native/jni/java-net/Makefile.in b/libjava/classpath/native/jni/java-net/Makefile.in
index c427f8cd5bb..ec8f6a858d7 100644
--- a/libjava/classpath/native/jni/java-net/Makefile.in
+++ b/libjava/classpath/native/jni/java-net/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -65,19 +67,17 @@ LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libjavanet_la_DEPENDENCIES =  \
 	$(top_builddir)/native/jni/classpath/jcl.lo \
+	$(top_builddir)/native/jni/native-lib/libclasspathnative.la \
 	$(am__DEPENDENCIES_1)
 am__libjavanet_la_SOURCES_DIST = javanet.c javanet.h \
 	java_net_VMInetAddress.c java_net_VMNetworkInterface.c \
-	java_net_VMURLConnection.c \
-	gnu_java_net_VMPlainDatagramSocketImpl.c \
-	gnu_java_net_VMPlainSocketImpl.c \
+	java_net_VMURLConnection.c gnu_java_net_VMPlainSocketImpl.c \
 	gnu_java_net_local_LocalSocketImpl.c local.c local.h
 @ENABLE_LOCAL_SOCKETS_FALSE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo
 @ENABLE_LOCAL_SOCKETS_TRUE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo \
 @ENABLE_LOCAL_SOCKETS_TRUE@	local.lo
 am_libjavanet_la_OBJECTS = javanet.lo java_net_VMInetAddress.lo \
 	java_net_VMNetworkInterface.lo java_net_VMURLConnection.lo \
-	gnu_java_net_VMPlainDatagramSocketImpl.lo \
 	gnu_java_net_VMPlainSocketImpl.lo $(am__objects_1)
 libjavanet_la_OBJECTS = $(am_libjavanet_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
@@ -198,6 +198,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -319,7 +321,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjavanet.la
 @ENABLE_LOCAL_SOCKETS_FALSE@local_sources = gnu_java_net_local_LocalSocketImpl.c
@@ -332,11 +333,13 @@ libjavanet_la_SOURCES = javanet.c \
 			java_net_VMInetAddress.c \
 			java_net_VMNetworkInterface.c \
 			java_net_VMURLConnection.c \
-			gnu_java_net_VMPlainDatagramSocketImpl.c \
                         gnu_java_net_VMPlainSocketImpl.c \
 			$(local_sources)
 
-libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo $(LIBMAGIC)
+libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
+		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
+		       $(LIBMAGIC)
+
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
@@ -409,7 +412,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_net_VMPlainDatagramSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_net_VMPlainSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_net_local_LocalSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_net_VMInetAddress.Plo@am__quote@
diff --git a/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c b/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c
deleted file mode 100644
index 1b3cb97e0d0..00000000000
--- a/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* VMPlainDatagramSocketImpl.c - Native methods for PlainDatagramSocketImpl
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath 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 2, or (at your option)
-any later version.
- 
-GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-/* do not move; needed here because of some macro definitions */
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <jni.h>
-#include <jcl.h>
-
-#include "javanet.h"
-
-#include "target_native.h"
-#ifndef WITHOUT_NETWORK
-  #include "target_native_network.h"
-#endif /* WITHOUT_NETWORK */
-
-
-#include "gnu_java_net_VMPlainDatagramSocketImpl.h"
-
-/*
- * Note that most of the functions in this module simply redirect to another
- * internal function.  Why?  Because many of these functions are shared
- * with PlainSocketImpl. 
- */
-
-/*************************************************************************/
-
-/*
- * Creates a new datagram socket
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_create(JNIEnv *env,
-						   jclass klass __attribute__ ((__unused__))
-						   , jobject obj)
-{
-
-#ifndef WITHOUT_NETWORK
-  _javanet_create(env, obj, 0);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * Close the socket.
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_close(JNIEnv *env,
-						  jclass klass __attribute__ ((__unused__)),
-						  jobject obj)
-{
-
-#ifndef WITHOUT_NETWORK
-  _javanet_close(env, obj, 0);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * Connects to the specified destination.
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_connect(JNIEnv *env,
-						    jclass klass __attribute__ ((__unused__)),
-						    jobject obj,
-						    jobject addr, jint port)
-{
-#ifndef WITHOUT_NETWORK
-
-  _javanet_connect(env, obj, addr, port, 0);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * This method binds the specified address to the specified local port.
- * Note that we have to set the local address and local port public instance 
- * variables. 
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_bind(JNIEnv *env,
-						 jclass klass __attribute__ ((__unused__)),
-						 jobject obj,
-						 jint port, jobject addr)
-{
-
-#ifndef WITHOUT_NETWORK
-  _javanet_bind(env, obj, addr, port, 0);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * This method sets the specified option for a socket
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_setOption(JNIEnv *env,
-						      jclass klass __attribute__ ((__unused__)),
-						      jobject obj, 
-						      jint option_id,
-						      jobject val)
-{
-
-#ifndef WITHOUT_NETWORK
-  _javanet_set_option(env, obj, option_id, val);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * This method sets the specified option for a socket
- */
-JNIEXPORT jobject JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_getOption(JNIEnv *env,
-						      jclass klass __attribute__ ((__unused__)),
-						      jobject obj, 
-						      jint option_id)
-{
-
-#ifndef WITHOUT_NETWORK
-  return(_javanet_get_option(env, obj, option_id));
-#else /* not WITHOUT_NETWORK */
-  return NULL;
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * Reads a buffer from a remote host
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeReceive(JNIEnv     *env,
-                                                          jclass     klass __attribute__ ((__unused__)),
-                                                          jobject    obj,
-                                                          jbyteArray arr,
-                                                          jint       offset,
-                                                          jint       length,
-                                                          jbyteArray receivedFromAddress,
-                                                          jintArray  receivedFromPort,
-                                                          jintArray  receivedLength)
-{
-#ifndef WITHOUT_NETWORK
-  int           addr, *port, *bytes_read;
-  char          *addressBytes;
-
-  addr = 0;
-    
-  port = (int*)(*env)->GetIntArrayElements(env, receivedFromPort, NULL);
-  if (port == NULL)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, "Internal error: could not access receivedFromPort array");
-      return;
-    }
-  
-  bytes_read = (int*)(*env)->GetIntArrayElements(env, receivedLength, NULL);
-  if (bytes_read == NULL)
-    {
-      (*env)->ReleaseIntArrayElements(env, receivedFromPort, (jint*)port, 0);
-      JCL_ThrowException(env, IO_EXCEPTION, "Internal error: could not access receivedLength array");
-      return;
-    }
-
-  /* Receive the packet */
-  /* should we try some sort of validation on the length? */
-  (*bytes_read) = _javanet_recvfrom(env, obj, arr, offset, length, &addr, port);
-
-  /* Special case the strange situation where the receiver didn't want any
-     bytes. */
-  if (length == 0 && (*bytes_read) == -1)
-    *bytes_read = 0;
-
-  if ((*bytes_read) == -1)
-    {
-      (*env)->ReleaseIntArrayElements(env, receivedFromPort, (jint*)port, 0);
-      (*env)->ReleaseIntArrayElements(env, receivedLength, (jint*)bytes_read, 0);
-      JCL_ThrowException(env, IO_EXCEPTION, "Internal error: receive");
-      return;
-    }
-
-  (*env)->ReleaseIntArrayElements(env, receivedFromPort, (jint*)port, 0);
-  (*env)->ReleaseIntArrayElements(env, receivedLength, (jint*)bytes_read, 0);
-
-  if ((*env)->ExceptionOccurred(env))
-    {
-      return;
-    }
-
-  DBG("PlainDatagramSocketImpl.receive(): Received packet\n");
-  
-  
-  /* Store the address */
-  addressBytes = (char*)(*env)->GetPrimitiveArrayCritical(env, receivedFromAddress, NULL);
-  TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(addr,
-                                               addressBytes[0],
-                                               addressBytes[1],
-                                               addressBytes[2],
-                                               addressBytes[3]
-                                              );
-  (*env)->ReleasePrimitiveArrayCritical(env, receivedFromAddress, addressBytes, 0);
-    
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * Writes a buffer to the remote host
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeSendTo(JNIEnv  *env,
-                                                         jclass  klass __attribute__ ((__unused__)),
-                                                         jobject obj, 
-                                                         jobject addr,
-                                                         jint    port,
-                                                         jarray  buf, 
-                                                         jint    offset,
-                                                         jint    len)
-{
-#ifndef WITHOUT_NETWORK
-  jint netAddress;
-
-  /* check if address given, tr 7.3.2005 */
-  if (addr != NULL)
-    {
-      netAddress = _javanet_get_netaddr(env, addr);
-      if ((*env)->ExceptionOccurred(env))
-        {
-          return;
-        }
-    }
-  else
-    {
-      netAddress = 0;
-    }
-
-  DBG("PlainDatagramSocketImpl.sendto(): have addr\n");
-
-  _javanet_sendto(env, obj, buf, offset, len, netAddress, port);
-  if ((*env)->ExceptionOccurred(env))
-    {
-      return;
-    }
-
-  DBG("PlainDatagramSocketImpl.sendto(): finished\n");
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * Joins a multicast group
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_join(JNIEnv *env,
-						 jclass klass __attribute__ ((__unused__)),
-						 jobject obj, 
-						 jobject addr)
-{
-#ifndef WITHOUT_NETWORK
-  jint netAddress;
-  int  fd;
-  int  result;
-
-  /* check if address given, tr 7.3.2005 */
-  if (addr != NULL)
-    {
-      netAddress = _javanet_get_netaddr(env, addr);
-      if ((*env)->ExceptionOccurred(env))
-        {
-          JCL_ThrowException(env, IO_EXCEPTION, "Internal error");
-          return;
-        }
-    }
-  else
-    {
-      netAddress = 0;
-    }
-
-  fd = _javanet_get_int_field(env, obj, "native_fd");
-  if ((*env)->ExceptionOccurred(env))
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, "Internal error");
-      return;
-    }
-
-  DBG("PlainDatagramSocketImpl.join(): have native fd\n");
-
-  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_ADD_MEMBERSHIP(fd,netAddress,result);
-
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING());
-      return;
-    }
-
-  DBG("PlainDatagramSocketImpl.join(): finished\n");
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-/*************************************************************************/
-
-/*
- * Leaves a multicast group
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_leave(JNIEnv *env,
-						  jclass klass __attribute__ ((__unused__)),
-						  jobject obj, 
-						  jobject addr)
-{
-#ifndef WITHOUT_NETWORK
-  jint netAddress;
-  int  fd;
-  int  result;
-
-  /* check if address given, tr 7.3.2005 */
-  if (addr != NULL)
-    {
-      netAddress = _javanet_get_netaddr(env, addr);
-      if ((*env)->ExceptionOccurred(env))
-        {
-          JCL_ThrowException(env, IO_EXCEPTION, "Internal error");
-          return;
-        }
-    }
-  else
-    {
-      netAddress = 0;
-    }
-
-  fd = _javanet_get_int_field(env, obj, "native_fd");
-  if ((*env)->ExceptionOccurred(env))
-    { JCL_ThrowException(env, IO_EXCEPTION, "Internal error"); return; }
-
-  DBG("PlainDatagramSocketImpl.leave(): have native fd\n");
-
-  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_DROP_MEMBERSHIP(fd,netAddress,result);
-  if (result!=TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING());
-      return;
-    }
-
-  DBG("PlainDatagramSocketImpl.leave(): finished\n");
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
diff --git a/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c b/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
index 3d48b9195c4..cdfbe739789 100644
--- a/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
+++ b/libjava/classpath/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
@@ -35,269 +35,930 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-/* do not move; needed here because of some macro definitions */
-#include <config.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <config-int.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <net/if.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
  
 #include <jni.h>
 #include <jcl.h>
 
+#include "cpnative.h"
+#include "cpnet.h"
+#include "cpio.h"
 #include "javanet.h"
 
-#include "target_native.h"
-#ifndef WITHOUT_NETWORK
-  #include "target_native_file.h"  /* Get FIONREAD on Solaris.  */
-  #include "target_native_network.h"
-#endif /* WITHOUT_NETWORK */
-
 #include "gnu_java_net_VMPlainSocketImpl.h"
 
-/*
- * Note that the functions in this module simply redirect to another
- * internal function.  Why?  Because many of these functions are shared
- * with PlainDatagramSocketImpl.  The unshared ones were done the same
- * way for consistency.
- */
-
-/*************************************************************************/
+#define THROW_NO_NETWORK(env) JCL_ThrowException (env, "java/lang/InternalError", "this platform not configured for network support")
 
 /*
- * Creates a new stream or datagram socket
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    bind
+ * Signature: (I[BI)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_create(JNIEnv *env,
-					   jclass klass __attribute__ ((__unused__)),
-					   jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_bind (JNIEnv *env,
+                                          jclass clazz __attribute__((unused)),
+                                          jint fd, jbyteArray addr, jint port)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_create(env, obj, JNI_TRUE);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  struct sockaddr_in sockaddr;
+  jbyte *elems = NULL;
+  int ret;
+
+  if (addr != NULL)
+    elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset(&sockaddr, 0, sizeof (struct sockaddr_in));
+  sockaddr.sin_family = AF_INET;
+  sockaddr.sin_port = htons (port);
+  /* addr is already in network byte order. */
+  if (elems != NULL)
+    sockaddr.sin_addr.s_addr = *((uint32_t *) elems);
+  else
+    sockaddr.sin_addr.s_addr = INADDR_ANY;
+
+  /* bind(2) from BSD says bind will never return EINTR */
+  /* bind is not a blocking system call */
+  ret = bind (fd, (struct sockaddr *) &sockaddr, sizeof (struct sockaddr_in));
+
+  if (elems != NULL)
+    (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, BIND_EXCEPTION, strerror (errno));
+    
+  cpio_closeOnExec(ret);
 }
 
-/*************************************************************************/
 
 /*
- * Close the socket.  Any underlying streams will be closed by this
- * action as well.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    bind6
+ * Signature: (I[BI)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_close(JNIEnv *env,
-					  jclass klass __attribute__ ((__unused__)),
-					  jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_bind6 (JNIEnv *env,
+                                           jclass c __attribute__((unused)),
+                                           jint fd, jbyteArray addr, jint port)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_close(env, obj, 1);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  /* FIXME! Add check if we have IPv6! */
+  struct sockaddr_in6 sockaddr;
+  jbyte *elems;
+  int ret;
+
+  elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset (&sockaddr, 0, sizeof (struct sockaddr_in6));
+  sockaddr.sin6_family = AF_INET6;
+  sockaddr.sin6_port = htons (port);
+  memcpy (&sockaddr.sin6_addr.s6_addr, elems, 16);
+
+  /* bind(2) from BSD says bind will never return EINTR */
+  /* bind is not a blocking system call */
+  ret = bind (fd, (struct sockaddr *) &sockaddr,
+              sizeof (struct sockaddr_in6));
+
+  (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
 /*
- * Connects to the specified destination.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    listen
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_connect(JNIEnv *env,
-					    jclass klass __attribute__ ((__unused__)),
-					    jobject obj, 
-					    jobject addr, jint port)
+Java_gnu_java_net_VMPlainSocketImpl_listen (JNIEnv *env,
+                                            jclass c __attribute__((unused)),
+                                            jint fd, jint backlog)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_connect(env, obj, addr, port, 1);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  int ret;
+
+  /* listen(2) says that this call will never return EINTR */
+  /* listen is not a blocking system call */
+  if ((ret = listen (fd, backlog)) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
-/*
- * This method binds the specified address to the specified local port.
- * Note that we have to set the local address and local port public instance 
- * variables. 
+/* These constants are also defined in java/net/SocketOptions.java.
+ * Except for CPNET_IP_TTL which is defined in 
+ * vm/reference/gnu/java/net/VMPlainSocketImpl.java .
  */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_bind(JNIEnv *env,
-					 jclass klass __attribute__ ((__unused__)),
-					 jobject obj, jobject addr,
-					 jint port)
-{
-#ifndef WITHOUT_NETWORK
-  _javanet_bind(env, obj, addr, port, 1);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
+enum java_sockopt {
+  CPNET_SO_KEEPALIVE = 0x8,
+  CPNET_SO_LINGER = 0x80,
+  CPNET_SO_TIMEOUT = 0x1006,
+  CPNET_SO_BINDADDR = 0x0F,
+  CPNET_SO_SNDBUF = 0x1001,
+  CPNET_SO_RCVBUF = 0x1002,
+  CPNET_SO_REUSEADDR = 0x04,
+  CPNET_SO_BROADCAST = 0x20,
+  CPNET_SO_OOBINLINE = 0x1003,
+  CPNET_TCP_NODELAY = 0x01,
+  CPNET_IP_MULTICAST_IF = 0x10,
+  CPNET_IP_MULTICAST_IF2 = 0x1F,
+  CPNET_IP_MULTICAST_LOOP = 0x12,
+  CPNET_IP_TOS = 0x03,
+  CPNET_IP_TTL = 0x1E61
+};
 
-/*************************************************************************/
 
 /*
- * Starts listening on a socket with the specified number of pending 
- * connections allowed.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    setOption
+ * Signature: (III)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_listen(JNIEnv *env,
-					   jclass klass __attribute__ ((__unused__)),
-					   jobject obj, jint queuelen)
+Java_gnu_java_net_VMPlainSocketImpl_setOption (JNIEnv *env,
+                                               jclass c __attribute__((unused)),
+                                               jint fd, jint option, jint value)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_listen(env, obj, queuelen);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
+  enum java_sockopt joption = (enum java_sockopt) option;
+  int optname = -1;
+  int level = SOL_SOCKET;
+  const int _value = value;
+  struct linger _linger;
+  struct timeval _timeo;
+  void *optval = (void *) &_value;
+  socklen_t optlen = sizeof (int);
+  
+  switch (joption)
+    {
+    case CPNET_IP_MULTICAST_LOOP:
+      level = IPPROTO_IP;
+      optname = IP_MULTICAST_LOOP;
+      break;
+
+    case CPNET_SO_KEEPALIVE:
+      optname = SO_KEEPALIVE;
+      break;
+
+    case CPNET_SO_LINGER:
+      optname = SO_LINGER;
+      if (_value == -1)
+        _linger.l_onoff = 0;
+      else
+        _linger.l_onoff = 1;
+      _linger.l_linger = _value;
+      optval = &_linger;
+      optlen = sizeof (struct linger);
+      break;
+
+    case CPNET_SO_TIMEOUT:
+      optname = SO_RCVTIMEO;
+      _timeo.tv_sec = value / 1000;
+      _timeo.tv_usec = (value % 1000) * 1000;
+      optval = &_timeo;
+      optlen = sizeof (struct timeval);
+      break;
+
+    case CPNET_SO_SNDBUF:
+      optname = SO_SNDBUF;
+      break;
+
+    case CPNET_SO_RCVBUF:
+      optname = SO_RCVBUF;
+      break;
+
+    case CPNET_SO_REUSEADDR:
+      optname = SO_REUSEADDR;
+      break;
+
+    case CPNET_SO_BROADCAST:
+      optname = SO_BROADCAST;
+      break;
+
+    case CPNET_SO_OOBINLINE:
+      optname = SO_OOBINLINE;
+      break;
+
+    case CPNET_TCP_NODELAY:
+      level = IPPROTO_TCP;
+      optname = TCP_NODELAY;
+      break;
+
+    case CPNET_IP_TOS:
+      level = IPPROTO_IP;
+      optname = IP_TOS;
+      break;
+
+    case CPNET_IP_TTL:
+      level = IPPROTO_IP;
+      optname = IP_TTL;
+      break;
+
+    case CPNET_SO_BINDADDR:
+    case CPNET_IP_MULTICAST_IF:
+    case CPNET_IP_MULTICAST_IF2:
+      JCL_ThrowException (env, IO_EXCEPTION, "argument not a boolean or integer option");
+      return;
+    }
 
-/*************************************************************************/
+  if (setsockopt (fd, level, optname, (const void *) optval, optlen) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+}
 
 /*
- * Accepts a new connection and assigns it to the passed in SocketImpl
- * object. Note that we assume this is a PlainSocketImpl just like us.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    getOption
+ * Signature: (II)I
  */
-JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_accept(JNIEnv *env,
-					   jclass klass __attribute__ ((__unused__)),
-					   jobject obj, jobject impl)
+JNIEXPORT jint JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_getOption (JNIEnv *env,
+                                               jclass c __attribute__((unused)),
+                                               jint fd, jint option)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_accept(env, obj, impl);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
+  enum java_sockopt joption = (enum java_sockopt) option;
+  int optname = -1;
+  int level = SOL_SOCKET;
+  int value;
+  struct linger linger;
+  struct timeval timeo;
+  void *optval = &value;
+  socklen_t optlen = sizeof (int);
+
+  switch (joption)
+    {
+    case CPNET_IP_MULTICAST_LOOP:
+      level = IPPROTO_IP;
+      optname = IP_MULTICAST_LOOP;
+      break;
+
+    case CPNET_SO_KEEPALIVE:
+      optname = SO_KEEPALIVE;
+      break;
+
+    case CPNET_SO_LINGER:
+      optname = SO_LINGER;
+      optval = &linger;
+      optlen = sizeof (struct linger);
+      break;
+
+    case CPNET_SO_TIMEOUT:
+      optname = SO_RCVTIMEO;
+      optval = &timeo;
+      optlen = sizeof (struct timeval);
+      break;
+
+    case CPNET_SO_SNDBUF:
+      optname = SO_SNDBUF;
+      break;
+
+    case CPNET_SO_RCVBUF:
+      optname = SO_RCVBUF;
+      break;
+
+    case CPNET_SO_REUSEADDR:
+      optname = SO_REUSEADDR;
+      break;
+
+    case CPNET_SO_BROADCAST:
+      optname = SO_BROADCAST;
+      break;
+
+    case CPNET_SO_OOBINLINE:
+      optname = SO_OOBINLINE;
+      break;
+
+    case CPNET_TCP_NODELAY:
+      level = IPPROTO_TCP;
+      optname = TCP_NODELAY;
+      break;
+
+    case CPNET_IP_TOS:
+      level = IPPROTO_IP;
+      optname = IP_TOS;
+      break;
+
+    case CPNET_IP_TTL:
+      level = IPPROTO_IP;
+      optname = IP_TTL;
+      break;
+
+    case CPNET_SO_BINDADDR:
+    case CPNET_IP_MULTICAST_IF:
+    case CPNET_IP_MULTICAST_IF2:
+      JCL_ThrowException (env, IO_EXCEPTION, "argument not a boolean or integer option");
+      return -1;
+    }
 
-/*************************************************************************/
+  if (getsockopt (fd, level, optname, optval, &optlen) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 
-JNIEXPORT jint JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_available(JNIEnv *env,
-					      jclass klass __attribute__ ((__unused__)),
-					      jobject obj)
+  /* Returns the linger value if it is enabled or -1 in case
+   * it is disabled. This is how the Java API expects it.
+   */
+  if (joption == CPNET_SO_LINGER)
+    return (linger.l_onoff) ? linger.l_linger : -1;
+  if (joption == CPNET_SO_TIMEOUT)
+    return (timeo.tv_sec * 1000) + (timeo.tv_usec / 1000);
+
+  return value;
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface (JNIEnv *env,
+                                                           jclass c __attribute__((unused)),
+                                                           jint fd,
+                                                           jint optionId __attribute__((unused)),
+                                                           jobject addr)
 {
-#ifndef WITHOUT_NETWORK
-  jclass   cls;
-  jfieldID fid;
-  int      fd;
-  int      bytesAvailable;
-  int      result;
+  int result;
+  cpnet_address *cpaddr = _javanet_get_ip_netaddr (env, addr);
+
+  if ((*env)->ExceptionOccurred (env))
+    return;
+
+  result = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
+                      (struct sockaddr *) cpaddr->data, cpaddr->len);
+
+  cpnet_freeAddress (env, cpaddr);
   
-  cls = (*env)->GetObjectClass(env, obj);
-  if (cls == 0)
+  if (result == -1)
+    JCL_ThrowException (env, SOCKET_EXCEPTION, cpnative_getErrorString (errno));
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface6 (JNIEnv *env,
+                                                           jclass c __attribute__((unused)),
+                                                           jint fd,
+                                                           jint optionId __attribute__((unused)),
+                                                           jstring ifname)
+{
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6	
+  int result;
+  const char *str_ifname = JCL_jstring_to_cstring (env, ifname);
+  u_int if_index;
+
+  if ((*env)->ExceptionOccurred (env))
     {
-      JCL_ThrowException(env, IO_EXCEPTION, "internal error");
-      return 0;
+      JCL_free_cstring(env, ifname, str_ifname);
+      return;
     }
-  
-  fid = (*env)->GetFieldID(env, cls, "native_fd", "I"); 
-  if (fid == 0)
+
+  if_index = if_nametoindex(str_ifname);
+  if (!if_index)
     {
-      JCL_ThrowException(env, IO_EXCEPTION, "internal error");
-      return 0;
+      JCL_free_cstring(env, ifname, str_ifname);
+      JCL_ThrowException (env, SOCKET_EXCEPTION, "interface does not exist");
+      return;
     }
 
-  fd = (*env)->GetIntField(env, obj, fid);
+  result = setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+                      (u_int *) &if_index, sizeof(if_index));
+
+  JCL_free_cstring(env, ifname, str_ifname);
   
-  TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(fd,bytesAvailable,result);
-  if (result != TARGET_NATIVE_OK)
+  if (result == -1)
+    JCL_ThrowException (env, SOCKET_EXCEPTION, cpnative_getErrorString (errno));
+#else
+  (void) fd;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
+
+JNIEXPORT jobject JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_getMulticastInterface (JNIEnv *env,
+                                                           jclass c __attribute__((unused)),
+                                                           jint fd,
+                                                           jint optionId __attribute__((unused)))
+{
+  jobject obj;
+  cpnet_address *cpaddr;
+  int result = cpnet_getMulticastIF (env, fd, &cpaddr);
+ 
+  if (result != CPNATIVE_OK)
     {
-      JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING());
-      return 0;
+      JCL_ThrowException (env, SOCKET_EXCEPTION,
+                          cpnative_getErrorString (result));
+      return (0);
     }
 
-  return bytesAvailable;
-#else /* not WITHOUT_NETWORK */
-  return 0;
-#endif /* not WITHOUT_NETWORK */
+  obj = _javanet_create_inetaddress (env, cpaddr);
+  cpnet_freeAddress (env, cpaddr);
+
+  return obj;
 }
 
-/*************************************************************************/
 
 /*
- * This method sets the specified option for a socket
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    shutdownInput
+ * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_setOption(JNIEnv *env,
-					      jclass klass __attribute__ ((__unused__)),
-					      jobject obj, 
-					      jint option_id, jobject val)
+Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv *env,
+                                                   jclass c __attribute__((unused)),
+                                                   jint fd)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_set_option(env, obj, option_id, val);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  if (shutdown (fd, SHUT_RD) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+}
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    shutdownOutput
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv *env,
+                                                    jclass c __attribute__((unused)),
+                                                    jint fd)
+{
+  if (shutdown (fd, SHUT_WR) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
 /*
- * This method gets the specified option for a socket
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    sendUrgentData
+ * Signature: (II)V
  */
-JNIEXPORT jobject JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_getOption(JNIEnv *env,
-					      jclass klass __attribute__ ((__unused__)),
-					      jobject obj, 
-					      jint option_id)
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData (JNIEnv *env,
+                                                    jclass c __attribute__((unused)),
+                                                    jint fd, jint data)
 {
-#ifndef WITHOUT_NETWORK
-  return(_javanet_get_option(env, obj, option_id));
-#else /* not WITHOUT_NETWORK */
-  return NULL;
-#endif /* not WITHOUT_NETWORK */
+  const char x = (char) data;
+
+  if (send (fd, &x, 1, MSG_OOB) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
 /*
- * Reads a buffer from a remote host
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    join
+ * Signature: (I[B)V
  */
-JNIEXPORT jint JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_read(JNIEnv *env,
-					 jclass klass __attribute__ ((__unused__)),
-					 jobject obj, jarray buf,
-					 jint offset, jint len)
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_join (JNIEnv *env,
+                                          jclass clazz __attribute__((unused)),
+                                          jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  return(_javanet_recvfrom(env, obj, buf, offset, len, 0, 0));
-#else /* not WITHOUT_NETWORK */
-  return 0;
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+  maddr.imr_interface.s_addr = INADDR_ANY;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
-/*************************************************************************/
 
 /*
- * Writes a buffer to the remote host
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    join6
+ * Signature: (I[B)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_write(JNIEnv *env,
-					  jclass klass __attribute__ ((__unused__)),
-					  jobject obj, jarray buf,
-					  jint offset, jint len)
+Java_gnu_java_net_VMPlainSocketImpl_join6 (JNIEnv *env,
+                                           jclass clazz __attribute__((unused)),
+                                           jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_sendto(env, obj, buf, offset, len, 0, 0);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+  maddr.ipv6mr_interface = 0;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leave
+ * Signature: (I[B)V
+ */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv * env,
-						   jclass klass __attribute__ ((__unused__)),
-						   jobject this)
+Java_gnu_java_net_VMPlainSocketImpl_leave (JNIEnv *env,
+                                           jclass c __attribute__((unused)),
+                                           jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_shutdownInput (env, this);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+  maddr.imr_interface.s_addr = INADDR_ANY;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leave6
+ * Signature: (I[B)V
+ */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv * env,
-						    jclass klass __attribute__ ((__unused__)),
-						    jobject this)
+Java_gnu_java_net_VMPlainSocketImpl_leave6 (JNIEnv *env,
+                                            jclass c __attribute__((unused)),
+                                            jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_shutdownOutput (env, this);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+  maddr.ipv6mr_interface = 0;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
-/* end of file */
+static uint32_t getif_address (JNIEnv *env, const char *ifname);
+static int getif_index (JNIEnv *env, const char *ifname);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    joinGroup
+ * Signature: (I[BILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_joinGroup (JNIEnv *env,
+                                               jclass c __attribute__((unused)),
+                                               jint fd, jbyteArray addr,
+                                               jstring ifname)
+{
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+  const char *str_ifname;
+
+  if (ifname != NULL)
+    {
+      str_ifname = JCL_jstring_to_cstring(env, ifname);
+      maddr.imr_interface.s_addr = getif_address (env, str_ifname);
+      JCL_free_cstring(env, ifname, str_ifname);
+
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.imr_interface.s_addr = INADDR_ANY;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+
+#else
+  (void) fd;
+  (void) addr;
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    joinGroup6
+ * Signature: (I[BILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_joinGroup6 (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint fd, jbyteArray addr,
+                                                jstring ifname)
+{
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+  const char *str_ifname;
+
+  if (ifname == NULL)
+    {
+      str_ifname = JCL_jstring_to_cstring(env, ifname);
+      maddr.ipv6mr_interface = getif_index (env, str_ifname);
+      JCL_free_cstring(env, ifname, str_ifname);
+
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.ipv6mr_interface = 0;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leaveGroup
+ * Signature: (I[BILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_leaveGroup (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint fd, jbyteArray addr,
+                                                jstring ifname)
+{
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+  const char *str_ifname;
+
+  if (ifname != NULL)
+    {
+      str_ifname = JCL_jstring_to_cstring(env, ifname);
+      maddr.imr_interface.s_addr = getif_address (env, str_ifname);
+      JCL_free_cstring(env, ifname, str_ifname);
+
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.imr_interface.s_addr = INADDR_ANY;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leaveGroup6
+ * Signature: (I[BILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6 (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint fd, jbyteArray addr,
+                                                jstring ifname)
+{
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+  const char *str_ifname;
+
+  if (ifname == NULL)
+    {
+      str_ifname = JCL_jstring_to_cstring(env, ifname);
+      maddr.ipv6mr_interface = getif_index (env, str_ifname);
+      JCL_free_cstring(env, ifname, str_ifname);
+
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.ipv6mr_interface = 0;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
+
+static uint32_t
+getif_address (JNIEnv *env, const char *ifname)
+{
+#if defined (HAVE_IFADDRS_H) && defined (HAVE_GETIFADDRS)
+  struct ifaddrs *ifaddrs, *i;
+  uint32_t addr = 0;
+  int foundaddr = 0;
+
+  if (getifaddrs (&ifaddrs) == -1)
+    {
+      JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+      return 0;
+    }
+
+  for (i = ifaddrs; i != NULL; i = i->ifa_next)
+    {
+      if (strcmp (ifname, i->ifa_name) == 0)
+        {
+          /* Matched the name; see if there is an IPv4 address. */
+          if (i->ifa_addr->sa_family == AF_INET)
+            {
+              foundaddr = 1;
+              addr = ((struct sockaddr_in *) i->ifa_addr)->sin_addr.s_addr;
+              break;
+            }
+        }
+    }
+
+  if (!foundaddr)
+    JCL_ThrowException (env, SOCKET_EXCEPTION, "interface has no IPv4 address");
+
+  freeifaddrs (ifaddrs);
+
+  return addr;
+#else
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "getifaddrs not available");
+  return 0;
+#endif /* HAVE_IFADDRS_H && HAVE_GETIFADDRS */
+}
+
+static int
+getif_index (JNIEnv *env, const char *ifname)
+{
+#if defined (HAVE_IFADDRS_H) && defined (HAVE_GETIFADDRS)
+  struct ifaddrs *ifaddrs, *i;
+  char *lastname = NULL;
+  int index = 1;
+  int foundname = 0;
+
+  if (getifaddrs (&ifaddrs) == -1)
+    {
+      JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+      return -1;
+    }
+
+  lastname = ifaddrs->ifa_name;
+  for (i = ifaddrs; i != NULL; i = i->ifa_next)
+    {
+      if (strcmp (lastname, ifaddrs->ifa_name) != 0)
+        {
+          lastname = ifaddrs->ifa_name;
+          index++;
+        }
+      if (strcmp (ifname, ifaddrs->ifa_name) == 0)
+        {
+          foundname = 1;
+          break;
+        }
+    }
+
+  if (!foundname)
+    JCL_ThrowException (env, SOCKET_EXCEPTION,
+                        "no interface with that name");
+
+  freeifaddrs (ifaddrs);
+
+  return index;
+#else
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "getifaddrs not available");
+  return -1;
+#endif /* HAVE_GETIFADDRS */
+}
diff --git a/libjava/classpath/native/jni/java-net/gnu_java_net_local_LocalSocketImpl.c b/libjava/classpath/native/jni/java-net/gnu_java_net_local_LocalSocketImpl.c
index 35fb6bcdcc7..f2b2f8e63b8 100644
--- a/libjava/classpath/native/jni/java-net/gnu_java_net_local_LocalSocketImpl.c
+++ b/libjava/classpath/native/jni/java-net/gnu_java_net_local_LocalSocketImpl.c
@@ -38,9 +38,7 @@ exception statement from your version.  */
 
 #define _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #include <gnu_java_net_local_LocalSocketImpl.h>
 
diff --git a/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c b/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c
index 86ac06e6f79..fc921ecef1f 100644
--- a/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c
+++ b/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c
@@ -45,13 +45,10 @@ exception statement from your version. */
 #include <jni.h>
 #include <jcl.h>
 
+#include "cpnative.h"
+#include "cpnet.h"
 #include "javanet.h"
 
-#include "target_native.h"
-#ifndef WITHOUT_NETWORK
-#include "target_native_network.h"
-#endif /* WITHOUT_NETWORK */
-
 #include "java_net_VMInetAddress.h"
 
 /*************************************************************************/
@@ -69,8 +66,8 @@ Java_java_net_VMInetAddress_getLocalHostname (JNIEnv * env,
   jstring retval;
 
 #ifndef WITHOUT_NETWORK
-  TARGET_NATIVE_NETWORK_GET_HOSTNAME (hostname, sizeof (hostname), result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getHostname (env, hostname, sizeof (hostname));
+  if (result != CPNATIVE_OK)
     {
       strcpy (hostname, "localhost");
     }
@@ -94,6 +91,7 @@ Java_java_net_VMInetAddress_lookupInaddrAny (JNIEnv * env,
 					     __attribute__ ((__unused__)))
 {
   jarray IParray;
+  cpnet_address *addr;
   jbyte *octets;
 
   /* Allocate an array for the IP address */
@@ -108,11 +106,10 @@ Java_java_net_VMInetAddress_lookupInaddrAny (JNIEnv * env,
   octets = (*env)->GetByteArrayElements (env, IParray, 0);
 
 #ifndef WITHOUT_NETWORK
-  TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (INADDR_ANY,
-						octets[0],
-						octets[1],
-						octets[2], octets[3]);
-  (*env)->ReleaseByteArrayElements (env, IParray, octets, 0);
+  addr = cpnet_newIPV4Address (env);
+  cpnet_setIPV4Any (addr);
+  cpnet_IPV4AddressToBytes (addr, octets);
+  cpnet_freeAddress (env, addr);
 #else /* not WITHOUT_NETWORK */
   octets[0] = 0;
   octets[1] = 0;
@@ -120,6 +117,8 @@ Java_java_net_VMInetAddress_lookupInaddrAny (JNIEnv * env,
   octets[3] = 0;
 #endif /* not WITHOUT_NETWORK */
 
+  (*env)->ReleaseByteArrayElements (env, IParray, octets, 0);
+
   return (IParray);
 }
 
@@ -138,14 +137,14 @@ Java_java_net_VMInetAddress_getHostByAddr (JNIEnv * env,
 #ifndef WITHOUT_NETWORK
   jbyte *octets;
   jsize len;
-  int addr;
+  cpnet_address *addr;
   char hostname[255];
   int result;
   jstring retval;
 
   /* Grab the byte[] array with the IP out of the input data */
   len = (*env)->GetArrayLength (env, arr);
-  if (len != 4)
+  if (len != 4 && len != 16)
     {
       JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address");
       return (jstring) NULL;
@@ -158,21 +157,31 @@ Java_java_net_VMInetAddress_getHostByAddr (JNIEnv * env,
       return (jstring) NULL;
     }
 
-  /* Convert it to a 32 bit address */
-  TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0],
-						octets[1],
-						octets[2], octets[3], addr);
+  switch (len)
+    {
+    case 4:
+      addr = cpnet_newIPV4Address(env);
+      cpnet_bytesToIPV4Address (addr, octets);      
+      break;
+    case 16:
+      addr = cpnet_newIPV6Address(env);
+      cpnet_bytesToIPV6Address (addr, octets);
+      break;
+    default:
+      JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address");
+      return (jstring) NULL;
+
+   }
 
   /* Release some memory */
   (*env)->ReleaseByteArrayElements (env, arr, octets, 0);
 
   /* Resolve the address and return the name */
-  TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_ADDRESS (addr, hostname,
-						 sizeof (hostname), result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getHostByAddr (env, addr, hostname, sizeof (hostname));
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       return (jstring) NULL;
     }
 
@@ -194,16 +203,14 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
 {
 #ifndef WITHOUT_NETWORK
   const char *hostname;
-/* FIXME: limitation of max. 64 addresses - how to make it more flexibale? */
-  int addresses[64];
+  cpnet_address **addresses;
   jsize addresses_count;
   int result;
   jclass arr_class;
   jobjectArray addrs;
-  int i;
+  jint i;
   jbyte *octets;
   jarray ret_octets;
-  int max_addresses;
 
   /* Grab the hostname string */
   hostname = (*env)->GetStringUTFChars (env, host, 0);
@@ -213,12 +220,8 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
       return (jobjectArray) NULL;
     }
 
-  max_addresses = sizeof (addresses) / sizeof (addresses[0]);
-  TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_NAME (hostname,
-					      addresses,
-					      max_addresses,
-					      addresses_count, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getHostByName (env, hostname, &addresses, &addresses_count);
+  if (result != CPNATIVE_OK || addresses_count == 0)
     {
       JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, (char *) hostname);
       return (jobjectArray) NULL;
@@ -242,28 +245,144 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
   /* Now loop and copy in each address */
   for (i = 0; i < addresses_count; i++)
     {
-      ret_octets = (*env)->NewByteArray (env, 4);
-      if (!ret_octets)
+      if (cpnet_isIPV6Address (addresses[i]))
+	{
+	  ret_octets = (*env)->NewByteArray (env, 16);
+
+	  if (!ret_octets)
+	    {
+	      JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+	      cpnet_freeAddresses (env, addresses, addresses_count);
+	      return (jobjectArray) NULL;
+	    }
+	  
+	  octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
+
+	  cpnet_IPV6AddressToBytes (addresses[i], octets);
+
+	  (*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
+
+	  (*env)->SetObjectArrayElement (env, addrs, i, ret_octets);
+	}
+      else if (cpnet_isIPV4Address (addresses[i]))
+	{
+	  ret_octets = (*env)->NewByteArray (env, 4);
+
+	  if (!ret_octets)
+	    {
+	      JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+	      cpnet_freeAddresses (env, addresses, addresses_count);
+	      return (jobjectArray) NULL;
+	    }
+	  
+	  octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
+
+	  cpnet_IPV4AddressToBytes (addresses[i], octets);
+
+	  (*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
+
+	  (*env)->SetObjectArrayElement (env, addrs, i, ret_octets);
+	}
+      else
 	{
 	  JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+	  cpnet_freeAddresses (env, addresses, addresses_count);
 	  return (jobjectArray) NULL;
 	}
+    }
+
+  cpnet_freeAddresses (env, addresses, addresses_count);
+
+  return (addrs);
+#else /* not WITHOUT_NETWORK */
+  return (jobjectArray) NULL;
+#endif /* not WITHOUT_NETWORK */
+}
+
+/*************************************************************************/
+
+/*
+ * Return the IP address represented by a literal address.
+ * Will return null if the literal address is not valid.
+ */
+JNIEXPORT jbyteArray JNICALL
+Java_java_net_VMInetAddress_aton (JNIEnv *env,
+				  jclass class
+				  __attribute__ ((__unused__)),
+				  jstring host)
+{
+#ifndef WITHOUT_NETWORK
+  const char *hostname;
+  cpnet_address *address;
+  int result;
+  jbyte *octets;
+  jbyteArray ret_octets;
+
+  hostname = (*env)->GetStringUTFChars (env, host, 0);
+  if (!hostname)
+    {
+      JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Null hostname");
+      return (jbyteArray) NULL;
+    }
+
+  result = cpnet_aton (env, hostname, &address);
+  if (result != CPNATIVE_OK)
+    {
+      JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+      if (address)
+	cpnet_freeAddress (env, address);
+      return (jbyteArray) NULL;
+    }
+  if (!address)
+    return (jbyteArray) NULL;
 
+  if (cpnet_isIPV6Address (address))
+    {
+      ret_octets = (jbyteArray) (*env)->NewByteArray (env, 16);
+
+      if (!ret_octets)
+	{
+	  JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+	  cpnet_freeAddress (env, address);
+	  return (jbyteArray) NULL;
+	}
+	  
       octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
 
-      TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (addresses[i],
-						    octets[0],
-						    octets[1],
-						    octets[2], octets[3]);
+      cpnet_IPV6AddressToBytes (address, octets);
 
       (*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
+    }
+  else if (cpnet_isIPV4Address (address))
+    {
+      ret_octets = (jbyteArray) (*env)->NewByteArray (env, 4);
+
+      if (!ret_octets)
+	{
+	  JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+	  cpnet_freeAddress (env, address);
+	  return (jbyteArray) NULL;
+	}
+	  
+      octets = (*env)->GetByteArrayElements (env, ret_octets, 0);
+
+      cpnet_IPV4AddressToBytes (address, octets);
 
-      (*env)->SetObjectArrayElement (env, addrs, i, ret_octets);
+      (*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0);
+    }
+  else
+    {
+      JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error");
+      cpnet_freeAddress (env, address);
+      return (jbyteArray) NULL;
     }
 
-  return (addrs);
+  cpnet_freeAddress (env, address);
+
+  return (ret_octets);
+  
 #else /* not WITHOUT_NETWORK */
-  return (jobjectArray) NULL;
+  return (jbyteArray) NULL;
 #endif /* not WITHOUT_NETWORK */
 }
 
diff --git a/libjava/classpath/native/jni/java-net/java_net_VMNetworkInterface.c b/libjava/classpath/native/jni/java-net/java_net_VMNetworkInterface.c
index f05e9fcc5a2..b51bf68ecee 100644
--- a/libjava/classpath/native/jni/java-net/java_net_VMNetworkInterface.c
+++ b/libjava/classpath/native/jni/java-net/java_net_VMNetworkInterface.c
@@ -35,9 +35,17 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-/* do not move; needed here because of some macro definitions */
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif /* HAVE_CONFIG_H */
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#include <netinet/in.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -47,19 +55,197 @@ exception statement from your version. */
 
 #include "java_net_VMNetworkInterface.h"
 
-#include "javanet.h"
+
+static jmethodID java_net_VMNetworkInterface_init;
+static jmethodID java_net_VMNetworkInterface_addAddress;
 
 /*
- * Returns all local network interfaces as vector
+ * Initialize our static method ID's.
+ *
+ * Class:     java_net_VMNetworkInterface
+ * Method:    initIds
+ * Signature: ()V
  */
-JNIEXPORT jobject JNICALL
-Java_java_net_VMNetworkInterface_getInterfaces (JNIEnv * env,
-						jclass class
-						__attribute__ ((__unused__)))
+JNIEXPORT void JNICALL
+Java_java_net_VMNetworkInterface_initIds (JNIEnv *env, jclass clazz)
+{
+  java_net_VMNetworkInterface_init =
+    (*env)->GetMethodID (env, clazz, "<init>", "(Ljava/lang/String;)V");
+  if (java_net_VMNetworkInterface_init == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, "java/lang/NoSuchMethodError",
+                            "VMNetworkinterface.addAddress");
+      return;
+    }
+  java_net_VMNetworkInterface_addAddress =
+    (*env)->GetMethodID (env, clazz, "addAddress", "(Ljava/nio/ByteBuffer;)V");
+  if (java_net_VMNetworkInterface_addAddress == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, "java/lang/NoSuchMethodError",
+                            "VMNetworkinterface.addAddress");
+    }
+}
+
+struct netif_entry
+{
+  char *name;
+  jobject netif;
+  int numaddrs;
+  struct netif_entry *next;
+};
+
+static void
+free_netif_list (JNIEnv *env, struct netif_entry *list)
 {
-  JCL_ThrowException (env, IO_EXCEPTION,
-		      "java.net.VMNetworkInterface.getInterfaces(): not implemented");
-  return 0;
+  while (list != NULL)
+    {
+      struct netif_entry *e = list->next;
+      JCL_free (env, list);
+      list = e;
+    }
+}
+
+/*
+ * Returns all local network interfaces as an array.
+ */
+JNIEXPORT jobjectArray JNICALL
+Java_java_net_VMNetworkInterface_getVMInterfaces (JNIEnv * env, jclass clazz)
+{
+#if defined (HAVE_IFADDRS_H) && defined (HAVE_GETIFADDRS)
+  struct ifaddrs *ifaddrs, *i;
+  struct netif_entry *iflist = NULL, *e;
+  jobjectArray netifs;
+  int numifs = 0;
+  int k;
+
+  if (getifaddrs (&ifaddrs) == -1)
+    {
+      JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+      return NULL;
+    }
+
+  for (i = ifaddrs; i != NULL; i = i->ifa_next)
+    {
+      if (iflist == NULL)
+        {
+          iflist = JCL_malloc (env, sizeof (struct netif_entry));
+          if (iflist == NULL)
+            {
+              freeifaddrs (ifaddrs);
+              return NULL;
+            }
+          iflist->name = i->ifa_name;
+          iflist->numaddrs = 0;
+          iflist->next = NULL;
+          iflist->netif = (*env)->NewObject (env, clazz, java_net_VMNetworkInterface_init,
+                                             (*env)->NewStringUTF (env, i->ifa_name));
+          if (iflist->netif == NULL)
+            {
+              freeifaddrs (ifaddrs);
+              JCL_free (env, iflist);
+              return NULL;
+            }
+          e = iflist;
+        }
+      else
+        {
+          struct netif_entry *p = NULL;
+          for (e = iflist; e != NULL; e = e->next)
+            {
+              if (strcmp (e->name, i->ifa_name) == 0)
+                break;
+              p = e;
+            }
+
+          if (e == NULL)
+            {
+              p->next = (struct netif_entry *) JCL_malloc (env, sizeof (struct netif_entry));
+              if (p->next == NULL)
+                {
+                  free_netif_list (env, iflist);
+                  freeifaddrs (ifaddrs);
+                  return NULL;
+                }
+              e = p->next;
+              e->name = i->ifa_name;
+              e->numaddrs = 0;
+              e->next = NULL;
+              e->netif = (*env)->NewObject (env, clazz, java_net_VMNetworkInterface_init,
+                                            (*env)->NewStringUTF (env, i->ifa_name));
+              if (e->netif == NULL)
+                {
+                  free_netif_list (env, iflist);
+                  freeifaddrs (ifaddrs);
+                  return NULL;
+                }
+            }
+        }
+
+      if (i->ifa_addr == NULL)
+        continue;
+
+      if (i->ifa_addr->sa_family == AF_INET)
+        {
+          struct sockaddr_in *sin = (struct sockaddr_in *) i->ifa_addr;
+          jobject buffer = (*env)->NewDirectByteBuffer (env, &(sin->sin_addr.s_addr), 4);
+          (*env)->CallVoidMethod (env, e->netif, java_net_VMNetworkInterface_addAddress,
+                                  buffer);
+          if ((*env)->ExceptionCheck (env))
+            {
+              free_netif_list (env, iflist);
+              freeifaddrs (ifaddrs);
+              return NULL;
+            }
+          (*env)->DeleteLocalRef (env, buffer);
+          e->numaddrs++;
+        }
+#ifdef HAVE_INET6
+      else if (i->ifa_addr->sa_family == AF_INET6)
+        {
+          struct sockaddr_in6 *sin = (struct sockaddr_in6 *) i->ifa_addr;
+          jobject buffer = (*env)->NewDirectByteBuffer (env, &(sin->sin6_addr.s6_addr), 16);
+          (*env)->CallVoidMethod (env, e->netif, java_net_VMNetworkInterface_addAddress,
+                                  buffer);
+          if ((*env)->ExceptionCheck (env))
+            {
+              free_netif_list (env, iflist);
+              freeifaddrs (ifaddrs);
+              return NULL;
+            }
+          (*env)->DeleteLocalRef (env, buffer);
+          e->numaddrs++;
+        }
+#endif /* HAVE_INET6 */
+    }
+
+  /* Count how many interfaces we have that have addresses. */
+  for (e = iflist; e != NULL; e = e->next)
+    {
+      if (e->numaddrs != 0)
+        numifs++;
+    }
+
+  netifs = (*env)->NewObjectArray (env, numifs, clazz, NULL);
+  k = 0;
+  for (e = iflist; e != NULL && k < numifs; e = e->next)
+    {
+      if (e->numaddrs != 0)
+        {
+          (*env)->SetObjectArrayElement (env, netifs, k, e->netif);
+          (*env)->DeleteLocalRef (env, e->netif);
+          k++;
+        }
+    }
+
+  free_netif_list (env, iflist);
+  freeifaddrs (ifaddrs);
+  return netifs;
+#else
+  JCL_ThrowException (env, "java/net/SocketException", "getifaddrs not supported");
+  return NULL;
+#endif /* HAVE_GETIFADDRS */
 }
 
 /* end of file */
diff --git a/libjava/classpath/native/jni/java-net/javanet.c b/libjava/classpath/native/jni/java-net/javanet.c
index e500c608431..1d2f7202a17 100644
--- a/libjava/classpath/native/jni/java-net/javanet.c
+++ b/libjava/classpath/native/jni/java-net/javanet.c
@@ -45,12 +45,10 @@ exception statement from your version. */
 #include <jni.h>
 #include <jcl.h>
 
-#include "javanet.h"
+#include "cpnative.h"
+#include "cpnet.h"
 
-#include "target_native.h"
-#ifndef WITHOUT_NETWORK
-#include "target_native_network.h"
-#endif /* WITHOUT_NETWORK */
+#include "javanet.h"
 
 #ifndef WITHOUT_NETWORK
 /* Need to have some value for SO_TIMEOUT */
@@ -234,23 +232,20 @@ _javanet_create_integer (JNIEnv * env, jint val)
 /*
  * Builds an InetAddress object from a 32 bit address in host byte order
  */
-static jobject
-_javanet_create_inetaddress (JNIEnv * env, int netaddr)
+jobject
+_javanet_create_inetaddress (JNIEnv * env, cpnet_address *netaddr)
 {
 #ifndef WITHOUT_NETWORK
-  unsigned char octets[4];
-  char buf[16];
+  jbyte octets[4];
+  char buf[64];
   jclass ia_cls;
   jmethodID mid;
   jstring ip_str;
   jobject ia;
 
   /* Build a string IP address */
-  TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (netaddr,
-						octets[0],
-						octets[1],
-						octets[2], octets[3]);
-  sprintf (buf, "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]);
+  cpnet_IPV4AddressToBytes(netaddr, octets);
+  sprintf (buf, "%d.%d.%d.%d", (int) (unsigned char)octets[0], (int)(unsigned char)octets[1], (int)(unsigned char)octets[2], (int)(unsigned char)octets[3]);
   DBG ("_javanet_create_inetaddress(): Created ip addr string\n");
 
   /* Get an InetAddress object for this IP */
@@ -320,7 +315,7 @@ _javanet_set_remhost_addr (JNIEnv * env, jobject this, jobject ia)
  * InetAddress for the specified addr
  */
 static void
-_javanet_set_remhost (JNIEnv * env, jobject this, int netaddr)
+_javanet_set_remhost (JNIEnv * env, jobject this, cpnet_address *netaddr)
 {
   jobject ia;
 
@@ -338,19 +333,20 @@ _javanet_set_remhost (JNIEnv * env, jobject this, int netaddr)
 /*************************************************************************/
 
 /*
- * Returns a 32 bit Internet address for the passed in InetAddress object
+ * Returns an Internet address for the passed in InetAddress object
  */
-int
-_javanet_get_netaddr (JNIEnv * env, jobject addr)
+cpnet_address *
+_javanet_get_ip_netaddr (JNIEnv * env, jobject addr)
 {
 #ifndef WITHOUT_NETWORK
   jclass cls = 0;
   jmethodID mid;
   jarray arr = 0;
   jbyte *octets;
-  int netaddr, len;
+  cpnet_address *netaddr;
+  jint len;
 
-  DBG ("_javanet_get_netaddr(): Entered _javanet_get_netaddr\n");
+  DBG ("_javanet_get_ip_netaddr(): Entered _javanet_get_ip_netaddr\n");
 
   if (addr == NULL)
     {
@@ -368,36 +364,51 @@ _javanet_get_netaddr (JNIEnv * env, jobject addr)
   if (mid == NULL)
     return 0;
 
-  DBG ("_javanet_get_netaddr(): Got getAddress method\n");
+  DBG ("_javanet_get_ip_netaddr(): Got getAddress method\n");
 
   arr = (*env)->CallObjectMethod (env, addr, mid);
   if (arr == NULL)
     return 0;
 
-  DBG ("_javanet_get_netaddr(): Got the address\n");
+  DBG ("_javanet_get_ip_netaddr(): Got the address\n");
 
-  /* Turn the IP address into a 32 bit Internet address in network byte order */
+  /* Turn the IP address into a system cpnet address.
+   * If the length is 4 then it is an IPV4 address, if it
+   * is 16 then it is an IPV6 address else it is an InternError. */
   len = (*env)->GetArrayLength (env, arr);
-  if (len != 4)
+  if (len != 4 && len != 16)
     {
       JCL_ThrowException (env, IO_EXCEPTION, "Internal Error");
       return 0;
     }
-  DBG ("_javanet_get_netaddr(): Length ok\n");
+  DBG ("_javanet_get_ip_netaddr(): Length ok\n");
 
   octets = (*env)->GetByteArrayElements (env, arr, 0);
   if (octets == NULL)
     return 0;
 
-  DBG ("_javanet_get_netaddr(): Grabbed bytes\n");
+  DBG ("_javanet_get_ip_netaddr(): Grabbed bytes\n");
 
-  TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0],
-						octets[1],
-						octets[2],
-						octets[3], netaddr);
+  switch (len)
+    {
+    case 4:      
+      netaddr = cpnet_newIPV4Address(env);
+      cpnet_bytesToIPV4Address(netaddr, octets);
+      break;
+    case 16:
+      netaddr = cpnet_newIPV6Address(env);
+      cpnet_bytesToIPV6Address(netaddr, octets);
+      break;
+    default:
+      /* This should not happen as we have checked before.
+       * But that way we shut the compiler warnings */
+      JCL_ThrowException (env, IO_EXCEPTION, "Internal Error");
+      return 0;
+      
+    }
 
   (*env)->ReleaseByteArrayElements (env, arr, octets, 0);
-  DBG ("_javanet_get_netaddr(): Done getting addr\n");
+  DBG ("_javanet_get_ip_netaddr(): Done getting addr\n");
 
   return netaddr;
 #else /* not WITHOUT_NETWORK */
@@ -419,29 +430,29 @@ _javanet_create (JNIEnv * env, jobject this, jboolean stream)
   if (stream)
     {
       /* create a stream socket */
-      TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM (fd, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_openSocketStream(env, &fd, AF_INET);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return;
 	}
     }
   else
     {
       /* create a datagram socket, set broadcast option */
-      TARGET_NATIVE_NETWORK_SOCKET_OPEN_DATAGRAM (fd, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_openSocketDatagram (env, &fd, AF_INET);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return;
 	}
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST (fd, 1, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_setBroadcast(env, fd, 1);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return;
 	}
     }
@@ -458,13 +469,11 @@ _javanet_create (JNIEnv * env, jobject this, jboolean stream)
       /* Try to make sure we close the socket since close() won't work. */
       do
 	{
-	  TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
-	  if (result != TARGET_NATIVE_OK
-	      && (TARGET_NATIVE_LAST_ERROR ()
-		  != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
+	  result = cpnet_close(env, fd);
+	  if (result != CPNATIVE_OK && result != CPNATIVE_EINTR)
 	    return;
 	}
-      while (result != TARGET_NATIVE_OK);
+      while (result != CPNATIVE_OK);
       return;
     }
 
@@ -498,18 +507,16 @@ _javanet_close (JNIEnv * env, jobject this, int stream)
 			    "native_fd", -1);
   do
     {
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_close (env, fd);
+      if (result != CPNATIVE_OK)
 	{
 	  /* Only throw an error when a "real" error occurs. */
-	  error = TARGET_NATIVE_LAST_ERROR ();
-	  if (error != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL
-	      && error != ENOTCONN && error != ECONNRESET && error != EBADF)
+	  if (result != CPNATIVE_EINTR && result != ENOTCONN && result != ECONNRESET && result != EBADF)
 	    JCL_ThrowException (env, IO_EXCEPTION,
-				TARGET_NATIVE_LAST_ERROR_STRING ());
+				cpnative_getErrorString (result));
 	}
     }
-  while (error == TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL);
+  while (error == CPNATIVE_EINTR);
 
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
@@ -525,20 +532,24 @@ _javanet_connect (JNIEnv * env, jobject this, jobject addr, jint port,
 		  jboolean stream)
 {
 #ifndef WITHOUT_NETWORK
-  int netaddr, fd;
+  cpnet_address *netaddr;
+  int fd;
   int result;
-  int local_address, local_port;
-  int remote_address, remote_port;
+  cpnet_address *local_addr;
+  cpnet_address *remote_addr;
 
   DBG ("_javanet_connect(): Entered _javanet_connect\n");
 
   /* Pre-process input variables */
-  netaddr = _javanet_get_netaddr (env, addr);
+  netaddr = _javanet_get_ip_netaddr (env, addr);
   if ((*env)->ExceptionOccurred (env))
     return;
 
   if (port == -1)
     port = 0;
+
+  cpnet_addressSetPort(netaddr, port);
+
   DBG ("_javanet_connect(): Got network address\n");
 
   /* Grab the real socket file descriptor */
@@ -554,29 +565,27 @@ _javanet_connect (JNIEnv * env, jobject this, jobject addr, jint port,
   /* Connect up */
   do
     {
-      TARGET_NATIVE_NETWORK_SOCKET_CONNECT (fd, netaddr, port, result);
-      if (result != TARGET_NATIVE_OK
-	  && (TARGET_NATIVE_LAST_ERROR ()
-	      != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
+      result = cpnet_connect (env, fd, netaddr);
+      if (result != CPNATIVE_OK && result != CPNATIVE_EINTR)
 	{
 	  JCL_ThrowException (env, CONNECT_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return;
 	}
     }
-  while (result != TARGET_NATIVE_OK);
-
+  while (result != CPNATIVE_OK);
+  
   DBG ("_javanet_connect(): Connected successfully\n");
 
   /* Populate instance variables */
-  TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, local_port,
-					       result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getLocalAddr (env, fd, &local_addr);
+  if (result != CPNATIVE_OK)
     {
+      cpnet_freeAddress(env, netaddr);
       JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
+      cpnet_close (env, fd);
       return;
     }
 
@@ -584,63 +593,72 @@ _javanet_connect (JNIEnv * env, jobject this, jobject addr, jint port,
   if ((*env)->ExceptionOccurred (env))
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
+      cpnet_freeAddress(env, netaddr);
+      cpnet_freeAddress(env, local_addr);
+      cpnet_close (env, fd);
       return;
     }
   DBG ("_javanet_connect(): Created fd\n");
 
   if (stream)
     _javanet_set_int_field (env, this, "java/net/SocketImpl", "localport",
-			    local_port);
+			    cpnet_addressGetPort(local_addr));
   else
     _javanet_set_int_field (env, this, "java/net/DatagramSocketImpl",
-			    "localPort", local_port);
+			    "localPort", cpnet_addressGetPort(local_addr));
 
+  cpnet_freeAddress (env, local_addr);
   if ((*env)->ExceptionOccurred (env))
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
+      cpnet_freeAddress(env, netaddr);
+      cpnet_close (env, fd);
       return;
     }
   DBG ("_javanet_connect(): Set the local port\n");
 
-  TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO (fd, remote_address,
-						remote_port, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getRemoteAddr (env, fd, &remote_addr);
+  if (result != CPNATIVE_OK)
     {
+      cpnet_freeAddress(env, netaddr);
       JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
+      cpnet_close (env, fd);
       return;
     }
 
   if (stream)
     {
-      if (remote_address == netaddr)
+      if (cpnet_isAddressEqual(remote_addr, netaddr))
 	{
 	  _javanet_set_remhost_addr (env, this, addr);
 	}
       else
 	{
-	  _javanet_set_remhost (env, this, remote_address);
+	  _javanet_set_remhost (env, this, remote_addr);
 	}
+      cpnet_freeAddress(env, netaddr);
+
       if ((*env)->ExceptionOccurred (env))
 	{
 	  /* We don't care whether this succeeds. close() will cleanup later.
 	   */
-	  TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
+	  cpnet_freeAddress (env, remote_addr);
+	  cpnet_close (env, fd);
 	  return;
 	}
       DBG ("_javanet_connect(): Set the remote host\n");
 
       _javanet_set_int_field (env, this, "java/net/SocketImpl", "port",
-			      remote_port);
+			      cpnet_addressGetPort(remote_addr));
+      cpnet_freeAddress (env, remote_addr);
+
       if ((*env)->ExceptionOccurred (env))
 	{
 	  /* We don't care whether this succeeds. close() will cleanup later.
 	   */
-	  TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
+	  cpnet_close (env, fd);
 	  return;
 	}
       DBG ("_javanet_connect(): Set the remote port\n");
@@ -661,98 +679,59 @@ _javanet_bind (JNIEnv * env, jobject this, jobject addr, jint port,
 	       int stream)
 {
 #ifndef WITHOUT_NETWORK
-  jclass cls;
-  jmethodID mid;
-  jbyteArray arr = 0;
-  jbyte *octets;
   jint fd;
-  int tmpaddr;
+  cpnet_address *tmpaddr;
+  cpnet_address *local_addr;
   int result;
-  int local_address, local_port;
 
   DBG ("_javanet_bind(): Entering native bind()\n");
-
-  /* Get the address to connect to */
-  cls = (*env)->GetObjectClass (env, addr);
-  if (cls == NULL)
-    return;
-
-  mid = (*env)->GetMethodID (env, cls, "getAddress", "()[B");
-  if (mid == NULL)
-    return;
-
-  DBG ("_javanet_bind(): Past getAddress method id\n");
-
-  arr = (*env)->CallObjectMethod (env, addr, mid);
-  if ((arr == NULL) || (*env)->ExceptionOccurred (env))
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  "Internal error: _javanet_bind()");
-      return;
-    }
-
-  DBG ("_javanet_bind(): Past call object method\n");
-
-  octets = (*env)->GetByteArrayElements (env, arr, 0);
-  if (octets == NULL)
-    return;
-
-  DBG ("_javanet_bind(): Past grab array\n");
-
-  /* Get the native socket file descriptor */
+ 
+ /* Grab the real socket file descriptor */
   fd = _javanet_get_int_field (env, this, "native_fd");
   if (fd == -1)
     {
-      (*env)->ReleaseByteArrayElements (env, arr, octets, 0);
       JCL_ThrowException (env, IO_EXCEPTION,
-			  "Internal error: _javanet_bind(): no native file descriptor");
+			  "Internal error: _javanet_connect(): no native file descriptor");
       return;
     }
-  DBG ("_javanet_bind(): Past native_fd lookup\n");
 
-  /* XXX NYI ??? */
-  _javanet_set_option (env, this, SOCKOPT_SO_REUSEADDR,
-		       _javanet_create_boolean (env, JNI_TRUE));
+  cpnet_setReuseAddress (env, fd, 1);
 
+  /* Get the address to connect to */
+  tmpaddr = _javanet_get_ip_netaddr (env, addr);
+  if ((*env)->ExceptionOccurred (env))
+    return;
 
-  /* Bind the socket */
-  TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0],
-						octets[1],
-						octets[2],
-						octets[3], tmpaddr);
-  TARGET_NATIVE_NETWORK_SOCKET_BIND (fd, tmpaddr, port, result);
-
-  if (result != TARGET_NATIVE_OK)
+  cpnet_addressSetPort (tmpaddr, port);
+  result = cpnet_bind(env, fd, tmpaddr);
+  cpnet_freeAddress (env, tmpaddr);
+  if (result != CPNATIVE_OK)
     {
-      char *errorstr = TARGET_NATIVE_LAST_ERROR_STRING ();
-      (*env)->ReleaseByteArrayElements (env, arr, octets, 0);
-
       JCL_ThrowException (env, BIND_EXCEPTION,
-			  errorstr);
+			  cpnative_getErrorString (result));
       return;
     }
   DBG ("_javanet_bind(): Past bind\n");
 
-  (*env)->ReleaseByteArrayElements (env, arr, octets, 0);
-
   /* Update instance variables, specifically the local port number */
-  TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, local_port,
-					       result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getLocalAddr (env, fd, &local_addr);
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       return;
     }
 
   if (stream)
     _javanet_set_int_field (env, this, "java/net/SocketImpl",
-			    "localport", local_port);
+			    "localport", cpnet_addressGetPort (local_addr));
   else
     _javanet_set_int_field (env, this, "java/net/DatagramSocketImpl",
-			    "localPort", local_port);
+			    "localPort", cpnet_addressGetPort (local_addr));
   DBG ("_javanet_bind(): Past update port number\n");
 
+  cpnet_freeAddress (env, local_addr);
+
   return;
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
@@ -781,11 +760,11 @@ _javanet_listen (JNIEnv * env, jobject this, jint queuelen)
     }
 
   /* Start listening */
-  TARGET_NATIVE_NETWORK_SOCKET_LISTEN (fd, queuelen, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_listen (env, fd, queuelen);
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       return;
     }
 #else /* not WITHOUT_NETWORK */
@@ -804,8 +783,7 @@ _javanet_accept (JNIEnv * env, jobject this, jobject impl)
 #ifndef WITHOUT_NETWORK
   int fd, newfd;
   int result;
-  int local_address, local_port;
-  int remote_address, remote_port;
+  cpnet_address *remote_addr, *local_addr;
 
   /* Get the real file descriptor */
   fd = _javanet_get_int_field (env, this, "native_fd");
@@ -819,24 +797,22 @@ _javanet_accept (JNIEnv * env, jobject this, jobject impl)
   /* Accept the connection */
   do
     {
-      TARGET_NATIVE_NETWORK_SOCKET_ACCEPT (fd, newfd, result);
-      if (result != TARGET_NATIVE_OK
-	  && (TARGET_NATIVE_LAST_ERROR ()
-	      != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
+      result = cpnet_accept (env, fd, &newfd);
+      if (result != CPNATIVE_OK && result != CPNATIVE_EINTR)
 	{
-	  if (TARGET_NATIVE_LAST_ERROR () == EAGAIN)
+	  if (result == ETIMEDOUT || result == EAGAIN)
 	    JCL_ThrowException (env, "java/net/SocketTimeoutException",
-				"Timeout");
+				"Accept operation timed out");
 	  else
 	    JCL_ThrowException (env, IO_EXCEPTION,
-				TARGET_NATIVE_LAST_ERROR_STRING ());
+				cpnative_getErrorString (result));
 	  return;
 	}
     }
-  while (result != TARGET_NATIVE_OK);
+  while (result != CPNATIVE_OK);
 
   /* Reset the inherited timeout. */
-  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT (newfd, 0, result);
+  cpnet_setSocketTimeout (env, newfd, 0);
 
   /* Populate instance variables */
   _javanet_set_int_field (env, impl, "gnu/java/net/PlainSocketImpl",
@@ -847,24 +823,21 @@ _javanet_accept (JNIEnv * env, jobject this, jobject impl)
       /* Try to make sure we close the socket since close() won't work. */
       do
 	{
-	  TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
-	  if (result != TARGET_NATIVE_OK
-	      && (TARGET_NATIVE_LAST_ERROR ()
-		  != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
+	  result = cpnet_close (env, newfd);
+	  if (result != CPNATIVE_OK && result != CPNATIVE_EINTR)
 	    return;
 	}
-      while (result != TARGET_NATIVE_OK);
+      while (result != CPNATIVE_OK);
       return;
     }
 
-  TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (newfd, local_address,
-					       local_port, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getLocalAddr (env, newfd, &local_addr);
+  if (result != CPNATIVE_OK)
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
+      cpnet_close (env, newfd);
       JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       return;
     }
 
@@ -872,44 +845,47 @@ _javanet_accept (JNIEnv * env, jobject this, jobject impl)
   if ((*env)->ExceptionOccurred (env))
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
+      cpnet_freeAddress (env, local_addr);
+      cpnet_close (env, newfd);
       return;
     }
 
   _javanet_set_int_field (env, impl, "java/net/SocketImpl", "localport",
-			  local_port);
+			  cpnet_addressGetPort (local_addr));
+  cpnet_freeAddress (env, local_addr);
   if ((*env)->ExceptionOccurred (env))
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
+      cpnet_close (env, newfd);
       return;
     }
 
-  TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO (newfd, remote_address,
-						remote_port, result);
-  if (result != TARGET_NATIVE_OK)
+  result = cpnet_getRemoteAddr (env, newfd, &remote_addr);
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
+      cpnet_close (env, newfd);
       return;
     }
 
-  _javanet_set_remhost (env, impl, remote_address);
+  _javanet_set_remhost (env, impl, remote_addr);
   if ((*env)->ExceptionOccurred (env))
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
+      cpnet_close (env, newfd);
+      cpnet_freeAddress (env, remote_addr);
       return;
     }
 
   _javanet_set_int_field (env, impl, "java/net/SocketImpl", "port",
-			  remote_port);
+			  cpnet_addressGetPort (remote_addr));
+  cpnet_freeAddress (env, remote_addr);
   if ((*env)->ExceptionOccurred (env))
     {
       /* We don't care whether this succeeds. close() will cleanup later. */
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result);
+      cpnet_close (env, newfd);
       return;
     }
 #else /* not WITHOUT_NETWORK */
@@ -934,13 +910,14 @@ _javanet_accept (JNIEnv * env, jobject this, jobject impl)
  */
 int
 _javanet_recvfrom (JNIEnv * env, jobject this, jarray buf, int offset,
-		   int len, int *addr, int *port)
+		   int len, cpnet_address **addr)
 {
 #ifndef WITHOUT_NETWORK
   int fd;
   jbyte *p;
-  int from_address, from_port;
-  int received_bytes;
+  cpnet_address *from_addr;
+  jint received_bytes;
+  int result;
 
   DBG ("_javanet_recvfrom(): Entered _javanet_recvfrom\n");
 
@@ -962,36 +939,26 @@ _javanet_recvfrom (JNIEnv * env, jobject this, jarray buf, int offset,
   DBG ("_javanet_recvfrom(): Got buffer\n");
 
   /* Read the data */
-  from_address = 0;
-  from_port = 0;
+  from_addr = NULL;
   do
     {
       if (addr != NULL)
 	{
-	  TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_WITH_ADDRESS_PORT (fd,
-								  p + offset,
-								  len,
-								  from_address,
-								  from_port,
-								  received_bytes);
+	  result = cpnet_recvFrom (env, fd, p + offset, len, &from_addr, &received_bytes);
 	}
       else
 	{
-	  TARGET_NATIVE_NETWORK_SOCKET_RECEIVE (fd, p + offset, len,
-						received_bytes);
+	  result = cpnet_recv (env, fd, p + offset, len, &received_bytes);
 	}
     }
-  while ((received_bytes == -1) &&
-	 (TARGET_NATIVE_LAST_ERROR () ==
-	  TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL));
-
-  if (received_bytes == -1)
+  while (result == CPNATIVE_EINTR);
+  if (result != 0)
     {
-      if (TARGET_NATIVE_LAST_ERROR () == EAGAIN)
-	JCL_ThrowException (env, "java/net/SocketTimeoutException", "Timeout");
+      if (result == EAGAIN || result == ETIMEDOUT)
+	JCL_ThrowException (env, "java/net/SocketTimeoutException", "Receive operation timed out");
       else
 	JCL_ThrowException (env, IO_EXCEPTION,
-			    TARGET_NATIVE_LAST_ERROR_STRING ());
+			    cpnative_getErrorString (result));
  
       /* Cleanup and return. */
       (*env)->ReleaseByteArrayElements (env, buf, p, 0);
@@ -1003,9 +970,7 @@ _javanet_recvfrom (JNIEnv * env, jobject this, jarray buf, int offset,
   /* Handle return addr case */
   if (addr != NULL)
     {
-      (*addr) = from_address;
-      if (port != NULL)
-	(*port) = from_port;
+      (*addr) = from_addr;
     }
 
   /* zero bytes received means recv() noticed the other side orderly
@@ -1013,7 +978,7 @@ _javanet_recvfrom (JNIEnv * env, jobject this, jarray buf, int offset,
   if (received_bytes == 0)
     received_bytes = -1;
 
-  return (received_bytes);
+  return received_bytes;
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -1031,12 +996,13 @@ _javanet_recvfrom (JNIEnv * env, jobject this, jarray buf, int offset,
  */
 void
 _javanet_sendto (JNIEnv * env, jobject this, jarray buf, int offset, int len,
-		 int addr, int port)
+		 cpnet_address *addr)
 {
 #ifndef WITHOUT_NETWORK
   int fd;
   jbyte *p;
-  int bytes_sent;
+  jint bytes_sent;
+  int result;
 
   /* Get the real file descriptor */
   fd = _javanet_get_int_field (env, this, "native_fd");
@@ -1056,26 +1022,30 @@ _javanet_sendto (JNIEnv * env, jobject this, jarray buf, int offset, int len,
   while (len > 0)
     {
       /* Send the data */
-      if (addr == 0)
+      if (addr == NULL)
 	{
 	  DBG ("_javanet_sendto(): Sending....\n");
-	  TARGET_NATIVE_NETWORK_SOCKET_SEND (fd, p + offset, len, bytes_sent);
+	  result = cpnet_send (env, fd, p + offset, len, &bytes_sent);
 	}
       else
 	{
 	  DBG ("_javanet_sendto(): Sending....\n");
-	  TARGET_NATIVE_NETWORK_SOCKET_SEND_WITH_ADDRESS_PORT (fd, p + offset,
-							       len, addr, port,
-							       bytes_sent);
+	  result = cpnet_sendTo (env, fd, p + offset, len, addr, &bytes_sent);
 	}
 
+      if (result == EDESTADDRREQ)
+	{
+	  JCL_ThrowException (env, NULL_EXCEPTION,
+			      "Socket is not connected and no address is given");
+	  break;
+	}
+	
       if (bytes_sent < 0)
 	{
-	  if (TARGET_NATIVE_LAST_ERROR ()
-	      != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)
+	  if (result != CPNATIVE_EINTR)
 	    {
 	      JCL_ThrowException (env, IO_EXCEPTION,
-				  TARGET_NATIVE_LAST_ERROR_STRING ());
+				  cpnative_getErrorString (result));
 	      break;
 	    }
 	}
@@ -1105,8 +1075,8 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
   int optval;
   jclass cls;
   jmethodID mid;
-  int address;
-  int result;
+  cpnet_address * address;
+  int result = CPNATIVE_OK;
 
   /* Get the real file descriptor */
   fd = _javanet_get_int_field (env, this, "native_fd");
@@ -1123,7 +1093,6 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
     return;
 
   /* Process the option request */
-  result = TARGET_NATIVE_ERROR;
   switch (option_id)
     {
       /* TCP_NODELAY case.  val is a Boolean that tells us what to do */
@@ -1141,8 +1110,7 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
       if ((*env)->ExceptionOccurred (env))
 	return;
 
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY (fd, optval,
-							   result);
+      result = cpnet_setSocketTCPNoDelay (env, fd, optval);
       break;
 
       /* SO_LINGER case.  If val is a boolean, then it will always be set
@@ -1153,8 +1121,7 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
       if (mid)
 	{
 	  /* We are disabling linger */
-	  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER (fd, 1, 0,
-							     result);
+	  result = cpnet_setLinger (env, fd, JNI_FALSE, 0);
 	}
       else
 	{
@@ -1175,15 +1142,13 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
 	  if ((*env)->ExceptionOccurred (env))
 	    return;
 
-	  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER (fd, 0, optval,
-							     result);
+	  result = cpnet_setLinger(env, fd, JNI_TRUE, optval);
 	}
       break;
 
       /* SO_TIMEOUT case. Val will be an integer with the new value */
       /* Not writable on Linux */
     case SOCKOPT_SO_TIMEOUT:
-#ifdef SO_TIMEOUT
       mid = (*env)->GetMethodID (env, cls, "intValue", "()I");
       if (mid == NULL)
 	{
@@ -1196,10 +1161,7 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
       if ((*env)->ExceptionOccurred (env))
 	return;
 
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT (fd, optval, result);
-#else
-      result = TARGET_NATIVE_OK;
-#endif
+      result = cpnet_setSocketTimeout (env, fd, optval);
       break;
 
     case SOCKOPT_SO_SNDBUF:
@@ -1218,11 +1180,9 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
 	return;
 
       if (option_id == SOCKOPT_SO_SNDBUF)
-	TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_SNDBUF (fd, optval,
-							   result);
+	result = cpnet_setSendBuf (env, fd, optval);
       else
-	TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_RCDBUF (fd, optval,
-							   result);
+	result = cpnet_setRecvBuf (env, fd, optval);
       break;
 
       /* TTL case.  Val with be an Integer with the new time to live value */
@@ -1239,18 +1199,18 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
       if ((*env)->ExceptionOccurred (env))
 	return;
 
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_TTL (fd, optval, result);
+      result = cpnet_setTTL (env, fd, optval);
       break;
 
       /* Multicast Interface case - val is InetAddress object */
     case SOCKOPT_IP_MULTICAST_IF:
-      address = _javanet_get_netaddr (env, val);
+      address = _javanet_get_ip_netaddr (env, val);
 
       if ((*env)->ExceptionOccurred (env))
 	return;
-
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_MULTICAST_IF (fd, address,
-							       result);
+      
+      result = cpnet_setMulticastIF (env, fd, address);
+      cpnet_freeAddress (env, address);
       break;
 
     case SOCKOPT_SO_REUSEADDR:
@@ -1267,8 +1227,7 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
       if ((*env)->ExceptionOccurred (env))
 	return;
 
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS (fd, optval,
-							     result);
+      result = cpnet_setReuseAddress (env, fd, optval);
       break;
 
     case SOCKOPT_SO_KEEPALIVE:
@@ -1285,7 +1244,7 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
       if ((*env)->ExceptionOccurred (env))
 	return;
 
-      TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_KEEP_ALIVE (fd, optval, result);
+      result = cpnet_setKeepAlive (env, fd, optval);
       break;
 
     case SOCKOPT_SO_BINDADDR:
@@ -1298,10 +1257,10 @@ _javanet_set_option (JNIEnv * env, jobject this, jint option_id, jobject val)
     }
 
   /* Check to see if above operations succeeded */
-  if (result != TARGET_NATIVE_OK)
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, SOCKET_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
+			  cpnative_getErrorString (result));
       return;
     }
 #else /* not WITHOUT_NETWORK */
@@ -1319,8 +1278,9 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
 #ifndef WITHOUT_NETWORK
   int fd;
   int flag, optval;
-  int address;
+  cpnet_address *address;
   int result;
+  jobject obj;
 
   /* Get the real file descriptor */
   fd = _javanet_get_int_field (env, this, "native_fd");
@@ -1336,12 +1296,11 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
     {
       /* TCP_NODELAY case.  Return a Boolean indicating on or off */
     case SOCKOPT_TCP_NODELAY:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_TCP_NODELAY (fd, optval,
-							   result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getSocketTCPNoDelay (env, fd, &optval);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
@@ -1355,17 +1314,17 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
       /* SO_LINGER case.  If disabled, return a Boolean object that represents
          false, else return an Integer that is the value of SO_LINGER */
     case SOCKOPT_SO_LINGER:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_LINGER (fd, flag, optval,
-							 result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getLinger (env, fd, &flag, &optval);
+
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
-      if (optval)
-	return (_javanet_create_integer (env, JNI_TRUE));
+      if (flag)
+	return (_javanet_create_integer (env, optval));
       else
 	return (_javanet_create_boolean (env, JNI_FALSE));
 
@@ -1373,34 +1332,27 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
 
       /* SO_TIMEOUT case. Return an Integer object with the timeout value */
     case SOCKOPT_SO_TIMEOUT:
-#ifdef SO_TIMEOUT
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_TIMEOUT (fd, optval, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getSocketTimeout (env, fd, &optval);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
       return (_javanet_create_integer (env, optval));
-#else
-      JCL_ThrowException (env, SOCKET_EXCEPTION,
-			  "SO_TIMEOUT not supported on this platform");
-      return (0);
-#endif /* not SO_TIMEOUT */
       break;
 
     case SOCKOPT_SO_SNDBUF:
     case SOCKOPT_SO_RCVBUF:
       if (option_id == SOCKOPT_SO_SNDBUF)
-	TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_SNDBUF (fd, optval,
-							   result);
+	result = cpnet_getSendBuf (env, fd, &optval);
       else
-	TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_RCDBUF (fd, optval,
-							   result);
-      if (result != TARGET_NATIVE_OK)
+	result = cpnet_getRecvBuf (env, fd, &optval);
+
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
@@ -1409,11 +1361,11 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
 
       /* The TTL case.  Return an Integer with the Time to Live value */
     case SOCKOPT_IP_TTL:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_TTL (fd, optval, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getTTL (env, fd, &optval);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
@@ -1422,61 +1374,64 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
 
       /* Multicast interface case */
     case SOCKOPT_IP_MULTICAST_IF:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_MULTICAST_IF (fd, address,
-							       result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getMulticastIF (env, fd, &address);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
-      return (_javanet_create_inetaddress (env, address));
+      obj = _javanet_create_inetaddress (env, address);
+      cpnet_freeAddress (env, address);
+
+      return obj;
       break;
 
     case SOCKOPT_SO_BINDADDR:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BIND_ADDRESS (fd, address,
-							    result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getLocalAddr (env, fd, &address);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
-      return (_javanet_create_inetaddress (env, address));
+      obj = _javanet_create_inetaddress (env, address);
+      cpnet_freeAddress (env, address);
+
+      return obj;
       break;
 
     case SOCKOPT_SO_REUSEADDR:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_REUSE_ADDRESS (fd, optval,
-							     result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getReuseAddress (env, fd, &optval);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
       if (optval)
-	return (_javanet_create_boolean (env, JNI_TRUE));
+	return _javanet_create_boolean (env, JNI_TRUE);
       else
-	return (_javanet_create_boolean (env, JNI_FALSE));
+	return _javanet_create_boolean (env, JNI_FALSE);
 
       break;
 
     case SOCKOPT_SO_KEEPALIVE:
-      TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_KEEP_ALIVE (fd, optval, result);
-      if (result != TARGET_NATIVE_OK)
+      result = cpnet_getKeepAlive (env, fd, &optval);
+      if (result != CPNATIVE_OK)
 	{
 	  JCL_ThrowException (env, SOCKET_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
+			      cpnative_getErrorString (result));
 	  return (0);
 	}
 
       if (optval)
-	return (_javanet_create_boolean (env, JNI_TRUE));
+	return _javanet_create_boolean (env, JNI_TRUE);
       else
-	return (_javanet_create_boolean (env, JNI_FALSE));
+	return _javanet_create_boolean (env, JNI_FALSE);
 
       break;
 
@@ -1493,6 +1448,7 @@ _javanet_get_option (JNIEnv * env, jobject this, jint option_id)
 void
 _javanet_shutdownInput (JNIEnv * env, jobject this)
 {
+  int result;
   int fd;
 
   /* Get the real file descriptor. */
@@ -1505,10 +1461,11 @@ _javanet_shutdownInput (JNIEnv * env, jobject this)
     }
 
   /* Shutdown input stream of socket. */
-  if (shutdown (fd, SHUT_RD) == -1)
+  result = cpnet_shutdown (env, fd, CPNET_SHUTDOWN_READ);
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, SOCKET_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING());
+			  cpnative_getErrorString (result));
       return;
     }
 }
@@ -1517,6 +1474,7 @@ void
 _javanet_shutdownOutput (JNIEnv * env, jobject this)
 {
   int fd;
+  int result;
 
   /* Get the real file descriptor. */
   fd = _javanet_get_int_field (env, this, "native_fd");
@@ -1528,10 +1486,11 @@ _javanet_shutdownOutput (JNIEnv * env, jobject this)
     }
 
   /* Shutdown output stream of socket. */
-  if (shutdown (fd, SHUT_WR) == -1)
+  result = cpnet_shutdown (env, fd, CPNET_SHUTDOWN_WRITE);
+  if (result != CPNATIVE_OK)
     {
       JCL_ThrowException (env, SOCKET_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING());
+			  cpnative_getErrorString (result));
       return;
     }
 }
diff --git a/libjava/classpath/native/jni/java-net/javanet.h b/libjava/classpath/native/jni/java-net/javanet.h
index 030d41282ba..96dba881b54 100644
--- a/libjava/classpath/native/jni/java-net/javanet.h
+++ b/libjava/classpath/native/jni/java-net/javanet.h
@@ -41,6 +41,7 @@ exception statement from your version. */
 
 #include <jni.h>
 #include "jcl.h"
+#include "cpnet.h"
 
 /*************************************************************************/
 
@@ -54,6 +55,7 @@ exception statement from your version. */
 #define CONNECT_EXCEPTION "java/net/ConnectException"
 #define SOCKET_EXCEPTION "java/net/SocketException"
 #define UNKNOWN_HOST_EXCEPTION "java/net/UnknownHostException"
+#define NULL_EXCEPTION "java/lang/NullPointerException"
 
 /* Socket Option Identifiers - Don't change or binary compatibility with 
                                the JDK will be broken! These also need to
@@ -78,15 +80,16 @@ exception statement from your version. */
  */
 
 extern int _javanet_get_int_field(JNIEnv *, jobject, const char *);
-extern int _javanet_get_netaddr(JNIEnv *, jobject);
+extern cpnet_address *_javanet_get_ip_netaddr(JNIEnv *, jobject);
+extern jobject _javanet_create_inetaddress (JNIEnv *, cpnet_address *);
 extern void _javanet_create(JNIEnv *, jobject, jboolean);
 extern void _javanet_close(JNIEnv *, jobject, int);
 extern void _javanet_connect(JNIEnv *, jobject, jobject, jint, jboolean);
 extern void _javanet_bind(JNIEnv *, jobject, jobject, jint, int);
 extern void _javanet_listen(JNIEnv *, jobject, jint);
 extern void _javanet_accept(JNIEnv *, jobject, jobject);
-extern int _javanet_recvfrom(JNIEnv *, jobject, jarray, int, int, int *, int *);
-extern void _javanet_sendto(JNIEnv *, jobject, jarray, int, int, int, int);
+extern int _javanet_recvfrom(JNIEnv *, jobject, jarray, int, int, cpnet_address **);
+extern void _javanet_sendto(JNIEnv *, jobject, jarray, int, int, cpnet_address *);
 extern jobject _javanet_get_option(JNIEnv *, jobject, jint);
 extern void _javanet_set_option(JNIEnv *, jobject, jint, jobject);
 extern void _javanet_shutdownInput (JNIEnv *, jobject);
diff --git a/libjava/classpath/native/jni/java-net/local.c b/libjava/classpath/native/jni/java-net/local.c
index cdddd89efc3..c8ca91c2ab5 100644
--- a/libjava/classpath/native/jni/java-net/local.c
+++ b/libjava/classpath/native/jni/java-net/local.c
@@ -36,9 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #ifdef ENABLE_LOCAL_SOCKETS
 
diff --git a/libjava/classpath/native/jni/java-nio/.cvsignore b/libjava/classpath/native/jni/java-nio/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/java-nio/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/java-nio/Makefile.am b/libjava/classpath/native/jni/java-nio/Makefile.am
index c3f6caf6209..9f2db83f20f 100644
--- a/libjava/classpath/native/jni/java-nio/Makefile.am
+++ b/libjava/classpath/native/jni/java-nio/Makefile.am
@@ -3,15 +3,21 @@ nativeexeclib_LTLIBRARIES = libjavanio.la
 libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
 			gnu_java_nio_VMChannel.c \
 			gnu_java_nio_VMSelector.c \
-			gnu_java_nio_channels_FileChannelImpl.c \
 			gnu_java_nio_charset_iconv_IconvDecoder.c \
 			gnu_java_nio_charset_iconv_IconvEncoder.c \
 			java_nio_MappedByteBufferImpl.c \
-			java_nio_VMDirectByteBuffer.c
+			java_nio_VMDirectByteBuffer.c \
+			gnu_java_nio_EpollSelectorImpl.c \
+			gnu_java_nio_KqueueSelectorImpl.c \
+			javanio.h
 
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
+		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
 		       $(LTLIBICONV) 
 
+# Directly included through javanio.h
+EXTRA_DIST = javanio.c
+
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
diff --git a/libjava/classpath/native/jni/java-nio/Makefile.in b/libjava/classpath/native/jni/java-nio/Makefile.in
index bb3a5833946..147455caf85 100644
--- a/libjava/classpath/native/jni/java-nio/Makefile.in
+++ b/libjava/classpath/native/jni/java-nio/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -65,14 +67,16 @@ LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libjavanio_la_DEPENDENCIES =  \
 	$(top_builddir)/native/jni/classpath/jcl.lo \
+	$(top_builddir)/native/jni/native-lib/libclasspathnative.la \
 	$(am__DEPENDENCIES_1)
 am_libjavanio_la_OBJECTS = gnu_java_nio_VMPipe.lo \
 	gnu_java_nio_VMChannel.lo gnu_java_nio_VMSelector.lo \
-	gnu_java_nio_channels_FileChannelImpl.lo \
 	gnu_java_nio_charset_iconv_IconvDecoder.lo \
 	gnu_java_nio_charset_iconv_IconvEncoder.lo \
 	java_nio_MappedByteBufferImpl.lo \
-	java_nio_VMDirectByteBuffer.lo
+	java_nio_VMDirectByteBuffer.lo \
+	gnu_java_nio_EpollSelectorImpl.lo \
+	gnu_java_nio_KqueueSelectorImpl.lo
 libjavanio_la_OBJECTS = $(am_libjavanio_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -192,6 +196,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -313,21 +319,26 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjavanio.la
 libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
 			gnu_java_nio_VMChannel.c \
 			gnu_java_nio_VMSelector.c \
-			gnu_java_nio_channels_FileChannelImpl.c \
 			gnu_java_nio_charset_iconv_IconvDecoder.c \
 			gnu_java_nio_charset_iconv_IconvEncoder.c \
 			java_nio_MappedByteBufferImpl.c \
-			java_nio_VMDirectByteBuffer.c
+			java_nio_VMDirectByteBuffer.c \
+			gnu_java_nio_EpollSelectorImpl.c \
+			gnu_java_nio_KqueueSelectorImpl.c \
+			javanio.h
 
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
+		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
 		       $(LTLIBICONV) 
 
+
+# Directly included through javanio.h
+EXTRA_DIST = javanio.c
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
@@ -400,10 +411,11 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_EpollSelectorImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_KqueueSelectorImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_VMChannel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_VMPipe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_VMSelector.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_channels_FileChannelImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_charset_iconv_IconvDecoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnu_java_nio_charset_iconv_IconvEncoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_nio_MappedByteBufferImpl.Plo@am__quote@
diff --git a/libjava/classpath/native/jni/java-nio/gnu_java_nio_EpollSelectorImpl.c b/libjava/classpath/native/jni/java-nio/gnu_java_nio_EpollSelectorImpl.c
new file mode 100644
index 00000000000..d794e6d9fea
--- /dev/null
+++ b/libjava/classpath/native/jni/java-nio/gnu_java_nio_EpollSelectorImpl.c
@@ -0,0 +1,414 @@
+/* gnu_java_nio_EpollSelectorImpl.c -- 
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#ifdef HAVE_SYS_EPOLL_H
+#include <sys/epoll.h>
+#endif /* HAVE_SYS_EPOLL_H */
+
+#include <gnu_java_nio_EpollSelectorImpl.h>
+#include <jcl.h>
+#include <errno.h>
+#include <string.h>
+
+#define IO_EXCEPTION "java/io/IOException"
+
+/* #define TRACE_EPOLL 1 */
+
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_supported
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_epoll_1supported (JNIEnv *e __attribute__((unused)),
+                                                      jclass c __attribute__((unused)))
+{
+#ifdef HAVE_EPOLL_CREATE
+  return JNI_TRUE;
+#else
+  return JNI_FALSE;
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    sizeof_struct
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_sizeof_1struct (JNIEnv *env,
+                                                    jclass c __attribute__((unused)))
+{
+#ifdef HAVE_EPOLL_CREATE
+  (void) env;
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: sizeof is %d\n", __FUNCTION__, sizeof (struct epoll_event));
+#endif /* TRACE_EPOLL */
+  return sizeof (struct epoll_event);
+#else
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+  return -1;
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_create
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_epoll_1create (JNIEnv *env,
+                                                   jclass c __attribute__((unused)),
+                                                   jint size)
+{
+#ifdef HAVE_EPOLL_CREATE
+  int fd = epoll_create (size);
+  
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: epoll_create returns %d\n", __FUNCTION__, fd);
+#endif /* TRACE_EPOLL */
+
+  if (fd == -1)
+    {
+      if (ENOSYS == errno)
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            strerror (errno));
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+  return fd;
+#else
+  (void) size;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+  return -1;
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_add
+ * Signature: (III)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_epoll_1add (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint efd, jint fd, jint ops)
+{
+#ifdef HAVE_EPOLL_CREATE
+  struct epoll_event event;
+
+  memset (&event, 0, sizeof (struct epoll_event));
+
+  if ((ops & gnu_java_nio_EpollSelectorImpl_OP_ACCEPT) != 0
+      || (ops & gnu_java_nio_EpollSelectorImpl_OP_READ) != 0)
+    event.events = EPOLLIN;
+
+  if ((ops & gnu_java_nio_EpollSelectorImpl_OP_CONNECT) != 0
+      || (ops & gnu_java_nio_EpollSelectorImpl_OP_WRITE) != 0)
+    event.events |= EPOLLOUT;
+
+  event.data.fd = fd;
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: adding struct epoll_event { events: %o; data.fd: %d } to %d\n",
+           __FUNCTION__, event.events, event.data.fd, efd);
+#endif /* TRACE_EPOLL */
+
+  if (epoll_ctl (efd, EPOLL_CTL_ADD, fd, &event) == -1)
+    {
+      if (ENOSYS == errno)
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            strerror (errno));
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  (void) efd;
+  (void) fd;
+  (void) ops;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_modify
+ * Signature: (III)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_epoll_1modify (JNIEnv *env,
+                                                   jclass c __attribute__((unused)),
+                                                   jint efd, jint fd, jint ops)
+{
+#ifdef HAVE_EPOLL_CREATE
+  struct epoll_event event;
+
+  memset (&event, 0, sizeof (struct epoll_event));
+
+  if ((ops & gnu_java_nio_EpollSelectorImpl_OP_ACCEPT) != 0
+      || (ops & gnu_java_nio_EpollSelectorImpl_OP_READ) != 0)
+    event.events = EPOLLIN;
+
+  if ((ops & gnu_java_nio_EpollSelectorImpl_OP_CONNECT) != 0
+      || (ops & gnu_java_nio_EpollSelectorImpl_OP_WRITE) != 0)
+    event.events |= EPOLLOUT;
+
+  event.data.fd = fd;
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: modding struct epoll_event { events: %o; data.fd: %d } on %d\n",
+           __FUNCTION__, event.events, event.data.fd, efd);
+#endif /* TRACE_EPOLL */
+
+  if (epoll_ctl (efd, EPOLL_CTL_MOD, fd, &event) == -1)
+    {
+      if (ENOSYS == errno)
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            strerror (errno));
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  (void) efd;
+  (void) fd;
+  (void) ops;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_delete
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_epoll_1delete (JNIEnv *env,
+                                                   jclass c __attribute__((unused)),
+                                                   jint efd, jint fd)
+{
+#ifdef HAVE_EPOLL_CREATE
+  struct epoll_event event;
+
+  memset (&event, 0, sizeof (struct epoll_event));
+  event.data.fd = fd;
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: delete events on fd %d for %d\n", __FUNCTION__, fd, efd);
+#endif /* TRACE_EPOLL */
+
+  /* Older kernel versions require a non-null `event' parameter,
+   * even though it is ignored by this call.
+   */
+  if (epoll_ctl (efd, EPOLL_CTL_DEL, fd, &event) == -1)
+    {
+      if (ENOSYS == errno)
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            strerror (errno));
+      /* XXX the docs here seem a little strange. If `fd' is closed,
+         epoll_ctl returns EBADF; but the docs say that this happens
+         only when efd is invalid. Go figure.
+       */
+      else if (ENOENT == errno || EBADF == errno)
+        return; /* fd is closed; it's already removed. */
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  (void) efd;
+  (void) fd;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_wait
+ * Signature: (ILjava/nio/ByteBuffer;II)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_epoll_1wait (JNIEnv *env,
+                                                 jclass c __attribute__((unused)),
+                                                 jint efd, jobject nstate,
+                                                 jint num_events, jint timeout)
+{
+#ifdef HAVE_EPOLL_CREATE
+  void *p = (*env)->GetDirectBufferAddress (env, nstate);
+  struct epoll_event *events = (struct epoll_event *) p;
+  int ret;
+
+  if (p == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, IO_EXCEPTION, "getting native state failed");
+      return -1;
+    }
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: events: %p; num_events: %d; timeout: %d; efd: %d\n",
+           __FUNCTION__, p, num_events, timeout, efd);
+#endif /* TRACE_EPOLL */
+
+  ret = epoll_wait (efd, events, num_events, timeout);
+
+  if (ret == -1)
+    {
+      if (ENOSYS == errno)
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            strerror (errno));
+      else if (EINTR == errno)
+        ret = 0;
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "  epoll_wait returns %d\n", ret);
+  {
+    int i;
+    for (i = 0; i < ret; i++)
+      {
+        fprintf (stderr, "  [%4i]: events: %o; data.fd: %d\n", i, events[i].events,
+                 events[i].data.fd);
+      }
+  }
+  fflush (stderr);
+#endif /* TRACE_EPOLL */
+
+  return ret;
+#else
+  (void) efd;
+  (void) nstate;
+  (void) num_events;
+  (void) timeout;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+  return -1;
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    selected_fd
+ * Signature: (Ljava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_selected_1fd (JNIEnv *env,
+                                                  jclass c __attribute__((unused)),
+                                                  jobject value)
+{
+#ifdef HAVE_EPOLL_CREATE
+  void *p = (*env)->GetDirectBufferAddress (env, value);
+  struct epoll_event *event = (struct epoll_event *) p;
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: event: %p\n", __FUNCTION__, p);
+#endif /* TRACE_EPOLL */
+
+  if (p == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            "getting native state failed");
+      return -1;
+    }
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "  data.fd: %d\n", event->data.fd);
+  fflush (stderr);
+#endif /* TRACE_EPOLL */
+
+  return event->data.fd;
+#else
+  (void) value;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+  return -1;
+#endif /* HAVE_EPOLL_CREATE */
+}
+
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    selected_ops
+ * Signature: (Ljava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_EpollSelectorImpl_selected_1ops (JNIEnv *env,
+                                                   jclass c __attribute__((unused)),
+                                                   jobject value)
+{
+#ifdef HAVE_EPOLL_CREATE
+  void *p = (*env)->GetDirectBufferAddress (env, value);
+  struct epoll_event *event = (struct epoll_event *) p;
+  int ret = 0;
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "%s: event: %p\n", __FUNCTION__, p);
+#endif /* TRACE_EPOLL */
+
+  if (p == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, "java/lang/InternalError",
+                            "getting native state failed");
+      return -1;
+    }
+
+  if ((event->events & EPOLLIN) != 0)
+    ret |= gnu_java_nio_EpollSelectorImpl_OP_ACCEPT | gnu_java_nio_EpollSelectorImpl_OP_READ;
+  if ((event->events & EPOLLOUT) != 0)
+    ret |= gnu_java_nio_EpollSelectorImpl_OP_CONNECT | gnu_java_nio_EpollSelectorImpl_OP_WRITE;
+
+#ifdef TRACE_EPOLL
+  fprintf (stderr, "  events: %o\n", event->events);
+  fflush (stderr);
+#endif /* TRACE_EPOLL */
+
+  return ret;
+#else
+  (void) value;
+  JCL_ThrowException (env, "java/lang/InternalError", "epoll support not available");
+  return -1;
+#endif /* HAVE_EPOLL_CREATE */
+}
diff --git a/libjava/classpath/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c b/libjava/classpath/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c
new file mode 100644
index 00000000000..94e6db7f88e
--- /dev/null
+++ b/libjava/classpath/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c
@@ -0,0 +1,387 @@
+/* gnu_java_nio_channel_KqueueSelectorImpl.c -- 
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <sys/types.h>
+#if HAVE_SYS_EVENT_H
+#include <sys/event.h>
+#endif /* HAVE_SYS_EVENT_H */
+#include <sys/time.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <jni.h>
+#include <gnu_java_nio_KqueueSelectorImpl.h>
+
+#include <jcl.h>
+
+#define KEY_OP_ACCEPT  16
+#define KEY_OP_CONNECT  8
+#define KEY_OP_READ     1
+#define KEY_OP_WRITE    4
+
+/* XXX this requires -std=gnu99 or c99 */
+/* #ifdef TRACE_KQUEUE */
+/* #define TRACE(fmt, ...) fprintf (stderr, "%s: " fmt "\n", __FUNCTION__, __VA_ARGS__); */
+/* #else */
+/* #define TRACE(fmt, ...) */
+/* #endif */
+
+/* #define TRACE_KQUEUE 1 */
+
+
+#define throw_not_supported(env) JCL_ThrowException (env, "java/lang/UnsupportedOperationException", "kqueue/kevent support not available")
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    kqueue_supported
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_kqueue_1supported (JNIEnv *env __attribute__((unused)),
+                                                        jclass clazz __attribute__((unused)))
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  return JNI_TRUE;
+#else
+  return JNI_FALSE;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    sizeof_struct_kevent
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_sizeof_1struct_1kevent
+(JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+/*   TRACE("return sizeof %lu", sizeof (struct kevent)); */
+  return sizeof (struct kevent);
+#else
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    implOpen
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_implOpen
+(JNIEnv *env, jclass clazz __attribute__((unused)))
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  int kq = kqueue ();
+/*   TRACE("kqueue returns %d", kq); */
+  if (kq == -1)
+    JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+  return kq;
+#else
+  throw_not_supported (env);
+  return -1;
+#endif
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    implClose
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_implClose (JNIEnv *env,
+                                                jclass clazz __attribute__((unused)),
+                                                jint kq)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+/*   TRACE("closing %d", kq); */
+  if (close (kq) != 0)
+    JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+#else
+  (void) kq;
+  throw_not_supported (env);
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    kevent_set
+ * Signature: (Ljava/nio/ByteBuffer;IIIZ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_kevent_1set (JNIEnv *env,
+                                                  jclass clazz __attribute__((unused)),
+                                                  jobject nstate, jint i, jint fd,
+                                                  jint ops, jint active, jint key)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev;
+  short ident;
+
+  kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+
+#ifdef TRACE_KQUEUE
+  printf ("kevent_set fd:%d p:%p i:%d ops:%x active:%x key:%x\n",
+          fd, (void *) kev, i, ops, active, key);
+#endif /* TRACE_KQUEUE */
+
+  if (kev == NULL)
+    {
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "GetDirectBufferAddress returned NULL!");
+      return;
+    }
+
+  ident = fd;
+  memset (&kev[i], 0, sizeof (struct kevent));
+
+  if ((ops & KEY_OP_READ) || (ops & KEY_OP_ACCEPT))
+    {
+      /* Add event if it wasn't previously added. */
+      if (!(active & KEY_OP_READ) && !(active & KEY_OP_ACCEPT))
+        EV_SET(&kev[i], ident, EVFILT_READ, EV_ADD, 0, 0, (void *) key);
+    }
+  else
+    {
+      /* Delete event if it was previously added */
+      if ((active & KEY_OP_READ) || (active & KEY_OP_ACCEPT))
+        EV_SET(&kev[i], ident, EVFILT_READ, EV_DELETE, 0, 0, (void *) key);
+    }
+
+  /* Do the same thing for the write filter. */
+  if ((ops & KEY_OP_WRITE) || (ops & KEY_OP_CONNECT))
+    {
+      if (!(active & KEY_OP_WRITE) && !(active & KEY_OP_CONNECT))
+        EV_SET(&kev[i], ident, EVFILT_WRITE, EV_ADD, 0, 0, (void *) key);
+    }
+  else
+    {
+      if ((active & KEY_OP_WRITE) || (active & KEY_OP_CONNECT))
+        EV_SET(&kev[i], ident, EVFILT_WRITE, EV_DELETE, 0, 0, (void *) key);
+    }
+
+#ifdef TRACE_KQUEUE
+  printf (" set kevent %2d:  ident:%u filter:%x flags:%o fflags:%o data:%p udata:%p\n",
+          i, (unsigned) kev[i].ident, kev[i].filter, kev[i].flags, kev[i].fflags,
+          (void *) kev[i].data, kev[i].udata);
+#endif /* TRACE_KQUEUE */
+#else
+  (void) nstate;
+  (void) i;
+  (void) fd;
+  (void) ops;
+  (void) key;
+  (void) active;
+  throw_not_supported (env);
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    kevent
+ * Signature: (ILjava/nio/ByteBuffer;IJ)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_kevent (JNIEnv *env,
+                                             jobject this __attribute__((unused)),
+                                             jint kq, jobject nstate, jint nevents,
+                                             jint maxevents, jlong timeout)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct timespec tv;
+  struct timespec *t = NULL;
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  int ret;
+
+#ifdef TRACE_KQUEUE
+  int i;
+
+  printf ("[%d] kevent nevents:%d maxevents:%d timeout:%lld\n", kq, nevents, maxevents, timeout);
+  printf ("[%d] addding/deleting %d events\n", kq, nevents);
+  for (i = 0; i < nevents; i++)
+    {
+      printf ("[%d] kevent input [%d]: ident:%u filter:%x flags:%o fflags:%o data:%p udata:%p\n",
+              kq, i, (unsigned) kev[i].ident, kev[i].filter, kev[i].flags, kev[i].fflags,
+              (void *) kev[i].data, kev[i].udata);
+    }
+#endif
+
+/*   TRACE("events: %p; nevents: %d; timeout: %lld", (void *) kev, nevents, timeout); */
+
+  if (timeout != -1)
+    {
+      tv.tv_sec = timeout / 1000;
+      tv.tv_nsec = (timeout % 1000) * 1000;
+      t = &tv;
+    }
+
+  ret = kevent (kq, (const struct kevent *) kev, nevents, kev, maxevents, t);
+
+  if (ret == -1)
+    {
+      if (errno == EINTR)
+        ret = 0;
+      else
+        JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+    }
+
+#ifdef TRACE_KQUEUE
+  for (i = 0; i < ret; i++)
+    {
+      printf ("[%d] kevent output [%d]: ident:%u filter:%x flags:%o fflags:%o data:%p udata:%p\n",
+              kq, i, (unsigned) kev[i].ident, kev[i].filter, kev[i].flags, kev[i].fflags,
+              (void *) kev[i].data, kev[i].udata);
+    }
+#endif
+
+  return ret;
+#else
+  (void) kq;
+  (void) nstate;
+  (void) nevents;
+  (void) maxevents;
+  (void) timeout;
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    fetch_key
+ * Signature: (Ljava/nio/ByteBuffer;)I;
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_fetch_1key (JNIEnv *env,
+                                                 jclass clazz __attribute__((unused)),
+                                                 jobject nstate)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+/*   TRACE("return key %p\n", kev->udata); */
+  return (jint) kev->udata;
+#else
+  (void) nstate;
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    ready_ops
+ * Signature: (Ljava/nio/ByteBuffer;I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_ready_1ops (JNIEnv *env,
+                                                 jclass clazz __attribute__((unused)),
+                                                 jobject nstate, jint interest)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  jint ready = 0;
+
+  if ((kev->flags & EV_ERROR) == EV_ERROR)
+    {
+      printf ("!!! error selecting fd %d: %s", (int) (kev->ident), strerror ((int) (kev->data)));
+      return 0;
+    }
+
+  /* We poll for READ for OP_READ and OP_ACCEPT. */
+  if (kev->filter == EVFILT_READ)
+    {
+      ready = (interest & KEY_OP_READ) | (interest & KEY_OP_ACCEPT);
+/*       TRACE("filter EVFILT_READ. Ready ops set to %x", ready); */
+    }
+
+  /* Poll for WRITE for OP_WRITE and OP_CONNECT; I guess we *should*
+     get a WRITE event if we are connected, but I don't know if we do
+     for real. FIXME */
+  if (kev->filter == EVFILT_WRITE)
+    {
+      ready = (interest & KEY_OP_WRITE) | (interest & KEY_OP_CONNECT);
+/*       TRACE("filter EVFILT_WRITE. Ready ops set to %x", ready); */
+    }
+
+  return ready;
+#else
+  (void) nstate;
+  (void) interest;
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    check_eof
+ * Signature: (Ljava/nio/ByteBuffer;)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_check_1eof (JNIEnv *env,
+                                                 jclass clazz __attribute__((unused)),
+                                                 jobject nstate)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  if ((kev->flags & EV_EOF) == EV_EOF)
+    return JNI_TRUE;
+  return JNI_FALSE;
+#else
+  (void) nstate;
+  throw_not_supported (env);
+  return JNI_FALSE;
+#endif
+}
diff --git a/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMChannel.c b/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMChannel.c
index 5571bed27a5..97eb38618c3 100644
--- a/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMChannel.c
+++ b/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMChannel.c
@@ -36,25 +36,48 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <config-int.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+
+#include <netinet/in.h>
+
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/uio.h>
 #include <string.h>
 
 #include <jni.h>
 #include <jcl.h>
 
+#include "cpio.h"
 #include "gnu_java_nio_VMChannel.h"
+#include "javanio.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
 
+#define CONNECT_EXCEPTION "java/net/ConnectException"
 #define IO_EXCEPTION "java/io/IOException"
+#define SOCKET_EXCEPTION "java/net/SocketException"
+#define INTERRUPTED_IO_EXCEPTION "java/io/InterruptedIOException"
 #define NON_READABLE_CHANNEL_EXCEPTION "java/nio/channels/NonReadableChannelException"
 #define NON_WRITABLE_CHANNEL_EXCEPTION "java/nio/channels/NonWritableChannelException"
+#define SOCKET_TIMEOUT_EXCEPTION "java/net/SocketTimeoutException"
+
+/* Align a value up or down to a multiple of the pagesize. */
+#define ALIGN_DOWN(p,s) ((p) - ((p) % (s)))
+#define ALIGN_UP(p,s) ((p) + ((s) - ((p) % (s))))
 
 /*
  * Limit to maximum of 16 buffers
@@ -66,7 +89,7 @@ extern "C"
 {
 #endif
 
-enum JCL_buffer_type { DIRECT, ARRAY, UNKNOWN };
+enum JCL_buffer_type { DIRECT, HEAP, ARRAY, UNKNOWN };
 
 struct JCL_buffer
 {
@@ -83,6 +106,7 @@ void JCL_print_buffer(JNIEnv *, struct JCL_buffer *);
 int JCL_init_buffer(JNIEnv *, struct JCL_buffer *, jobject);
 void JCL_release_buffer(JNIEnv *, struct JCL_buffer *, jobject, jint);
 void JCL_cleanup_buffers(JNIEnv *, struct JCL_buffer *, jint, jobjectArray, jint, jlong);
+int JCL_thread_interrupted(JNIEnv *);
 
 static jfieldID address_fid;
 static jmethodID get_position_mid;
@@ -92,33 +116,37 @@ static jmethodID set_limit_mid;
 static jmethodID has_array_mid;
 static jmethodID array_mid;
 static jmethodID array_offset_mid;
+static jmethodID thread_interrupted_mid;
+static jclass vm_channel_class;
 
 jmethodID
 get_method_id(JNIEnv *env,  jclass clazz, const char *name, 
 	          const char *sig)
 {
   jmethodID mid = (*env)->GetMethodID(env, clazz, name, sig);
+/*   NIODBG("name: %s; sig: %s", name, sig); */
   if (mid == NULL)
     {
-  	  JCL_ThrowException(env, "java/lang/InternalError", name);
+      JCL_ThrowException(env, "java/lang/InternalError", name);
       return NULL;
     }
   
   return mid;
 }
 
-void
+inline void
 JCL_print_buffer(JNIEnv *env __attribute__((__unused__)), struct JCL_buffer *buf)
 {
-  fprintf(stdout, "Buffer - type: %d, ptr: %p\n", buf->type, buf->ptr);
-  fflush(stdout);
+  fprintf (stderr, "Buffer - type: %d, ptr: %p\n", buf->type, buf->ptr);
 }
 
 
 int
 JCL_init_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf)
 {
-  jobject address = (*env)->GetObjectField(env, bbuf, address_fid);
+  void *addr = (*env)->GetDirectBufferAddress (env, bbuf);
+
+/*   NIODBG("buf: %p; bbuf: %p; addr: %p", (void *) buf, bbuf, addr); */
   
   buf->position = (*env)->CallIntMethod(env, bbuf, get_position_mid);
   buf->limit = (*env)->CallIntMethod(env, bbuf, get_limit_mid);
@@ -126,11 +154,10 @@ JCL_init_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf)
   buf->count = 0;
   buf->type = UNKNOWN;
     
-  if (address != NULL)
+  if (addr != NULL)
     {
-      buf->ptr = (jbyte *) JCL_GetRawData(env, address);
+      buf->ptr = (jbyte *) addr;
       buf->type = DIRECT;
-      (*env)->DeleteLocalRef(env, address);
     }
   else
     {
@@ -148,7 +175,12 @@ JCL_init_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf)
         }
       else
         {
-          return -1;
+          jobject address = (*env)->GetObjectField (env, bbuf, address_fid);
+          if (address == NULL)
+            return -1; /* XXX handle non-array, non-native buffers? */
+          buf->ptr = (jbyte *) JCL_GetRawData(env, address);
+          buf->type = HEAP;
+          (*env)->DeleteLocalRef(env, address);
         }
     }
       
@@ -160,6 +192,8 @@ JCL_release_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf,
     jint action)
 {
   jbyteArray arr;
+
+/*   NIODBG("buf: %p; bbuf: %p; action: %x", (void *) buf, bbuf, action); */
   
   /* Set the position to the appropriate value */
   if (buf->count > 0)
@@ -173,6 +207,7 @@ JCL_release_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf,
   switch (buf->type)
     {
     case DIRECT:
+    case HEAP:
       break;
     case ARRAY:
       arr = (*env)->CallObjectMethod(env, bbuf, array_mid);
@@ -194,6 +229,9 @@ JCL_cleanup_buffers(JNIEnv *env,
                     jlong num_bytes)
 {
   jint i;
+
+/*   NIODBG("bi_list: %p; vec_len: %d; bbufs: %p; offset: %d; num_bytes: %lld", */
+/*       (void *) bi_list, vec_len, bbufs, offset, num_bytes); */
   
   /* Update all of the bbufs with the approriate information */
   for (i = 0; i < vec_len; i++)
@@ -217,13 +255,65 @@ JCL_cleanup_buffers(JNIEnv *env,
 }
 
 
+int
+JCL_thread_interrupted(JNIEnv *env)
+{
+  return (int) (*env)->CallStaticBooleanMethod(env, vm_channel_class,
+					       thread_interrupted_mid);
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    stdin_fd
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_stdin_1fd (JNIEnv *env __attribute__((unused)),
+                                       jclass c __attribute__((unused)))
+{
+/*   NIODBG("%d", fileno (stdin)); */
+  return fileno (stdin);
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    stdout_fd
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_stdout_1fd (JNIEnv *env __attribute__((unused)),
+                                       jclass c __attribute__((unused)))
+{
+/*   NIODBG("%d", fileno (stdout)); */
+  return fileno (stdout);
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    stderr_fd
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_stderr_1fd (JNIEnv *env __attribute__((unused)),
+                                       jclass c __attribute__((unused)))
+{
+/*   NIODBG("%d", fileno (stderr)); */
+  return fileno (stderr);
+}
+
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_nio_VMChannel_initIDs  (JNIEnv *env, 
-	jclass clazz __attribute__ ((__unused__)))
+	jclass clazz)
 {
   jclass bufferClass = JCL_FindClass(env, "java/nio/Buffer");
   jclass byteBufferClass = JCL_FindClass(env, "java/nio/ByteBuffer");
-  
+
+/*   NIODBG("%s", "..."); */
+
   address_fid = (*env)->GetFieldID(env, bufferClass, "address", 
                                    "Lgnu/classpath/Pointer;");
   if (address_fid == NULL)
@@ -242,6 +332,11 @@ Java_gnu_java_nio_VMChannel_initIDs  (JNIEnv *env,
   has_array_mid = get_method_id(env, byteBufferClass, "hasArray", "()Z");
   array_mid = get_method_id(env, byteBufferClass, "array", "()[B");
   array_offset_mid = get_method_id(env, byteBufferClass, "arrayOffset", "()I");
+  
+  vm_channel_class = clazz;
+  thread_interrupted_mid = (*env)->GetStaticMethodID(env, clazz,
+                                                  "isThreadInterrupted",
+                                                  "()Z");
 }
 
 JNIEXPORT void JNICALL 
@@ -252,6 +347,8 @@ Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env,
 {
   int opts;
   
+/*   NIODBG("fd: %d; blocking: %d", fd, blocking); */
+
   opts = fcntl(fd, F_GETFL);
   if (opts < 0)
     {
@@ -260,10 +357,10 @@ Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env,
       return;
     }
   
-  if (blocking)
-    opts |= O_NONBLOCK;
-  else
+  if (blocking == JNI_TRUE)
     opts &= ~(O_NONBLOCK);
+  else
+    opts |= O_NONBLOCK;
   
   opts = fcntl(fd, F_SETFL, opts);
   
@@ -275,16 +372,33 @@ Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env,
     }  
 }
 
+/* Return true if fd is in non-blocking mode. */
+static jboolean
+is_non_blocking_fd(jint fd)
+{
+  int opts;
+  opts = fcntl(fd, F_GETFL);
+  if (opts == -1)
+    {
+      /* Assume blocking on error. */
+      return 0;
+    }
+  return (opts & O_NONBLOCK) != 0;
+}
 
 JNIEXPORT jint JNICALL 
-Java_gnu_java_nio_VMChannel_read (JNIEnv *env, 
-	jobject o __attribute__ ((__unused__)), 
-	jint fd, 
-	jobject bbuf)
+Java_gnu_java_nio_VMChannel_read__ILjava_nio_ByteBuffer_2 (JNIEnv *env,
+                                                           jobject o __attribute__ ((__unused__)), 
+                                                           jint fd, 
+                                                           jobject bbuf)
 {
+#ifdef HAVE_READ
   jint len;
   ssize_t result;
   struct JCL_buffer buf;
+  int tmp_errno;
+
+/*   NIODBG("fd: %d; bbuf: %p", fd, bbuf); */
   
   if (JCL_init_buffer(env, &buf, bbuf) < 0)
     {
@@ -292,26 +406,59 @@ Java_gnu_java_nio_VMChannel_read (JNIEnv *env,
       JCL_ThrowException (env, IO_EXCEPTION, "Buffer initialisation failed");
       return -1;
     }
-  
+
   len = buf.limit - buf.position;
+
+  if (len == 0)
+    {
+      JCL_release_buffer (env, &buf, bbuf, JNI_ABORT);
+      return 0;
+    }
   
-  result = read(fd, &(buf.ptr[buf.position + buf.offset]), len);
-  buf.count = result;
+  do 
+    {
+      result = cpnio_read (fd, &(buf.ptr[buf.position + buf.offset]), len);
+      tmp_errno = errno;
+    }
+  while (result == -1 && errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmp_errno;
   
   if (result == 0)
-    result = -1; /* End Of File */
+    {
+      result = -1;
+      buf.count = 0;
+    }
   else if (result == -1)
     {
       buf.count = 0;
-      if (errno == EAGAIN) /* Non-blocking */
-        result = 0;
+      if (errno == EAGAIN)
+        {
+          if (is_non_blocking_fd(fd))
+            {
+              /* Non-blocking */
+              result = 0;
+            }
+          else
+            {
+              /* Read timeout on a socket with SO_RCVTIMEO != 0. */
+              JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
+              JCL_ThrowException(env, SOCKET_TIMEOUT_EXCEPTION, "read timed out");
+              return -1;
+            }
+        }
       else if (errno == EBADF) /* Bad fd */
         {
           JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
           JCL_ThrowException (env, NON_READABLE_CHANNEL_EXCEPTION, 
                               strerror(errno));
           return -1;
-        }            
+        }
+      else if (EINTR == errno) /* read interrupted */
+        {
+          JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
+          JCL_ThrowException(env, INTERRUPTED_IO_EXCEPTION, strerror (errno));
+          return -1;
+        }
       else
         {
           JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
@@ -320,21 +467,32 @@ Java_gnu_java_nio_VMChannel_read (JNIEnv *env,
         }
     }
   else 
-    
-  JCL_release_buffer(env, &buf, bbuf, JNI_COMMIT);
+    buf.count = result;
+      
+  JCL_release_buffer(env, &buf, bbuf, 0);
   
   return result;
+#else
+  (void) fd;
+  (void) bbuf;
+  JCL_ThrowException (env, IO_EXCEPTION, "read not supported");
+  return -1;
+#endif /* HAVE_READ */
 }
 
 JNIEXPORT jint JNICALL 
-Java_gnu_java_nio_VMChannel_write (JNIEnv *env, 
-	jobject o __attribute__ ((__unused__)), 
-	jint fd, 
-	jobject bbuf)
+Java_gnu_java_nio_VMChannel_write__ILjava_nio_ByteBuffer_2 (JNIEnv *env, 
+                                                            jobject o __attribute__ ((__unused__)), 
+                                                            jint fd, 
+                                                            jobject bbuf)
 {
+#ifdef HAVE_WRITE
   jint len;
   ssize_t result;
   struct JCL_buffer buf;
+  int tmp_errno;
+
+/*   NIODBG("fd: %d; bbuf: %p", fd, bbuf); */
   
   if (JCL_init_buffer(env, &buf, bbuf) < 0)
     {
@@ -342,16 +500,31 @@ Java_gnu_java_nio_VMChannel_write (JNIEnv *env,
       JCL_ThrowException (env, IO_EXCEPTION, "Buffer initialisation failed");
       return -1;
     }
-  
+
   len = buf.limit - buf.position;
+
+  if (len == 0)
+    {
+      JCL_release_buffer (env, &buf, bbuf, JNI_ABORT);
+      return 0;
+    }
   
-  result = write(fd, &(buf.ptr[buf.position + buf.offset]), len);
+  do
+    {
+      result = cpnio_write (fd, &(buf.ptr[buf.position + buf.offset]), len);
+      tmp_errno = errno;
+    }
+  while (result == -1 && errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmp_errno;
+
   buf.count = result;
-  
+
   if (result == -1)
     {
       if (errno == EAGAIN) /* Non-blocking */
+        {
           result = 0;
+        }
       else
         {
           JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
@@ -362,7 +535,13 @@ Java_gnu_java_nio_VMChannel_write (JNIEnv *env,
     
   JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
   
-  return result;  
+  return result;
+#else
+  (void) fd;
+  (void) bbuf;
+  JCL_ThrowException (env, IO_EXCEPTION, "write not supported");
+  return -1;
+#endif /* HAVE_WRITE */
 }
 
 
@@ -390,7 +569,11 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
   struct JCL_buffer bi_list[JCL_IOV_MAX];
   ssize_t result;
   jint vec_len = length < JCL_IOV_MAX ? length : JCL_IOV_MAX;
-  jlong bytes_read = 0;      
+  jlong bytes_read = 0;
+  int tmp_errno;
+
+/*   NIODBG("fd: %d; bbufs: %p; offset: %d; length: %d", */
+/*          fd, bbufs, offset, length); */
   
   /* Build the vector of buffers to read into */
   for (i = 0; i < vec_len; i++)
@@ -401,7 +584,9 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
       buf = &bi_list[i];
       bbuf = (*env)->GetObjectArrayElement(env, bbufs, offset + i);
       
-      JCL_init_buffer(env, buf, bbuf); 
+      JCL_init_buffer(env, buf, bbuf);
+
+/*       JCL_print_buffer (env, buf); */
       
       buffers[i].iov_base = &(buf->ptr[buf->position + buf->offset]);
       buffers[i].iov_len = buf->limit - buf->position;
@@ -409,14 +594,33 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
     }
     
   /* Work the scattering magic */
-  result = readv(fd, buffers, vec_len);
+  do
+    {
+      result = cpnio_readv (fd, buffers, vec_len);
+      tmp_errno = errno;
+    }
+  while (result == -1 && errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmp_errno;
   bytes_read = (jlong) result;
   
   /* Handle the response */
   if (result < 0)
     {
-      if (errno == EAGAIN) /* Non blocking */
-        result = 0;
+      if (errno == EAGAIN)
+        {
+          if (is_non_blocking_fd(fd))
+            {
+              /* Non-blocking */
+              result = 0;
+            }
+          else
+            {
+              /* Read timeout on a socket with SO_RCVTIMEO != 0. */
+              JCL_cleanup_buffers(env, bi_list, vec_len, bbufs, offset, bytes_read);
+              JCL_ThrowException(env, SOCKET_TIMEOUT_EXCEPTION, "read timed out");
+              return -1;
+            }
+        }
       else if (errno == EBADF) /* Bad fd */
         {
           JCL_cleanup_buffers(env, bi_list, vec_len, bbufs, offset, bytes_read);
@@ -442,6 +646,7 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
   return (jlong) result;
 }
 
+
 /*
  * Implementation of a gathering write.  Will use the appropriate
  * vector based read call (currently readv on Linux).
@@ -467,7 +672,10 @@ Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env,
   ssize_t result;
   jint vec_len = length < JCL_IOV_MAX ? length : JCL_IOV_MAX;
   jlong bytes_written;
+  int tmp_errno;
   
+/*   NIODBG("fd: %d; bbufs: %p; offset: %d; length: %d", */
+/*          fd, bbufs, offset, length); */
   
   /* Build the vector of buffers to read into */
   for (i = 0; i < vec_len; i++)
@@ -480,13 +688,22 @@ Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env,
       
       JCL_init_buffer(env, buf, bbuf); 
       
+/*       JCL_print_buffer(env, buf); */
+
       buffers[i].iov_base = &(buf->ptr[buf->position + buf->offset]);
       buffers[i].iov_len = buf->limit - buf->position;
       (*env)->DeleteLocalRef(env, bbuf);
     }
     
   /* Work the gathering magic */
-  result = writev(fd, buffers, vec_len);
+  do
+    {
+      result = cpnio_writev (fd, buffers, vec_len);
+      tmp_errno = errno;
+    }
+  while (result == -1 && tmp_errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmp_errno;
+
   bytes_written = (jlong) result;
 
   if (result < 0)
@@ -518,6 +735,1214 @@ Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env,
 }
 
 
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    receive
+ * Signature: (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_receive (JNIEnv *env,
+                                     jclass c __attribute__((unused)),
+                                     jint fd, jobject dst, jobject addrPort)
+{
+#ifdef HAVE_RECVFROM
+  char *addrPortPtr = (*env)->GetDirectBufferAddress (env, addrPort);
+  struct JCL_buffer buf;
+#ifdef HAVE_INET6
+  struct sockaddr_in6 sock_storage;
+  struct sockaddr_in6 *sock6;
+  socklen_t slen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in sock_storage;
+  socklen_t slen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+  struct sockaddr *sockaddr = (struct sockaddr *) &sock_storage;
+  struct sockaddr_in *sock4;
+  int ret;
+  jint result = -1;
+
+  if (JCL_init_buffer (env, &buf, dst) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, "loading buffer failed");
+
+  ret = cpnio_recvfrom (fd, &(buf.ptr[buf.position + buf.offset]),
+                        buf.limit - buf.position, MSG_WAITALL,
+                        sockaddr, &slen);
+
+  if (-1 == ret)
+    {
+      JCL_release_buffer (env, &buf, dst, JNI_ABORT);
+      if (EINTR == errno)
+        JCL_ThrowException (env, "java/io/InterruptedIOException", strerror (errno));
+      else if (EAGAIN == errno)
+        {
+          /* If the socket is in blocking mode, our timeout expired. */
+          int val = fcntl (fd, F_GETFL, 0);
+          if (val == -1)
+            JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          else if ((val & O_NONBLOCK) == 0)
+            JCL_ThrowException (env, "java/net/SocketTimeoutException",
+                                "read timed out");
+        }
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return 0;
+    }
+
+  if (sockaddr->sa_family == AF_INET)
+    {
+      sock4 = (struct sockaddr_in *) sockaddr;
+      memcpy (addrPortPtr, &(sock4->sin_addr.s_addr), 4);
+      ;memcpy (addrPortPtr + 4, &(sock4->sin_port), 2);
+      result = 4;
+    }
+#ifdef HAVE_INET6
+  else if (sockaddr->sa_family == AF_INET6)
+    {
+      sock6 = (struct sockaddr_in6 *) sockaddr;
+      memcpy (addrPortPtr, &(sock6->sin6_addr.s6_addr), 16);
+      memcpy (addrPortPtr + 16, &(sock6->sin6_port), 2);
+      result = 16;
+    }
+#endif /* HAVE_INET6 */
+  else if (ret == 0)
+    {
+      result = 0;
+    }
+  else
+    {
+      JCL_ThrowException (env, "java/net/SocketException",
+                          "unsupported address type returned");
+    }
+
+  buf.count += ret;
+  JCL_release_buffer (env, &buf, dst, 0);
+  return result;
+#else
+  (void) fd;
+  (void) dst;
+  (void) addrPort;
+  JCL_ThrowException (env, IO_EXCEPTION, "recvfrom not supported");
+#endif /* HAVE_RECVFROM */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    send
+ * Signature: (Ljava/nio/ByteBuffer;[BI)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_send (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  int fd, jobject src, jbyteArray addr, jint port)
+{
+#ifdef HAVE_SENDTO
+  struct sockaddr_in sockaddr;
+  jbyte *elems;
+  struct JCL_buffer buf;
+  int ret;
+
+/*   NIODBG("fd: %d; src: %p; addr: %p; port: %d", */
+/*          fd, src, addr, port); */
+
+  if (JCL_init_buffer (env, &buf, src) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, "loading buffer failed");
+      return -1;
+    }
+
+/*   JCL_print_buffer (env, &buf); */
+
+  elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  sockaddr.sin_family = AF_INET;
+  sockaddr.sin_addr.s_addr = *((uint32_t *) elems);
+  sockaddr.sin_port = htons (port);
+
+  do
+    {
+      ret = cpnio_sendto (fd, &(buf.ptr[buf.position + buf.offset]),
+                          buf.limit - buf.position,
+                          0, (const struct sockaddr *) &sockaddr,
+                          sizeof (struct sockaddr_in));
+    }
+  while (-1 == ret && EINTR == errno);
+
+  (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    {
+      if (errno != EAGAIN)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      JCL_release_buffer (env, &buf, src, JNI_ABORT);
+      return 0;
+    }
+
+  buf.count += ret;
+  JCL_release_buffer (env, &buf, src, JNI_ABORT);
+  return ret;
+#else
+  (void) fd;
+  (void) src;
+  (void) addr;
+  (void) port;
+#endif /* HAVE_SENDTO */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    send6
+ * Signature: (Ljava/nio/ByteBuffer;[BI)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_send6 (JNIEnv *env,
+                                   jclass c __attribute__((unused)),
+                                   int fd, jobject src, jbyteArray addr, jint port)
+{
+#if defined(HAVE_SENDTO) && defined(HAVE_INET6)
+  struct sockaddr_in6 sockaddr;
+  jbyte *elems;
+  struct JCL_buffer buf;
+  int ret;
+
+/*   NIODBG("fd: %d; src: %p; addr: %p; port: %d", */
+/*          fd, src, addr, port); */
+
+  if (JCL_init_buffer (env, &buf, src) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, "loading buffer failed");
+      return -1;
+    }
+
+/*   JCL_print_buffer (env, &buf); */
+
+  elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  sockaddr.sin6_family = AF_INET6;
+  memcpy (&sockaddr.sin6_addr.s6_addr, elems, 16);
+  sockaddr.sin6_port = htons (port);
+
+  do
+    {
+      ret = cpnio_sendto (fd, (const void *) (buf.ptr + buf.offset),
+                          buf.limit - buf.position,
+                          0, (const struct sockaddr *) &sockaddr,
+                          sizeof (struct sockaddr_in6));
+    }
+  while (-1 == ret && EINTR == errno);
+
+  (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    {
+      if (errno != EAGAIN)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      JCL_release_buffer (env, &buf, src, JNI_ABORT);
+      return 0;
+    }
+
+  buf.count += ret;
+  JCL_release_buffer (env, &buf, src, JNI_ABORT);
+  return ret;
+#else
+  (void) fd;
+  (void) src;
+  (void) addr;
+  (void) port;
+  JCL_ThrowException (env, IO_EXCEPTION, "IPv6 sendto not supported");
+  return -1;
+#endif /* HAVE_SENDTO && HAVE_INET6 */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    read
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_read__I (JNIEnv *env,
+                                     jclass c __attribute__((unused)),
+                                     jint fd)
+{
+#ifdef HAVE_READ
+  char in;
+  int ret;
+  int tmp_errno;
+
+/*   NIODBG("fd: %d", fd); */
+
+  do
+    {
+      ret = cpnio_read (fd, &in, 1);
+      tmp_errno = errno;
+    }
+  while (ret == -1 && errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmp_errno;
+
+  if (-1 == ret)
+    {
+      if (errno == EAGAIN && !is_non_blocking_fd(fd))
+        {
+          /* Read timeout on a socket with SO_RCVTIMEO != 0. */
+          JCL_ThrowException(env, SOCKET_TIMEOUT_EXCEPTION, "read timed out");
+        }
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return -1;
+    }
+  
+  if (0 == ret)
+    return -1;
+
+  return (in & 0xFF);
+#else
+  (void) fd;
+  JCL_ThrowException (env, IO_EXCEPTION, "read not supported");
+#endif /* HAVE_READ */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    write
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_write__II (JNIEnv *env,
+                                       jclass c __attribute__((unused)),
+                                       jint fd, jint data)
+{
+#ifdef HAVE_WRITE
+  char out = (char) data;
+  int ret;
+  int tmp_errno;
+
+/*   NIODBG("fd: %d; data: %d", fd, data); */
+
+  do
+    {
+      ret = cpnio_write (fd, &out, 1);
+      tmp_errno = errno;
+    }
+  while (ret == -1 && errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmp_errno;
+
+  if (-1 == ret)
+    JCL_ThrowException(env, IO_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) data;
+  JCL_ThrowException (env, IO_EXCEPTION, "write not supported");
+#endif /* HAVE_WRITE */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    socket
+ * Signature: (Z)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_socket (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                    jboolean stream)
+{
+#ifdef HAVE_SOCKET
+  int ret;
+
+  do
+    {
+      ret = cpnio_socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
+    }
+  while (-1 == ret && EINTR == errno);
+
+  if (ret == -1)
+    JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+/*   NIODBG("created socket %d", ret); */
+
+  return ret;
+#else
+  (void) stream;
+  JCL_ThrowException (env, IO_EXCEPTION, "socket not supported");
+  return -1;
+#endif /* HAVE_SOCKET */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    connect
+ * Signature: (I[BI)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_connect (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                     jint fd, jbyteArray addr, jint port, jint timeout)
+{
+#ifdef HAVE_CONNECT
+  struct sockaddr_in sockaddr;
+  struct timeval timeo;
+  int origflags = 0, flags;
+  jbyte *addr_elems;
+  int ret;
+  int tmpErrno;
+
+  if ((*env)->GetArrayLength (env, addr) != 4)
+    {
+      JCL_ThrowException (env, SOCKET_EXCEPTION,
+                          "expecting 4-byte address");
+      return JNI_FALSE;
+    }
+
+  if (timeout > 0)
+    {
+      timeo.tv_sec = timeout / 1000;
+      timeo.tv_usec = (timeout % 1000) * 1000;
+      origflags = fcntl (fd, F_GETFL, 0);
+      if (origflags == -1)
+        {
+          JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+      /* Set nonblocking mode, if not already set. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          flags = origflags | O_NONBLOCK;
+          if (fcntl (fd, F_SETFL, flags) == -1)
+            {
+              JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+    }
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset (&sockaddr, 0, sizeof (struct sockaddr_in));
+  sockaddr.sin_family = AF_INET;
+  sockaddr.sin_port = htons (port);
+  sockaddr.sin_addr.s_addr = *((uint32_t *) addr_elems);
+
+
+  do
+    {
+      ret = cpnio_connect (fd, (struct sockaddr *) &sockaddr,
+                           sizeof (struct sockaddr_in));
+      tmpErrno = errno;
+    }
+  while (ret == -1 && errno == EINTR && ! JCL_thread_interrupted(env));
+  errno = tmpErrno;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  /* If a timeout was specified, select on the file descriptor with
+     the timeout. */
+  if (timeout > 0 && ret == -1)
+    {
+      /* Reset the non-blocking flag, if needed. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          if (fcntl (fd, F_SETFL, origflags) == -1)
+            {
+              /* oops */
+              JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+      if (EINPROGRESS == errno)
+        {
+          fd_set wrfds;
+          FD_ZERO(&wrfds);
+          FD_SET(fd, &wrfds);
+          ret = cpnio_select (fd + 1, NULL, &wrfds, NULL, &timeo);
+          if (ret == -1)
+            {
+              JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+          if (ret == 0) /* connect timed out */
+            {
+              JCL_ThrowException (env, SOCKET_TIMEOUT_EXCEPTION,
+                                  "connect timed out");
+              return JNI_FALSE;
+            }
+          return JNI_TRUE; /* Connected! */
+        }
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, CONNECT_EXCEPTION,
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  if (ret == -1)
+    {
+      if (EINPROGRESS == errno)
+        return JNI_FALSE;
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, CONNECT_EXCEPTION,
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  return JNI_TRUE;
+#else
+  (void) fd;
+  (void) addr;
+  (void) port;
+  (void) timeout;
+  JCL_ThrowException (env, SOCKET_EXCEPTION, "connect not supported");
+  return JNI_FALSE;
+#endif /* HAVE_CONNECT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    connect6
+ * Signature: (I[BI)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_connect6 (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                      jint fd, jbyteArray addr, jint port, int timeout)
+{
+#if defined(HAVE_CONNECT) && defined(HAVE_INET6)
+  struct sockaddr_in6 sockaddr;
+  struct timeval timeo;
+  int flags, origflags = 0;
+  jbyte *addr_elems;
+  int ret;
+
+  if (timeout > 0)
+    {
+      timeo.tv_sec = timeout / 1000;
+      timeo.tv_usec = (timeout % 1000) * 1000;
+      origflags = fcntl (fd, F_GETFL, 0);
+      if (origflags == -1)
+        {
+          JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+      /* Set nonblocking mode, if not already set. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          flags = origflags | O_NONBLOCK;
+          if (fcntl (fd, F_SETFL, flags) == -1)
+            {
+              JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+    }
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset (&sockaddr, 0, sizeof (struct sockaddr_in6));
+  sockaddr.sin6_family = AF_INET6;
+  sockaddr.sin6_port = htons (port);
+  memcpy (&sockaddr.sin6_addr.s6_addr, addr_elems, 16);
+
+  ret = cpnio_connect (fd, (struct sockaddr *) &sockaddr,
+                       sizeof (struct sockaddr_in6));
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  /* If a timeout was specified, select on the file descriptor with
+     the timeout. */
+  if (timeout > 0 && ret == -1)
+    {
+      /* Reset the non-blocking flag, if needed. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          if (fcntl (fd, F_SETFL, origflags) == -1)
+            {
+              /* oops */
+              JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+      if (EINPROGRESS == errno)
+        {
+          fd_set wrfds;
+          FD_ZERO(&wrfds);
+          FD_SET(fd, &wrfds);
+          ret = cpnio_select (fd + 1, NULL, &wrfds, NULL, &timeo);
+          if (ret == -1)
+            {
+              JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+          if (ret == 0) /* connect timed out */
+            {
+              JCL_ThrowException (env, SOCKET_TIMEOUT_EXCEPTION,
+                                  "connect timed out");
+              return JNI_FALSE;
+            }
+          return JNI_TRUE; /* Connected! */
+        }
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, CONNECT_EXCEPTION,
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  if (ret == -1)
+    {
+      if (EAGAIN == errno)
+        return JNI_FALSE;
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, CONNECT_EXCEPTION,
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  return JNI_TRUE;
+#else
+  (void) fd;
+  (void) addr;
+  (void) port;
+  (void) timeout;
+  JCL_ThrowException (env, SOCKET_EXCEPTION, "IPv6 connect not supported");
+  return JNI_FALSE;
+#endif /* HAVE_CONNECT && HAVE_INET6 */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    getsockname
+ * Signature: (ILjava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_getsockname (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                         jint fd, jobject name)
+{
+#ifdef HAVE_GETSOCKNAME
+#ifdef HAVE_INET6
+  struct sockaddr_in6 *addr6;
+  struct sockaddr_in6 sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+
+  struct sockaddr *sockaddr = (struct sockaddr *) &sock_storage;
+  struct sockaddr_in *addr4;
+  int ret;
+  char *nameptr = (*env)->GetDirectBufferAddress (env, name);
+
+  ret = getsockname (fd, sockaddr, &socklen);
+  if (ret == -1)
+    {
+      JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+      return 0;
+    }
+
+  if (sockaddr->sa_family == AF_INET)
+    {
+      addr4 = (struct sockaddr_in *) sockaddr;
+      memcpy (nameptr, &(addr4->sin_addr.s_addr), 4);
+      memcpy (nameptr + 4, &(addr4->sin_port), 2);
+      return 4;
+    }
+
+#ifdef HAVE_INET6
+  /* IPv6 */
+  if (sockaddr->sa_family == AF_INET6)
+    {
+      addr6 = (struct sockaddr_in6 *) sockaddr;
+      memcpy (nameptr, &(addr6->sin6_addr.s6_addr), 16);
+      memcpy (nameptr + 16, &(addr6->sin6_port), 2);
+      return 16;
+    }
+#endif /* HAVE_INET6 */
+  JCL_ThrowException (env, IO_EXCEPTION, "unsupported address format");
+  return -1;
+#else
+  (void) fd;
+  (void) name;
+  JCL_ThrowException (env, IO_EXCEPTION, "getsockname not supported");
+  return -1;
+#endif /* HAVE_GETSOCKNAME */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    getpeername
+ * Signature: (ILjava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_getpeername (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                         jint fd, jobject name)
+{
+#ifdef HAVE_GETPEERNAME
+#ifdef HAVE_INET6
+  struct sockaddr_in6 *addr6;
+  struct sockaddr_in6 sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+
+  struct sockaddr *sockaddr = (struct sockaddr *) &sock_storage;
+  struct sockaddr_in *addr4;
+  int ret;
+  char *nameptr = (*env)->GetDirectBufferAddress (env, name);
+  
+  ret = getpeername (fd, sockaddr, &socklen);
+  if (ret == -1)
+    {
+      if (ENOTCONN != errno)
+        JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+      return 0;
+    }
+
+  if (sockaddr->sa_family == AF_INET)
+    {
+      addr4 = (struct sockaddr_in *) sockaddr;
+      memcpy (nameptr, &(addr4->sin_addr.s_addr), 4);
+      memcpy (nameptr + 4, &(addr4->sin_port), 2);
+      return 4;
+    }
+#ifdef HAVE_INET6
+  else if (sockaddr->sa_family == AF_INET6)
+    {
+      addr6 = (struct sockaddr_in6 *) sockaddr;
+      memcpy (nameptr, &(addr6->sin6_addr.s6_addr), 16);
+      memcpy (nameptr + 16, &(addr6->sin6_port), 2);
+      return 16;
+    }
+#endif /* HAVE_INET6 */
+
+  JCL_ThrowException (env, "java/net/SocketException",
+                      "unsupported address type");
+  return -1;
+#else
+  (void) fd;
+  (void) name;
+  JCL_ThrowException (env, IO_EXCEPTION, "getpeername not supported");
+  return -1;
+#endif /* HAVE_GETPEERNAME */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    accept
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_accept (JNIEnv *env,
+                                    jclass c __attribute__((unused)),
+                                    jint fd)
+{
+#ifdef HAVE_ACCEPT
+  int ret;
+  int tmp_errno = 0;
+
+#ifdef HAVE_INET6
+  struct sockaddr_in6 addr;
+  socklen_t alen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in addr;
+  socklen_t alen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+
+  do
+    {
+      ret = cpnio_accept (fd, (struct sockaddr *) &addr, &alen);
+      tmp_errno = errno;
+      
+      if (ret == -1)
+        switch (tmp_errno)
+        {
+          case EINTR:
+            /* Check if interrupted by Thread.interrupt(). If not then some
+             * other unrelated signal interrupted the system function and
+             * we should start over again.
+             */
+            if (JCL_thread_interrupted(env))
+              {
+                JCL_ThrowException (env, "java/net/SocketException", strerror (tmp_errno));
+                return -1;
+              }
+            break;
+#if defined(EWOULDBLOCK) && defined(EAGAIN) && EWOULDBLOCK != EAGAIN
+          case EWOULDBLOCK:
+#endif
+          case EAGAIN:
+            /* Socket in non-blocking mode and no pending connection. */
+            return -1;
+          default:
+            JCL_ThrowException (env, "java/net/SocketException", strerror (tmp_errno));
+            return -1;
+        }
+      else
+        break;
+    }
+  while (1);
+
+  cpio_closeOnExec(ret);
+
+  return ret;
+#else
+  (void) fd;
+  JCL_ThrowException (env, IO_EXCEPTION, "accept not supported");
+  return -1;
+#endif /* HAVE_ACCEPT */
+}
+
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    disconnect
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_disconnect (JNIEnv *env,
+                                        jclass c __attribute__((unused)),
+                                        jint fd)
+{
+  struct sockaddr sockaddr;
+
+  sockaddr.sa_family = AF_UNSPEC;
+  if (connect (fd, &sockaddr, sizeof (struct sockaddr)) == -1)
+    {
+      /* The expected error for a successful disconnect is EAFNOSUPPORT. */
+      if (errno != EAFNOSUPPORT)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    close
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_close (JNIEnv *env,
+                                   jclass c __attribute__((unused)),
+                                   jint fd)
+{
+  if (close (fd) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    available
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_available (JNIEnv *env,
+                                       jclass c __attribute__((unused)),
+                                       jint fd)
+{
+  jint avail = 0;
+
+/*   NIODBG("fd: %d", fd); */
+  if (ioctl (fd, FIONREAD, &avail) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+/*   NIODBG("avail: %d", avail); */
+
+  return avail;
+}
+
+
+enum FileChannel_mode {
+  CPNIO_READ   = 1,
+  CPNIO_WRITE  = 2,
+  CPNIO_APPEND = 4,
+  CPNIO_EXCL   = 8,
+  CPNIO_SYNC   = 16,
+  CPNIO_DSYNC  = 32
+};
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    open
+ * Signature: (Ljava/lang/String;I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_open (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jstring path, jint mode)
+{
+  int nmode = 0;
+  int ret;
+  const char *npath;
+  mode_t mask = umask (0);
+  umask (mask);
+
+  if ((mode & CPNIO_READ) && (mode & CPNIO_WRITE))
+    nmode = O_RDWR;
+  else if (mode & CPNIO_WRITE)
+    nmode = O_WRONLY;
+  else
+    nmode = O_RDONLY;
+
+  nmode = (nmode
+           | ((nmode == O_RDWR || nmode == O_WRONLY) ? O_CREAT : 0)
+           | ((mode & CPNIO_APPEND) ? O_APPEND :
+              ((nmode == O_RDWR || nmode == O_WRONLY) ? O_TRUNC : 0))
+           | ((mode & CPNIO_EXCL) ? O_EXCL : 0)
+           | ((mode & CPNIO_SYNC) ? O_SYNC : 0));
+
+  npath = JCL_jstring_to_cstring (env, path);
+
+/*   NIODBG("path: %s; mode: %x", npath, nmode); */
+
+  ret = open (npath, nmode, 0777 & ~mask);
+
+/*   NIODBG("ret: %d\n", ret); */
+
+  JCL_free_cstring (env, path, npath);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  return ret;
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    position
+ * Signature: (I)J
+ */
+JNIEXPORT jlong JNICALL
+Java_gnu_java_nio_VMChannel_position (JNIEnv *env,
+                                      jclass c __attribute__((unused)),
+                                      jint fd)
+{
+#ifdef HAVE_LSEEK
+  off_t ret;
+
+  ret = lseek (fd, 0, SEEK_CUR);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  return (jlong) ret;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "position not supported");
+  return -1;
+#endif /* HAVE_LSEEK */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    seek
+ * Signature: (IJ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_seek (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jint fd, jlong pos)
+{
+#ifdef HAVE_LSEEK
+  if (lseek (fd, (off_t) pos, SEEK_SET) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "seek not supported");
+#endif /* HAVE_LSEEK */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    truncate
+ * Signature: (IJ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_truncate (JNIEnv *env,
+                                      jclass c __attribute__((unused)),
+                                      jint fd, jlong len)
+{
+#if defined(HAVE_FTRUNCATE) && defined(HAVE_LSEEK)
+  off_t pos = lseek (fd, 0, SEEK_CUR);
+  if (pos == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return;
+    }
+  if (ftruncate (fd, (off_t) len) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return;
+    }
+  if (pos > len)
+    {
+      if (lseek (fd, len, SEEK_SET) == -1)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "truncate not supported");
+#endif /* HAVE_FTRUNCATE && HAVE_LSEEK */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    lock
+ * Signature: (IJJZZ)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_lock (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jint fd, jlong pos, jlong len,
+                                  jboolean shared, jboolean wait)
+{
+#if HAVE_FCNTL
+  struct flock fl;
+
+  fl.l_start  = (off_t) pos;
+  /* Long.MAX_VALUE means lock everything possible starting at pos. */
+  if (len == 9223372036854775807LL)
+    fl.l_len = 0;
+  else
+    fl.l_len = (off_t) len;
+  fl.l_pid    = getpid ();
+  fl.l_type   = (shared ? F_RDLCK : F_WRLCK);
+  fl.l_whence = SEEK_SET;
+
+  if (cpnio_fcntl (fd, (wait ? F_SETLKW : F_SETLK), (long) &fl) == -1)
+    {
+      if (errno != EAGAIN)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return JNI_FALSE;
+    }
+
+  return JNI_TRUE;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "lock not supported");
+  return JNI_FALSE;
+#endif /* HAVE_FCNTL */
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    unlock
+ * Signature: (IJJ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_unlock (JNIEnv *env,
+                                    jclass c __attribute__((unused)),
+                                    jint fd, jlong pos, jlong len)
+{
+#if HAVE_FCNTL
+  struct flock fl;
+
+  fl.l_start  = (off_t) pos;
+  fl.l_len    = (off_t) len;
+  fl.l_pid    = getpid ();
+  fl.l_type   = F_UNLCK;
+  fl.l_whence = SEEK_SET;
+
+  if (cpnio_fcntl (fd, F_SETLK, (long) &fl) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "unlock not supported");
+#endif /* HAVE_FCNTL */
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    size
+ * Signature: (I)J
+ */
+JNIEXPORT jlong JNICALL
+Java_gnu_java_nio_VMChannel_size (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jint fd)
+{
+#ifdef HAVE_FSTAT
+  struct stat st;
+
+  if (fstat (fd, &st) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  return (jlong) st.st_size;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "size not supported");
+  return 0;
+#endif
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    map
+ * Signature: (ICJI)Lgnu/classpath/Pointer;
+ */
+JNIEXPORT jobject JNICALL
+Java_gnu_java_nio_VMChannel_map (JNIEnv *env,
+                                 jclass clazz __attribute__((unused)),
+                                 jint fd, jchar mode, jlong position, jint size)
+{
+#ifdef HAVE_MMAP
+  jclass MappedByteBufferImpl_class;
+  jmethodID MappedByteBufferImpl_init = NULL;
+  jobject Pointer_instance;
+  volatile jobject buffer;
+  long pagesize;
+  int prot, flags;
+  void *p;
+  void *address;
+
+/*   NIODBG("fd: %d; mode: %x; position: %lld; size: %d", */
+/*          fd, mode, position, size); */
+
+  /* FIXME: should we just assume we're on an OS modern enough to
+     have 'sysconf'? And not check for 'getpagesize'? */
+#if defined(HAVE_GETPAGESIZE)
+  pagesize = getpagesize ();
+#elif defined(HAVE_SYSCONF)
+  pagesize = sysconf (_SC_PAGESIZE);
+#else
+  JCL_ThrowException (env, IO_EXCEPTION,
+		      "can't determine memory page size");
+  return NULL;
+#endif /* HAVE_GETPAGESIZE/HAVE_SYSCONF */
+
+  if ((*env)->ExceptionOccurred (env))
+    {
+      return NULL;
+    }
+
+  prot = PROT_READ;
+  if (mode == '+' || mode == 'c')
+    {
+      /* When writing we need to make sure the file is big enough,
+         otherwise the result of mmap is undefined. */
+      struct stat st;
+      if (fstat (fd, &st) == -1)
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return NULL;
+        }
+      if (position + size > st.st_size)
+        {
+          if (ftruncate(fd, position + size) == -1)
+            {
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return NULL;
+            }
+        }
+      prot |= PROT_WRITE;
+    }
+
+  flags = (mode == 'c' ? MAP_PRIVATE : MAP_SHARED);
+  p = mmap (NULL, (size_t) ALIGN_UP (size, pagesize), prot, flags,
+	    fd, ALIGN_DOWN (position, pagesize));
+  if (p == MAP_FAILED)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return NULL;
+    }
+
+  /* Unalign the mapped value back up, since we aligned offset
+     down to a multiple of the page size. */
+  address = (void *) ((char *) p + (position % pagesize));
+
+  Pointer_instance = JCL_NewRawDataObject(env, address);
+
+  MappedByteBufferImpl_class = (*env)->FindClass (env,
+						  "java/nio/MappedByteBufferImpl");
+  if (MappedByteBufferImpl_class != NULL)
+    {
+      MappedByteBufferImpl_init =
+	(*env)->GetMethodID (env, MappedByteBufferImpl_class,
+			     "<init>", "(Lgnu/classpath/Pointer;IZ)V");
+    }
+
+  if ((*env)->ExceptionOccurred (env))
+    {
+      munmap (p, ALIGN_UP (size, pagesize));
+      return NULL;
+    }
+  if (MappedByteBufferImpl_init == NULL)
+    {
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "could not get MappedByteBufferImpl constructor");
+      munmap (p, ALIGN_UP (size, pagesize));
+      return NULL;
+    }
+
+  buffer = (*env)->NewObject (env, MappedByteBufferImpl_class,
+                              MappedByteBufferImpl_init, Pointer_instance,
+                              (jint) size, mode == 'r');
+  return buffer;
+#else
+  (void) fd;
+  (void) mode;
+  (void) position;
+  (void) size;
+  JCL_ThrowException (env, IO_EXCEPTION,
+		      "memory-mapped files not implemented");
+  return 0;
+#endif /* HAVE_MMAP */
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    flush
+ * Signature: (IZ)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_flush (JNIEnv *env,
+                                   jclass c __attribute__((unused)),
+                                   jint fd, jboolean metadata __attribute__((unused)))
+{
+#ifdef HAVE_FSYNC
+  /* XXX blocking? */
+  if (fsync (fd) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return JNI_FALSE;
+    }
+  return JNI_TRUE;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "flush not implemented");
+  return JNI_TRUE;
+#endif /* HAVE_FSYNC */
+}
 
 
 #ifdef __cplusplus
diff --git a/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMPipe.c b/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMPipe.c
index 369c5a3d650..cbaaa08348b 100644
--- a/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMPipe.c
+++ b/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMPipe.c
@@ -35,8 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <jni.h>
 #include <jcl.h>
@@ -45,12 +51,33 @@ exception statement from your version. */
 
 #define IO_EXCEPTION "java/io/IOException"
 
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_VMPipe_init (JNIEnv * env,
-			       jclass cls __attribute__ ((__unused__)),
-			       jobject self __attribute__ ((__unused__)),
-			       jobject provider __attribute__ ((__unused__)))
+/*
+ * Class:     gnu_java_nio_VMPipe
+ * Method:    pipe0
+ * Signature: ()[I
+ */
+JNIEXPORT jintArray JNICALL
+Java_gnu_java_nio_VMPipe_pipe0 (JNIEnv *env,
+                                jclass c __attribute__((unused)))
 {
-  JCL_ThrowException (env, IO_EXCEPTION,
-		      "gnu.java.nio.VMPipe.init(): not implemented");
+  int fd[2];
+  jintArray array;
+  jint* elem;
+  int ret;
+
+  /* FIXME: autoconf this? */
+  ret = pipe (fd);
+
+  if (ret == -1)
+    {
+      JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+      return NULL;
+    }
+
+  array = (*env)->NewIntArray (env, 2);
+  elem = (*env)->GetIntArrayElements (env, array, NULL);
+  elem[0] = fd[0];
+  elem[1] = fd[1];
+  (*env)->ReleaseIntArrayElements (env, array, elem, 0);
+  return array;
 }
diff --git a/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMSelector.c b/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMSelector.c
index f8a40aa7a15..74a408c7572 100644
--- a/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMSelector.c
+++ b/libjava/classpath/native/jni/java-nio/gnu_java_nio_VMSelector.c
@@ -219,7 +219,7 @@ Java_gnu_java_nio_VMSelector_select (JNIEnv * env,
   fd_set except_fds;
   struct timeval real_time_data;
   struct timeval *time_data = NULL;
-  char message_buf[BUF_SIZE + 1];
+  char *message;
 
   /* If a legal timeout value isn't given, use NULL.
    * This means an infinite timeout. The specification
@@ -270,7 +270,8 @@ Java_gnu_java_nio_VMSelector_select (JNIEnv * env,
 
   if (result < 0)
     {
-
+#if defined(HAVE_STRERROR_R)
+      char message_buf[BUF_SIZE+1];
       int errorcode = -result;
 
       if (strerror_r (errorcode, message_buf, BUF_SIZE))
@@ -283,7 +284,12 @@ Java_gnu_java_nio_VMSelector_select (JNIEnv * env,
 	  return 0;
 	}
 
-      JCL_ThrowException (env, "java/io/IOException", message_buf);
+      message = message_buf;
+#else
+      message = strerror(errno);
+#endif
+
+      JCL_ThrowException (env, "java/io/IOException", message);
       return 0;
     }
 
diff --git a/libjava/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c b/libjava/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
deleted file mode 100644
index 5aed63f355d..00000000000
--- a/libjava/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
+++ /dev/null
@@ -1,902 +0,0 @@
-/* gnu_java_nio_channels_FileChannelImpl.c -
-   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath 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 2, or (at your option)
-any later version.
-
-GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-/* do not move; needed here because of some macro definitions */
-#include <config.h>
-
-#include <stdlib.h>
-#include <errno.h>
-
-#include <jni.h>
-#include <jcl.h>
-
-#include "target_native.h"
-#ifndef WITHOUT_FILESYSTEM
-#include "target_native_file.h"
-#endif
-#include "target_native_math_int.h"
-
-#include "gnu_java_nio_channels_FileChannelImpl.h"
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif /* HAVE_SYS_MMAN_H */
-
-/* These values must be kept in sync with FileChannelImpl.java.  */
-#define FILECHANNELIMPL_READ   1
-#define FILECHANNELIMPL_WRITE  2
-#define FILECHANNELIMPL_APPEND 4
-
-/* These values must be kept in sync with FileChannelImpl.java.  */
-/* #define FILECHANNELIMPL_FILESEEK_SET          0 */
-/* #define FILECHANNELIMPL_FILESEEK_CUR          1 */
-/* #define FILECHANNELIMPL_FILESEEK_END          2 */
-
-#define FILECHANNELIMPL_FILEOPEN_FLAG_READ    1
-#define FILECHANNELIMPL_FILEOPEN_FLAG_WRITE   2
-#define FILECHANNELIMPL_FILEOPEN_FLAG_APPEND  4
-#define FILECHANNELIMPL_FILEOPEN_FLAG_EXCL    8
-#define FILECHANNELIMPL_FILEOPEN_FLAG_SYNC   16
-#define FILECHANNELIMPL_FILEOPEN_FLAG_DSYNC  32
-
-#define IO_EXCEPTION "java/io/IOException"
-
-/* FIXME: This can't be right.  Need converter macros. */
-#define CONVERT_JLONG_TO_INT(x) TARGET_NATIVE_MATH_INT_INT64_TO_INT32(x)
-#define CONVERT_INT_TO_JLONG(x) TARGET_NATIVE_MATH_INT_INT32_TO_INT64(x)
-
-/* FIXME: This can't be right.  Need converter macros. */
-#define CONVERT_JLONG_TO_OFF_T(x) TARGET_NATIVE_MATH_INT_INT64_TO_INT32(x)
-#define CONVERT_OFF_T_TO_JLONG(x) TARGET_NATIVE_MATH_INT_INT32_TO_INT64(x)
-
-/* FIXME: This can't be right.  Need converter macros */
-#define CONVERT_JINT_TO_INT(x) ((int)(x & 0xFFFFFFFF))
-#define CONVERT_INT_TO_JINT(x) ((int)(x & 0xFFFFFFFF))
-
-/* FIXME: This can't be right.  Need converter macros. */
-#define CONVERT_SSIZE_T_TO_JINT(x) ((jint)(x & 0xFFFFFFFF))
-#define CONVERT_JINT_TO_SSIZE_T(x) (x)
-
-/* Align a value up or down to a multiple of the pagesize. */
-#define ALIGN_DOWN(p,s) ((p) - ((p) % (s)))
-#define ALIGN_UP(p,s) ((p) + ((s) - ((p) % (s))))
-
-/* cached fieldID of gnu.java.nio.channels.FileChannelImpl.fd */
-static jfieldID native_fd_fieldID;
-
-static jint
-get_native_fd (JNIEnv * env, jobject obj)
-{
-  return (*env)->GetIntField (env, obj, native_fd_fieldID);
-}
-
-/*
- * Library initialization routine.  Called as part of java.io.FileDescriptor
- * static initialization.
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_init (JNIEnv * env,
-						jclass clazz
-						__attribute__ ((__unused__)))
-{
-  jclass clazz_fc;
-  jfieldID field;
-
-  /* Initialize native_fd_fieldID so we only compute it once! */
-  clazz_fc = (*env)->FindClass (env, "gnu/java/nio/channels/FileChannelImpl");
-  if (!clazz_fc)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION, "Internal error");
-      return;
-    }
-
-  field = (*env)->GetFieldID (env, clazz_fc, "fd", "I");
-  if (!field)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION, "Internal error");
-      return;
-    }
-
-  native_fd_fieldID = field;
-}
-
-/*
- * Open the specified file and return a native file descriptor
- */
-JNIEXPORT jint JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_open (JNIEnv * env,
-						 jobject obj
-						 __attribute__ ((__unused__)),
-						 jstring name, jint mode)
-{
-  const char *filename;
-  int flags;
-  int permissions;
-  int native_fd;
-  int result;
-
-  filename = JCL_jstring_to_cstring (env, name);
-  if (filename == NULL)
-    return (-1);		/* Exception will already have been thrown */
-
-  /* get file/permission flags for open() */
-  if ((mode & FILECHANNELIMPL_FILEOPEN_FLAG_READ)
-      && (mode & FILECHANNELIMPL_FILEOPEN_FLAG_WRITE))
-    {
-      /* read/write */
-      flags =
-	TARGET_NATIVE_FILE_FILEFLAG_CREATE |
-	TARGET_NATIVE_FILE_FILEFLAG_READWRITE;
-      permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL;
-    }
-  else if ((mode & FILECHANNELIMPL_FILEOPEN_FLAG_READ))
-    {
-      /* read */
-      flags = TARGET_NATIVE_FILE_FILEFLAG_READ;
-      permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL;
-    }
-  else
-    {
-      /* write */
-      flags =
-	TARGET_NATIVE_FILE_FILEFLAG_CREATE |
-	TARGET_NATIVE_FILE_FILEFLAG_WRITE;
-      if ((mode & FILECHANNELIMPL_FILEOPEN_FLAG_APPEND))
-	{
-	  flags |= TARGET_NATIVE_FILE_FILEFLAG_APPEND;
-	}
-      else
-	{
-	  flags |= TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE;
-	}
-      permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL;
-    }
-
-  if ((mode & FILECHANNELIMPL_FILEOPEN_FLAG_SYNC))
-    {
-      flags |= TARGET_NATIVE_FILE_FILEFLAG_SYNC;
-    }
-
-  if ((mode & FILECHANNELIMPL_FILEOPEN_FLAG_DSYNC))
-    {
-      flags |= TARGET_NATIVE_FILE_FILEFLAG_DSYNC;
-    }
-#ifdef O_BINARY
-  flags |= TARGET_NATIVE_FILE_FILEFLAG_BINARY;
-#endif
-
-  TARGET_NATIVE_FILE_OPEN (filename, native_fd, flags, permissions, result);
-
-  if (result != TARGET_NATIVE_OK)
-    {
-      char message[256]; /* Fixed size we don't need to malloc. */
-      char *error_string = TARGET_NATIVE_LAST_ERROR_STRING ();
-
-      snprintf(message, 256, "%s: %s", error_string, filename);
-      /* We are only allowed to throw FileNotFoundException.  */
-      JCL_ThrowException (env,
-			  "java/io/FileNotFoundException",
-			  message);
-      JCL_free_cstring (env, name, filename);
-      return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-    }
-
-  JCL_free_cstring (env, name, filename);
-  return native_fd;
-}
-
-/*
- * Closes the specified file descriptor and return status code.
- * Exception on error
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_implCloseChannel (JNIEnv * env,
-							     jobject obj)
-{
-  int native_fd;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  do
-    {
-      TARGET_NATIVE_FILE_CLOSE (native_fd, result);
-      if (result != TARGET_NATIVE_OK
-	  && (TARGET_NATIVE_LAST_ERROR ()
-	      != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return;
-	}
-    }
-  while (result != TARGET_NATIVE_OK);
-}
-
-/*
- * Return number of bytes that can be read from the file w/o blocking.
- * Exception on error
- */
-JNIEXPORT jint JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_available (JNIEnv * env,
-						      jobject obj)
-{
-  int native_fd;
-  jlong bytes_available;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  do
-    {
-      TARGET_NATIVE_FILE_AVAILABLE (native_fd, bytes_available, result);
-      if (result != TARGET_NATIVE_OK
-	  && (TARGET_NATIVE_LAST_ERROR ()
-	      != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return 0;
-	}
-    }
-  while (result != TARGET_NATIVE_OK);
-
-  /* FIXME NYI ??? why only jint and not jlong? */
-  return TARGET_NATIVE_MATH_INT_INT64_TO_INT32 (bytes_available);
-}
-
-JNIEXPORT jlong JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_size (JNIEnv * env, jobject obj)
-{
-  int native_fd;
-  jlong file_size;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  TARGET_NATIVE_FILE_SIZE (native_fd, file_size, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
-      return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-    }
-
-  return file_size;
-}
-
-/*
- * Return the current position of the file pointer
- * Exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_implPosition (JNIEnv * env,
-							 jobject obj)
-{
-  int native_fd;
-  jlong current_offset;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  TARGET_NATIVE_FILE_TELL (native_fd, current_offset, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
-      return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-    }
-
-  return current_offset;
-}
-
-/*
- * Wrapper around lseek call.  Return new file position
- * Exception on error
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_seek (JNIEnv * env, jobject obj,
-						 jlong offset)
-{
-  int native_fd;
-  jlong new_offset;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-#if 0
-  /* Should there be such an exception? All native layer macros should
-     be accepting 64bit-values if needed. It some target is not able
-     to handle such values it should simply operate with 32bit-values
-     and convert 64bit-values appriopated. In this case I assume
-     problems should not occurre: if some specific target is not able
-     to handle 64bit-values the system is limited to 32bit at all, thus
-     the application can not do a seek() or something else beyond the
-     32bit limit. It this true?
-   */
-
-  /* FIXME: What do we do if offset > the max value of off_t on this 32bit
-   * system?  How do we detect that and what do we do? */
-  if (CONVERT_OFF_T_TO_JLONG (native_offset) != offset)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  "Cannot represent position correctly on this system");
-    }
-#endif /* 0 */
-
-  result = TARGET_NATIVE_ERROR;
-  new_offset = TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-  TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd, offset, new_offset, result);
-
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
-    }
-}
-
-/*
- * Set the length of the file
- * Exception on error
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_implTruncate (JNIEnv * env,
-							 jobject obj,
-							 jlong len)
-{
-  int native_fd;
-  jlong file_size;
-  int bytes_written;
-  jlong save_offset, new_offset;
-  char data;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-#if 0
-  /* Should there be such an exception? All native layer macros should
-     be accepting 64bit-values if needed. It some target is not able
-     to handle such values it should simply operate with 32bit-values
-     and convert 64bit-values appriopated. In this case I assume
-     problems should not occurre: if some specific target is not able
-     to handle 64bit-values the system is limited to 32bit at all, thus
-     the application can not do a seek() or something else beyond the
-     32bit limit. It this true?
-   */
-
-  /* FIXME: What do we do if len > the max value of off_t on this 32bit
-   * system?  How do we detect that and what do we do? */
-  if (CONVERT_OFF_T_TO_JLONG (native_len) != len)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  "Cannot represent position correctly on this system");
-      return;
-    }
-#endif /* 0 */
-
-  /* get file size */
-  TARGET_NATIVE_FILE_SIZE (native_fd, file_size, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
-      return;
-    }
-
-  /* Save off current position */
-  TARGET_NATIVE_FILE_TELL (native_fd, save_offset, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  TARGET_NATIVE_LAST_ERROR_STRING ());
-      return;
-    }
-
-  if (TARGET_NATIVE_MATH_INT_INT64_LT (file_size, len))
-    {
-      /* File is too short -- seek to one byte short of where we want,
-       * then write a byte */
-
-      /* move to position n-1 */
-      TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd,
-				     TARGET_NATIVE_MATH_INT_INT64_SUB (len,
-								       1),
-				     new_offset, result);
-      if (result != TARGET_NATIVE_OK)
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return;
-	}
-
-      /* write a byte
-         Note: This will fail if we somehow get here in read only mode
-         * That shouldn't happen */
-      data = '\0';
-      TARGET_NATIVE_FILE_WRITE (native_fd, &data, 1, bytes_written, result);
-      if (result != TARGET_NATIVE_OK)
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return;
-	}
-
-      /* Reposition file pointer to where we started if not beyond new len. */
-      if (TARGET_NATIVE_MATH_INT_INT64_LT (save_offset, len))
-	{
-	  TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd, save_offset,
-					 new_offset, result);
-	  if (result != TARGET_NATIVE_OK)
-	    {
-	      JCL_ThrowException (env, IO_EXCEPTION,
-				  TARGET_NATIVE_LAST_ERROR_STRING ());
-	      return;
-	    }
-	}
-    }
-  else if (TARGET_NATIVE_MATH_INT_INT64_GT (file_size, len))
-    {
-      /* File is too long - use ftruncate if available */
-#ifdef HAVE_FTRUNCATE
-      TARGET_NATIVE_FILE_TRUNCATE (native_fd, len, result);
-      if (result != TARGET_NATIVE_OK)
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return;
-	}
-#else /* HAVE_FTRUNCATE */
-      /* FIXME: Probably operation isn't supported, but this exception
-       * is too harsh as it will probably crash the program without need
-       JCL_ThrowException(env, "java/lang/UnsupportedOperationException",
-       "not implemented - can't shorten files on this platform");
-       */
-      JCL_ThrowException (env, IO_EXCEPTION, "Unable to shorten file length");
-#endif /* HAVE_FTRUNCATE */
-
-      /* Reposition file pointer when it now is beyond the end of file. */
-      if (TARGET_NATIVE_MATH_INT_INT64_GT (save_offset, len))
-	{
-	  TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd, len, new_offset, result);
-	  if (result != TARGET_NATIVE_OK)
-	    {
-	      JCL_ThrowException (env, IO_EXCEPTION,
-				  TARGET_NATIVE_LAST_ERROR_STRING ());
-	      return;
-	    }
-	}
-    }
-}
-
-JNIEXPORT jobject JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_mapImpl (JNIEnv *env, jobject obj,
-						    jchar mode, jlong position, jint size)
-{
-#ifdef HAVE_MMAP
-  jclass MappedByteBufferImpl_class;
-  jmethodID MappedByteBufferImpl_init = NULL;
-  jobject Pointer_instance;
-  volatile jobject buffer;
-  long pagesize;
-  int prot, flags;
-  int fd;
-  void *p;
-  void *address;
-
-  /* FIXME: should we just assume we're on an OS modern enough to
-     have 'sysconf'? And not check for 'getpagesize'? */
-#if defined(HAVE_GETPAGESIZE)
-  pagesize = getpagesize ();
-#elif defined(HAVE_SYSCONF)
-  pagesize = sysconf (_SC_PAGESIZE);
-#else
-  JCL_ThrowException (env, IO_EXCEPTION,
-		      "can't determine memory page size");
-  return NULL;
-#endif /* HAVE_GETPAGESIZE/HAVE_SYSCONF */
-
-  if ((*env)->ExceptionOccurred (env))
-    {
-      return NULL;
-    }
-
-  fd = get_native_fd (env, obj);
-
-  prot = PROT_READ;
-  if (mode == '+' || mode == 'c')
-    {
-      /* When writing we need to make sure the file is big enough,
-         otherwise the result of mmap is undefined. */
-      jlong filesize;
-      filesize = Java_gnu_java_nio_channels_FileChannelImpl_size(env, obj);
-      if (filesize == -1)
-	return NULL;
-      if (position + size > filesize)
-	if (ftruncate(fd, position + size) == -1)
-	  {
-	    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
-	    return NULL;
-	  }
-      prot |= PROT_WRITE;
-    }
-
-  flags = (mode == 'c' ? MAP_PRIVATE : MAP_SHARED);
-  p = mmap (NULL, (size_t) ALIGN_UP (size, pagesize), prot, flags,
-	    fd, ALIGN_DOWN (position, pagesize));
-  if (p == MAP_FAILED)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
-      return NULL;
-    }
-
-  /* Unalign the mapped value back up, since we aligned offset
-     down to a multiple of the page size. */
-  address = (void *) ((char *) p + (position % pagesize));
-
-  Pointer_instance = JCL_NewRawDataObject(env, address);
-
-  MappedByteBufferImpl_class = (*env)->FindClass (env,
-						  "java/nio/MappedByteBufferImpl");
-  if (MappedByteBufferImpl_class != NULL)
-    {
-      MappedByteBufferImpl_init =
-	(*env)->GetMethodID (env, MappedByteBufferImpl_class,
-			     "<init>", "(Lgnu/classpath/Pointer;IZ)V");
-    }
-
-  if ((*env)->ExceptionOccurred (env))
-    {
-      munmap (p, ALIGN_UP (size, pagesize));
-      return NULL;
-    }
-  if (MappedByteBufferImpl_init == NULL)
-    {
-      JCL_ThrowException (env, "java/lang/InternalError",
-                          "could not get MappedByteBufferImpl constructor");
-      munmap (p, ALIGN_UP (size, pagesize));
-      return NULL;
-    }
-
-  buffer = (*env)->NewObject (env, MappedByteBufferImpl_class,
-                              MappedByteBufferImpl_init, Pointer_instance,
-                              (jint) size, mode == 'r');
-  return buffer;
-#else
-  (void) obj;
-  (void) mode;
-  (void) position;
-  (void) size;
-  JCL_ThrowException (env, IO_EXCEPTION,
-		      "memory-mapped files not implemented");
-  return 0;
-#endif /* HAVE_MMAP */
-}
-
-/*
- * Read a single byte from the file descriptor
- * Return byte read or -1 on eof, exception on error
- */
-JNIEXPORT jint JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_read__ (JNIEnv * env, jobject obj)
-{
-  int native_fd;
-  char data;
-  ssize_t bytes_read;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  bytes_read = 0;
-  do
-    {
-      TARGET_NATIVE_FILE_READ (native_fd, &data, 1, bytes_read, result);
-      if ((result == TARGET_NATIVE_OK) && (bytes_read == 0))
-	{
-	  return (-1);
-	}
-      if ((result != TARGET_NATIVE_OK)
-	  && (TARGET_NATIVE_LAST_ERROR () !=
-	      TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return (-1);
-	}
-    }
-  while (result != TARGET_NATIVE_OK);
-
-  return ((jint) (data & 0xFF));
-}
-
-/*
- * Reads to a byte buffer from the specified file descriptor
- * Return number of bytes read or -1 on eof, exception on error
- */
-JNIEXPORT jint JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_read___3BII (JNIEnv * env,
-							jobject obj,
-							jbyteArray buffer,
-							jint offset,
-							jint length)
-{
-  int native_fd;
-  jbyte *bufptr;
-  ssize_t bytes_read;
-  ssize_t n;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  /* Must return 0 if an attempt is made to read 0 bytes. */
-  if (length == 0)
-    return 0;
-
-  if (offset < 0)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION, "negative offset");
-      return -1;
-    }
-
-  bufptr = (*env)->GetByteArrayElements (env, buffer, 0);
-  if (!bufptr)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION, "Unexpected JNI error");
-      return (-1);
-    }
-
-  if (length + offset > (*env)->GetArrayLength (env, buffer))
-    {
-      JCL_ThrowException (env, IO_EXCEPTION,
-			  "length + offset > buffer.length");
-      return -1;
-    }
-
-  bytes_read = 0;
-  do
-    {
-      TARGET_NATIVE_FILE_READ (native_fd, (bufptr + offset + bytes_read),
-			       (length - bytes_read), n, result);
-      if ((result == TARGET_NATIVE_OK) && (n == 0))
-	{
-	  (*env)->ReleaseByteArrayElements (env, buffer, bufptr, 0);
-	  if (bytes_read == 0)
-	    return -1;		/* Signal end of file to Java */
-	  else
-	    return CONVERT_SSIZE_T_TO_JINT (bytes_read);
-	}
-      if ((result != TARGET_NATIVE_OK)
-	  && (TARGET_NATIVE_LAST_ERROR () !=
-	      TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  (*env)->ReleaseByteArrayElements (env, buffer, bufptr, 0);
-	  return -1;
-	}
-      if (result == TARGET_NATIVE_OK)
-	bytes_read += n;
-    }
-  while (bytes_read < 1);
-
-  (*env)->ReleaseByteArrayElements (env, buffer, bufptr, 0);
-  return CONVERT_SSIZE_T_TO_JINT (bytes_read);
-}
-
-/*
- * Writes a single byte to the specified file descriptor
- * Return status code, exception on error
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_write__I (JNIEnv * env,
-						     jobject obj, jint b)
-{
-  int native_fd;
-  char native_data;
-  ssize_t bytes_written;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-  native_data = (char) (CONVERT_JINT_TO_INT (b) & 0xFF);
-
-  do
-    {
-      TARGET_NATIVE_FILE_WRITE (native_fd, &native_data, 1, bytes_written,
-				result);
-      if ((result != TARGET_NATIVE_OK)
-	  && (TARGET_NATIVE_LAST_ERROR () !=
-	      TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  return;
-	}
-    }
-  while (result != TARGET_NATIVE_OK);
-}
-
-/*
- * Copies all parts of a file to disk.
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_force (JNIEnv * env,
-						  jobject obj)
-{
-  int native_fd;
-  int result;
-  native_fd = get_native_fd (env, obj);
-  TARGET_NATIVE_FILE_FSYNC (native_fd, result);
-  if (result != TARGET_NATIVE_OK)
-    JCL_ThrowException (env, IO_EXCEPTION,
-			TARGET_NATIVE_LAST_ERROR_STRING ());
-}
-
-/*
- * Writes a byte buffer to the specified file descriptor
- * Return status code, exception on error
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_write___3BII (JNIEnv * env,
-							 jobject obj,
-							 jbyteArray buffer,
-							 jint offset,
-							 jint length)
-{
-  int native_fd;
-  jbyte *bufptr;
-  ssize_t bytes_written;
-  ssize_t n;
-  int result;
-
-  native_fd = get_native_fd (env, obj);
-
-  /* Just return if an attempt is made to write 0 bytes. */
-  if (length == 0)
-    return;
-
-  bufptr = (*env)->GetByteArrayElements (env, buffer, 0);
-  if (!bufptr)
-    {
-      JCL_ThrowException (env, IO_EXCEPTION, "Unexpected JNI error");
-      return;
-    }
-
-  bytes_written = 0;
-  while (bytes_written < CONVERT_JINT_TO_SSIZE_T (length))
-    {
-      TARGET_NATIVE_FILE_WRITE (native_fd, (bufptr + offset + bytes_written),
-				(length - bytes_written), n, result);
-      if ((result != TARGET_NATIVE_OK)
-	  && (TARGET_NATIVE_LAST_ERROR () !=
-	      TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-	{
-	  JCL_ThrowException (env, IO_EXCEPTION,
-			      TARGET_NATIVE_LAST_ERROR_STRING ());
-	  (*env)->ReleaseByteArrayElements (env, buffer, bufptr, 0);
-	  return;
-	}
-      if (result == TARGET_NATIVE_OK)
-	bytes_written += n;
-    }
-
-  (*env)->ReleaseByteArrayElements (env, buffer, bufptr, 0);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject obj,
-                                                 jlong position, jlong size,
-                                                 jboolean shared, jboolean wait)
-{
-#ifdef HAVE_FCNTL
-  int fd = get_native_fd (env, obj);
-  int cmd = wait ? F_SETLKW : F_SETLK;
-  struct flock flock;
-  int ret;
-
-  flock.l_type = shared ? F_RDLCK : F_WRLCK;
-  flock.l_whence = SEEK_SET;
-  flock.l_start = (off_t) position;
-  /* Long.MAX_VALUE means lock everything possible starting at pos. */
-  if (size == 9223372036854775807LL)
-    flock.l_len = 0;
-  else
-    flock.l_len = (off_t) size;
-
-  ret = fcntl (fd, cmd, &flock);
-  /* fprintf(stderr, "fd %d, wait %d, shared %d, ret %d, position %lld, size %lld, l_start %ld, l_len %ld\n", fd, wait, shared,ret, position, size, (long) flock.l_start, (long) flock.l_len); */
-  if (ret)
-    {
-      /* Linux man pages for fcntl state that errno might be either
-         EACCES or EAGAIN if we try F_SETLK, and another process has
-         an overlapping lock. We should not get an unexpected errno. */
-      if (errno != EACCES && errno != EAGAIN)
-        {
-          JCL_ThrowException (env, "java/lang/InternalError",
-			      strerror (errno));
-        }
-      return JNI_FALSE;
-    }
-  return JNI_TRUE;
-#else
-  (void) obj;
-  (void) position;
-  (void) size;
-  (void) shared;
-  (void) wait;
-  JCL_ThrowException (env, "java/lang/UnsupportedOperationException",
-                      "file locks not implemented on this platform");
-  return JNI_FALSE;
-#endif /* HAVE_FCNTL */
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_unlock (JNIEnv *env,
-                                                   jobject obj,
-                                                   jlong position,
-                                                   jlong length)
-{
-#ifdef HAVE_FCNTL
-  int fd = get_native_fd (env, obj);
-  struct flock flock;
-  int ret;
-
-  flock.l_type = F_UNLCK;
-  flock.l_whence = SEEK_SET;
-  flock.l_start = (off_t) position;
-  /* Long.MAX_VALUE means unlock everything possible starting at pos. */
-  if (length == 9223372036854775807LL)
-    flock.l_len = 0;
-  else
-    flock.l_len = (off_t) length;
-
-  ret = fcntl (fd, F_SETLK, &flock);
-  if (ret)
-    {
-      JCL_ThrowException (env, "java/lang/InternalError",
-			  strerror (errno));
-    }
-#else
-  (void) obj;
-  (void) position;
-  (void) length;
-  JCL_ThrowException (env, "java/lang/UnsupportedOperationException",
-                      "file locks not implemented on this platform");
-#endif /* HAVE_FCNTL */
-}
diff --git a/libjava/classpath/native/jni/java-nio/java_nio_MappedByteBufferImpl.c b/libjava/classpath/native/jni/java-nio/java_nio_MappedByteBufferImpl.c
index b4909198267..2a87d29507e 100644
--- a/libjava/classpath/native/jni/java-nio/java_nio_MappedByteBufferImpl.c
+++ b/libjava/classpath/native/jni/java-nio/java_nio_MappedByteBufferImpl.c
@@ -1,5 +1,5 @@
 /* java_nio_MappedByteBufferImpl.c - Native methods for MappedByteBufferImpl
-   Copyright (C) 2004,2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +7,7 @@ GNU Classpath 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 2, or (at your option)
 any later version.
- 
+
 GNU Classpath 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
@@ -43,7 +43,6 @@ exception statement from your version. */
 
 #include "java_nio_MappedByteBufferImpl.h"
 
-#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
diff --git a/libjava/classpath/native/jni/java-nio/javanio.c b/libjava/classpath/native/jni/java-nio/javanio.c
new file mode 100644
index 00000000000..d9e4d4f1d95
--- /dev/null
+++ b/libjava/classpath/native/jni/java-nio/javanio.c
@@ -0,0 +1,122 @@
+/* javanio.c -- implementations of functions in javanio.h.
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+/*
+ * Note, because these functions are trivial, and should be inlined,
+ * we include this file in the header, and do not compile it.
+ */
+
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+CPNIO_EXPORT ssize_t
+cpnio_read (int fd, void *buf, size_t nbytes)
+{
+  return read (fd, buf, nbytes);
+}
+
+CPNIO_EXPORT ssize_t
+cpnio_readv (int fd, const struct iovec *iov, int iovcnt)
+{
+  return readv (fd, iov, iovcnt);
+}
+
+CPNIO_EXPORT ssize_t
+cpnio_write (int fd, const void *buf, size_t nbytes)
+{
+  return write (fd, buf, nbytes);
+}
+
+CPNIO_EXPORT ssize_t
+cpnio_writev (int fd, const struct iovec *iov, size_t iovcnt)
+{
+  return writev (fd, iov, iovcnt);
+}
+
+CPNIO_EXPORT int
+cpnio_socket (int domain, int type, int protocol)
+{
+  return socket (domain, type, protocol);
+}
+
+CPNIO_EXPORT int
+cpnio_connect (int fd, const struct sockaddr *addr, socklen_t addrlen)
+{
+  return connect (fd, addr, addrlen);
+}
+
+CPNIO_EXPORT int
+cpnio_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
+{
+  return accept (fd, addr, addrlen);
+}
+
+CPNIO_EXPORT ssize_t
+cpnio_sendto (int fd, const void *msg, size_t len, int flags,
+              const struct sockaddr *to, socklen_t tolen)
+{
+  return sendto (fd, msg, len, flags, to, tolen);
+}
+
+CPNIO_EXPORT ssize_t
+cpnio_recvfrom (int fd, void *buf, size_t len, int flags,
+                struct sockaddr *from, socklen_t *fromlen)
+{
+  return recvfrom (fd, buf, len, flags, from, fromlen);
+}
+
+CPNIO_EXPORT int
+cpnio_fcntl (int fd, int cmd, long arg)
+{
+#ifdef HAVE_FCNTL
+  return fcntl (fd, cmd, arg);
+#else
+  errno = ENOSUP;
+  return -1;
+#endif /* HAVE_FCNTL */
+}
+
+CPNIO_EXPORT int
+cpnio_select (int nfds, fd_set *readfds, fd_set *writefds,
+              fd_set *excepfds, struct timeval *timeo)
+{
+  return select (nfds, readfds, writefds, excepfds, timeo);
+}
diff --git a/libjava/classpath/native/jni/java-nio/javanio.h b/libjava/classpath/native/jni/java-nio/javanio.h
new file mode 100644
index 00000000000..bdd11055ea8
--- /dev/null
+++ b/libjava/classpath/native/jni/java-nio/javanio.h
@@ -0,0 +1,332 @@
+/* javanio.h -- reference implementation of native functions.
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+#ifndef __JAVANIO_H__
+#define __JAVANIO_H__
+
+/**
+ * This header defines functions that are called by our JNI reference
+ * implementation of java.nio.*. In our reference implementation, these
+ * functions map exactly to their counterparts in POSIX; in implementations
+ * that can't use these functions directly (such as systems that use user-land
+ * threads, and thus can't call blocking system calls directly) can provide
+ * their own implementations suitable for their system.
+ */
+
+/**
+ * This macro is used in all function prototypes below; if any additional
+ * keywords need to be added to a prototype, declare them in this macro.
+ */
+#define CPNIO_EXPORT static inline
+
+/**
+ * Read bytes from the given file descriptor into the given memory address, which
+ * has sufficient space for NBYTES bytes.
+ *
+ * \param fd     The file descriptor to read from.
+ * \param buf    The memory address to read bytes into.
+ * \param nbytes The number of bytes available to store in BUF.
+ * \return The number of bytes read, possibly zero, on success; return -1 on failure,
+ *  and set ERRNO to an appropriate value.
+ * \see read(2)
+ *
+ * Allowed errno values:
+ *   [EBADF]   If FD is not a valid file descriptor, or is not open for reading.
+ *   [EFAULT]  If BUF points outside the process's address space.
+ *   [EIO]     An I/O error occurrs.
+ *   [EINTR]   If the read is interrupted by a signal.
+ *   [EINVAL]  If FD is negative.
+ *   [EAGAIN]  If FD was marked for non-blocking I/O, and no data were ready to
+ *             be read.
+ */
+CPNIO_EXPORT ssize_t cpnio_read (int fd, void *buf, size_t nbytes);
+
+/*
+ * Read bytes from a file descriptor into a sequence of IO buffers.
+ *
+ * The iovec structure is defined as:
+ *
+ *   struct iovec {
+ *     char   *iov_base;
+ *     size_t  iov_len;
+ *   };
+ *
+ * The call to _cp_readv should do a scattering read, where for each struct iovec
+ * in the supplied list, up to IOV_LEN bytes are read into IOV_BASE. The function
+ * returns the total number of bytes read into all supplied buffers.
+ *
+ * \param fd     The file descriptor.
+ * \param iov    A pointer to the head of a list of iovec structures.
+ * \param iovcnt The number of iovec structures pointed to by IOV.
+ * \return The total number of bytes read accross all buffers, possibly zero. On
+ *  error, -1 is returned and ERRNO is set.
+ * \see readv(2)
+ *
+ * Allowed ERRNO values include all of those listed for _cp_read, as well as the
+ * following:
+ *   [EINVAL] If IOVCNT overflows the maximum number of iovec structures
+ *            this platform supports (usually 16), if any IOV_LEN value
+ *            is negative, or if the sum of all IOV_LEN values is too
+ *            large to be stored in a ssize_t (usually a 32-bit integer).
+ *   [EFAULT] If part of IOV points outside the process's address space.
+ */
+CPNIO_EXPORT ssize_t cpnio_readv (int fd, const struct iovec *iov, int iovcnt);
+
+/*
+ * Write NBYTES bytes from BUF to the file descriptor FD, returning the number
+ * of bytes successfully written.
+ *
+ * \param fd     The file descriptor.
+ * \param buf    A pointer to the bytes to write.
+ * \param nbytes The maximum number of bytes to write.
+ * \return The number of bytes written to the file descriptor, possibly zero. -1
+ *  is returned if an error is encountered, and ERRNO will be set.
+ * \see write(2)
+ *
+ * Allowed ERRNO values:
+ *   [EBADF]   If FD is not a valid file descriptor or is not open for writing.
+ *   [EPIPE]   If FD is a pipe, when the other side is disconnected; if FD is a
+ *             socket, when the peer is not connected.
+ *   [EFBIG]   When FD is a file, and writing to it overflows the process's
+ *             or the system's maximim file size.
+ *   [EFAULT]  If the buffer to write points outside the process's address
+ *             space.
+ *   [EINVAL]  If the descriptor FD is negative.
+ *   [ENOSPC]  If FD is a file, and there is insufficient space on the
+ *             filesystem.
+ *   [EDQUOT]  If FD is a file, and the user's disk quota has been exceeded.
+ *   [EIO]     If an I/O error occurs.
+ *   [EINTR]   If the call is interrupted by a signal.
+ *   [EAGAIN]  If FD is in non-blocking mode, and no bytes could be immediately
+ *             written.
+ */
+CPNIO_EXPORT ssize_t cpnio_write (int fd, const void *buf, size_t nbytes);
+
+/*
+ * Write data from a sequence of IOVCNT buffers IOV to a file descriptor FD.
+ *
+ * \param fd     The file descriptor.
+ * \param iov    The list of buffers to write.
+ * \param iovcnt The number of iovec structures pointed to by IOV.
+ * \return The total number of bytes written from the given buffers, possibly
+ *   zero. -1 if an error occurs, and ERRNO will be set.
+ * \see writev(2)
+ *
+ * Allowed ERRNO values include those mentioned in _cp_write, as well as:
+ *  [EDESTADDRREQ]  If the descriptor is a datagram socket, and the peer is
+ *                  no longer available.
+ *  [EINVAL]        If IOVCNT is out of range, if any IOV_LEN value is
+ *                  negative, or if the sum of all IOVCNT IOV_LEN values
+ *                  will overflow a ssize_t.
+ *  [ENOBUFS]       If the mbuf pool is exhausted (???).
+ */
+CPNIO_EXPORT ssize_t cpnio_writev (int fd, const struct iovec *iov, size_t iovcnt);
+
+/**
+ * Open a new, unbound and unconnected socket.
+ *
+ * \param domain The socket domain. Implementations need only handle AF_INET.
+ * \param type   The socket type; implementations need only handle types
+ *  SOCK_STREAM (for streaming sockets) and SOCK_DGRAM (for datagram sockets).
+ * \param protocol This should always be 0. It can be ignored.
+ * \return A new file descriptor pointing to a newly created socket, or -1 on
+ *  error, and ERRNO set.
+ *
+ * Allowed ERRNO values:
+ *  [EPROTONOSUPPORT]  If TYPE is unrecognized.
+ *  [EMFILE]           If a new file descriptor cannot be allocated, because
+ *                     the process's descriptor table is full.
+ *  [ENFILE]           Likewise, but when the system table is full.
+ *  [EACCES]           If this operation is not allowed.
+ *  [ENOBUFS]          If there is not enough buffer space available for the
+ *                     new socket.
+ */
+CPNIO_EXPORT int cpnio_socket (int domain, int type, int protocol);
+
+/**
+ * Connect a socket to a remote address.
+ *
+ * \param fd      The file descriptor of the socket to connect.
+ * \param addr    The address to connect to. In practice, this should be
+ *                either a `struct sockaddr_in' or a `struct sockaddr_in6'.
+ * \param addrlen The size of the address structure passed by ADDR.
+ * \return Zero if the connect succeeds. -1 on error, and ERRNO should be set.
+ *
+ * Allowed ERRNO values:
+ *  [EBADF]         If FD is not a valid file descriptor.
+ *  [ENOTSOCK]      If FD is not a socket descriptor.
+ *  [EADDRNOTAVAIL] If ADDR is not available for use to this process.
+ *  [EAFNOSUPPORT]  If the address family of ADDR is not supported.
+ *  [EISCONN]       If the socket is already connected.
+ *  [ETIMEDOUT]     If the connection could not be made in a reasonable
+ *                  amount of time.
+ *  [ECONNREFUSED]  If the connection attempt was rejected.
+ *  [ENETUNREACH]   If the network ADDR is on is unreachable.
+ *  [EADDRINUSE]    If the address is already in use.
+ *  [EFAULT]        If ADDR points outside the addressable space.
+ *  [EINPROGRESS]   If FD is in non-blocking mode, and the connection could
+ *                  not be completed immediately.
+ *  [EALREADY]      If FD is in non-blocking mode, and a connection attempt
+ *                  is still pending.
+ *  [EACCESS]       If ADDR is the broadcast address, and the socket option
+ *                  SO_BROADCAST is not set.
+ */
+CPNIO_EXPORT int cpnio_connect (int fd, const struct sockaddr *addr, socklen_t addrlen);
+
+/**
+ * Accept an incoming connection on a socket, returning a new socket for
+ * the connection, and storing the peer address in ADDR.
+ *
+ * \param fd      The socket file descriptor.
+ * \param addr    The structure to store the peer address in.
+ * \param addrlen The size of the data available in ADDR; upon return, the
+ *                number of bytes stored in ADDR will be placed here.
+ * \return The new socket file descriptor, or -1 on error, and ERRNO set.
+ *
+ * Allowed ERRNO values:
+ *  [EBADF]         If FD is not a valid file descriptor.
+ *  [ENOTSOCK]      If FD in not a socket descriptor.
+ *  [EOPNOTSUPP]    If the socket is not a SOCK_STREAM socket.
+ *  [EFAULT]        If ADDR points outside the process's addressable space.
+ *  [EWOULDBLOCK]   If the socket is in non-blocking mode, and no connection
+ *                  attempt is currently ready.
+ *  [EMFILE]        If the process's descriptor table is full.
+ *  [ENFILE]        If the system's descriptor table is full.
+ */
+CPNIO_EXPORT int cpnio_accept (int fd, struct sockaddr *addr, socklen_t *addrlen);
+
+/**
+ * Send a datagram to the given address.
+ *
+ * \param fd    The socket file descriptor.
+ * \param msg   A pointer to the message to send.
+ * \param len   The size of the message to send.
+ * \param flags Flags for sending.
+ * \param to    The remote address to send the message to.
+ * \param tolen The size of the TO address structure.
+ * \return The number of bytes written, possibly zero, on success. Returns
+ *  -1 on failure, and sets ERRNO.
+ * \see sendto(2)
+ *
+ * Allowed ERRNO values:
+ *  [EBADF]
+ *  [ENOTSOCK]
+ *  [EFAULT]
+ *  [EMSGSIZE]
+ *  [EAGAIN]
+ *  [ENOBUFS]
+ *  [EACCES]
+ *  [EHOSTUNREACH]
+ */
+CPNIO_EXPORT ssize_t cpnio_sendto (int fd, const void *msg, size_t len, int flags,
+                                   const struct sockaddr *to, socklen_t tolen);
+
+/**
+ * Receive a message on a socket, storing the remote host's address in
+ * FROM.
+ *
+ * \param fd      The socket file descriptor.
+ * \param buf     The buffer to store received bytes in.
+ * \param flags   Flags to control the receive.
+ * \param from    Where to store the remote address.
+ * \param fromlen Pointer to the size of FROM; on return, it will contain the
+ *  size of the structure placed in FROM.
+ * \return The number of bytes received on success. -1 on error, and ERRNO will
+ *  be set.
+ * \see recvfrom(2)
+ *
+ * Allewed ERRNO values:
+ *  [EBADF]    FD is not a valid file descriptor.
+ *  [ENOTCONN] If the socket is stream-oriented, and no prior call to
+ *             connect(2) was made.
+ *  [ENOTSOCK] FD is not a socket.
+ *  [EAGAIN]   FD is in non-blocking mode, and no message was
+ *             immediately available.
+ *  [EINTR]    The system call was interrupted by a signal.
+ *  [EFAULT]   BUF, FROM, or FROMLEN lie outside the process's address
+ *             space.
+ */
+CPNIO_EXPORT ssize_t cpnio_recvfrom (int fd, void *buf, size_t len, int flags,
+                                     struct sockaddr *from, socklen_t *fromlen);
+
+
+/**
+ * Control file descriptor properties.
+ *
+ * \param fd  The file descriptor to control.
+ * \param cmd The command to execute.
+ * \param arg The command argument.
+ * \return A value other than -1, specific to CMD. On error, -1 is
+ *  returned, and ERRNO is set.
+ *
+ * Allowed ERRNO values:
+ *  FIXME
+ */
+CPNIO_EXPORT int cpnio_fcntl (int fd, int cmd, long arg);
+
+
+/**
+ * Select from one of the given file descriptor sets a descriptor that
+ * is ready for the given operation (read, write, etc.).
+ *
+ * \param nfds      A value one larger than the largest file
+ *                  descriptor.
+ * \param readfds   A set of file descriptors to select for
+ *                  readability.
+ * \param writefds  A set of file descriptors to select for
+ *                  writability.
+ * \param exceptfds A set of file descriptors to select for
+ *                  exceptional conditions.
+ * \param tm        The selection timeout.
+ * \return The number of file descriptors selected, possibly zero, or
+ *                  -1 on error (and with ERRNO set).
+ */
+CPNIO_EXPORT int cpnio_select (int nfds, fd_set *readfds, fd_set *writefds,
+                               fd_set *exceptfds, struct timeval *tm);
+
+/*
+ * We include the implementation file here, because our reference
+ * implementation is trivial, and the functions are declared extern
+ * inline.
+ *
+ * Implementations that need different implementations of these functions
+ * SHOULD remove this line, and compile javanio.c as a separate unit.
+ */
+#include "javanio.c"
+
+#endif /* __JAVANIO_H__ */
diff --git a/libjava/classpath/native/jni/java-util/.cvsignore b/libjava/classpath/native/jni/java-util/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/java-util/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/java-util/Makefile.in b/libjava/classpath/native/jni/java-util/Makefile.in
index a592c5c018e..c929468bd97 100644
--- a/libjava/classpath/native/jni/java-util/Makefile.in
+++ b/libjava/classpath/native/jni/java-util/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -183,6 +185,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -304,7 +308,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjavautil.la
 libjavautil_la_SOURCES = java_util_VMTimeZone.c
diff --git a/libjava/classpath/native/jni/midi-alsa/.cvsignore b/libjava/classpath/native/jni/midi-alsa/.cvsignore
new file mode 100644
index 00000000000..483b2774465
--- /dev/null
+++ b/libjava/classpath/native/jni/midi-alsa/.cvsignore
@@ -0,0 +1,9 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.depsMakefile
+Makefile.in
+Makefile
+.deps
diff --git a/libjava/classpath/native/jni/midi-alsa/Makefile.in b/libjava/classpath/native/jni/midi-alsa/Makefile.in
index 12346cee981..b93d060db20 100644
--- a/libjava/classpath/native/jni/midi-alsa/Makefile.in
+++ b/libjava/classpath/native/jni/midi-alsa/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -186,6 +188,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -307,7 +311,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libgjsmalsa.la 
 libgjsmalsa_la_SOURCES = gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.c \
diff --git a/libjava/classpath/native/jni/midi-dssi/.cvsignore b/libjava/classpath/native/jni/midi-dssi/.cvsignore
new file mode 100644
index 00000000000..ac18ca27297
--- /dev/null
+++ b/libjava/classpath/native/jni/midi-dssi/.cvsignore
@@ -0,0 +1,9 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.depsMakefile
+Makefile.in
+.deps
+Makefile
diff --git a/libjava/classpath/native/jni/midi-dssi/Makefile.am b/libjava/classpath/native/jni/midi-dssi/Makefile.am
index 48c8051ccc3..692579d46b3 100644
--- a/libjava/classpath/native/jni/midi-dssi/Makefile.am
+++ b/libjava/classpath/native/jni/midi-dssi/Makefile.am
@@ -9,4 +9,7 @@ libgjsmdssi_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+# No STRICT_WARNING_CFLAGS here as we use dlsym to load the address of 
+# a function,and ISO C prohibits casting void pointers, like those returned
+# by dlsym, to function pointers.
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@
diff --git a/libjava/classpath/native/jni/midi-dssi/Makefile.in b/libjava/classpath/native/jni/midi-dssi/Makefile.in
index 053451be6e5..e6c42fa7782 100644
--- a/libjava/classpath/native/jni/midi-dssi/Makefile.in
+++ b/libjava/classpath/native/jni/midi-dssi/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -186,6 +188,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -307,7 +311,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libgjsmdssi.la 
 libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
@@ -318,7 +321,10 @@ libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
 libgjsmdssi_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+# No STRICT_WARNING_CFLAGS here as we use dlsym to load the address of 
+# a function,and ISO C prohibits casting void pointers, like those returned
+# by dlsym, to function pointers.
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@
 all: all-am
 
 .SUFFIXES:
diff --git a/libjava/classpath/native/jni/midi-dssi/dssi_data.h b/libjava/classpath/native/jni/midi-dssi/dssi_data.h
index 27a4e283119..f8243f29bd4 100644
--- a/libjava/classpath/native/jni/midi-dssi/dssi_data.h
+++ b/libjava/classpath/native/jni/midi-dssi/dssi_data.h
@@ -46,8 +46,6 @@ exception statement from your version. */
 
 #include <stdio.h>
 
-#include "target_native.h"
-#include "target_native_misc.h"
 #include "../classpath/jcl.h"
 
 /* Specify the size of the circular buffer.  It only needs to be big
diff --git a/libjava/classpath/native/jni/native-lib/.cvsignore b/libjava/classpath/native/jni/native-lib/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/native-lib/Makefile.am b/libjava/classpath/native/jni/native-lib/Makefile.am
new file mode 100644
index 00000000000..beab77e5732
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/Makefile.am
@@ -0,0 +1,12 @@
+noinst_LTLIBRARIES = libclasspathnative.la
+libclasspathnative_la_SOURCES = cpnet.c \
+				cpnet.h \
+				cpio.c \
+				cpio.h \
+				cpnative.h \
+				cpproc.h \
+				cpproc.c
+
+AM_LDFLAGS = @CLASSPATH_MODULE@
+AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
diff --git a/libjava/classpath/native/jni/native-lib/Makefile.in b/libjava/classpath/native/jni/native-lib/Makefile.in
new file mode 100644
index 00000000000..5dda1263e12
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/Makefile.in
@@ -0,0 +1,570 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = native/jni/native-lib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
+	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
+	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
+	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libclasspathnative_la_LIBADD =
+am_libclasspathnative_la_OBJECTS = cpnet.lo cpio.lo cpproc.lo
+libclasspathnative_la_OBJECTS = $(am_libclasspathnative_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libclasspathnative_la_SOURCES)
+DIST_SOURCES = $(libclasspathnative_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CLASS_FILES_FALSE = @BUILD_CLASS_FILES_FALSE@
+BUILD_CLASS_FILES_TRUE = @BUILD_CLASS_FILES_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLASSPATH_CONVENIENCE = @CLASSPATH_CONVENIENCE@
+CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+CLASSPATH_MODULE = @CLASSPATH_MODULE@
+COLLECTIONS_PREFIX = @COLLECTIONS_PREFIX@
+CP = @CP@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@
+CREATE_ALSA_LIBRARIES_TRUE = @CREATE_ALSA_LIBRARIES_TRUE@
+CREATE_API_DOCS_FALSE = @CREATE_API_DOCS_FALSE@
+CREATE_API_DOCS_TRUE = @CREATE_API_DOCS_TRUE@
+CREATE_COLLECTIONS_FALSE = @CREATE_COLLECTIONS_FALSE@
+CREATE_COLLECTIONS_TRUE = @CREATE_COLLECTIONS_TRUE@
+CREATE_CORE_JNI_LIBRARIES_FALSE = @CREATE_CORE_JNI_LIBRARIES_FALSE@
+CREATE_CORE_JNI_LIBRARIES_TRUE = @CREATE_CORE_JNI_LIBRARIES_TRUE@
+CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
+CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
+CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
+CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
+CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
+CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
+CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
+CREATE_JNI_HEADERS_TRUE = @CREATE_JNI_HEADERS_TRUE@
+CREATE_JNI_LIBRARIES_FALSE = @CREATE_JNI_LIBRARIES_FALSE@
+CREATE_JNI_LIBRARIES_TRUE = @CREATE_JNI_LIBRARIES_TRUE@
+CREATE_PLUGIN_FALSE = @CREATE_PLUGIN_FALSE@
+CREATE_PLUGIN_TRUE = @CREATE_PLUGIN_TRUE@
+CREATE_QT_PEER_LIBRARIES_FALSE = @CREATE_QT_PEER_LIBRARIES_FALSE@
+CREATE_QT_PEER_LIBRARIES_TRUE = @CREATE_QT_PEER_LIBRARIES_TRUE@
+CREATE_WRAPPERS_FALSE = @CREATE_WRAPPERS_FALSE@
+CREATE_WRAPPERS_TRUE = @CREATE_WRAPPERS_TRUE@
+CREATE_XMLJ_LIBRARY_FALSE = @CREATE_XMLJ_LIBRARY_FALSE@
+CREATE_XMLJ_LIBRARY_TRUE = @CREATE_XMLJ_LIBRARY_TRUE@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
+DEFAULT_PREFS_PEER = @DEFAULT_PREFS_PEER@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECJ = @ECJ@
+EGREP = @EGREP@
+ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
+ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
+ERROR_CFLAGS = @ERROR_CFLAGS@
+EXAMPLESDIR = @EXAMPLESDIR@
+EXEEXT = @EXEEXT@
+FASTJAR = @FASTJAR@
+FIND = @FIND@
+FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
+FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
+FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
+FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
+FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
+FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@
+FOUND_GCJ_TRUE = @FOUND_GCJ_TRUE@
+FOUND_JIKES_FALSE = @FOUND_JIKES_FALSE@
+FOUND_JIKES_TRUE = @FOUND_JIKES_TRUE@
+FOUND_KJC_FALSE = @FOUND_KJC_FALSE@
+FOUND_KJC_TRUE = @FOUND_KJC_TRUE@
+FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GCJ = @GCJ@
+GCJX = @GCJX@
+GCONF_CFLAGS = @GCONF_CFLAGS@
+GCONF_LIBS = @GCONF_LIBS@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GJDOC = @GJDOC@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
+INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@
+INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_GLIBJ_ZIP_FALSE = @INSTALL_GLIBJ_ZIP_FALSE@
+INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
+JAY = @JAY@
+JAY_SKELETON = @JAY_SKELETON@
+JIKES = @JIKES@
+JIKESENCODING = @JIKESENCODING@
+JIKESWARNINGS = @JIKESWARNINGS@
+KJC = @KJC@
+LDFLAGS = @LDFLAGS@
+LIBDEBUG = @LIBDEBUG@
+LIBICONV = @LIBICONV@
+LIBMAGIC = @LIBMAGIC@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKDIR = @MKDIR@
+MOC = @MOC@
+MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
+MOZILLA_LIBS = @MOZILLA_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_TO_ESCHER = @PATH_TO_ESCHER@
+PATH_TO_GLIBJ_ZIP = @PATH_TO_GLIBJ_ZIP@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUGIN_DIR = @PLUGIN_DIR@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
+RANLIB = @RANLIB@
+REGEN_PARSERS_FALSE = @REGEN_PARSERS_FALSE@
+REGEN_PARSERS_TRUE = @REGEN_PARSERS_TRUE@
+REMOVE = @REMOVE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@
+STRIP = @STRIP@
+USER_CLASSLIB = @USER_CLASSLIB@
+USER_JAVAH = @USER_JAVAH@
+USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@
+USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@
+USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@
+USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@
+USE_ESCHER_FALSE = @USE_ESCHER_FALSE@
+USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
+USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
+USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@
+VERSION = @VERSION@
+VM_BINARY = @VM_BINARY@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+XML_CFLAGS = @XML_CFLAGS@
+XML_LIBS = @XML_LIBS@
+XSLT_CFLAGS = @XSLT_CFLAGS@
+XSLT_LIBS = @XSLT_LIBS@
+XTEST_LIBS = @XTEST_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZIP = @ZIP@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+default_toolkit = @default_toolkit@
+exec_prefix = @exec_prefix@
+glibjdir = @glibjdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+nativeexeclibdir = @nativeexeclibdir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+vm_classes = @vm_classes@
+noinst_LTLIBRARIES = libclasspathnative.la
+libclasspathnative_la_SOURCES = cpnet.c \
+				cpnet.h \
+				cpio.c \
+				cpio.h \
+				cpnative.h \
+				cpproc.h \
+				cpproc.c
+
+AM_LDFLAGS = @CLASSPATH_MODULE@
+AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  native/jni/native-lib/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  native/jni/native-lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libclasspathnative.la: $(libclasspathnative_la_OBJECTS) $(libclasspathnative_la_DEPENDENCIES) 
+	$(LINK)  $(libclasspathnative_la_LDFLAGS) $(libclasspathnative_la_OBJECTS) $(libclasspathnative_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpnet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpproc.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libjava/classpath/native/jni/native-lib/cpio.c b/libjava/classpath/native/jni/native-lib/cpio.c
new file mode 100644
index 00000000000..2777a31b221
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpio.c
@@ -0,0 +1,485 @@
+/* cpio.c - Common java file IO native functions
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <jni.h>
+
+#if defined(HAVE_SYS_IOCTL_H)
+#define BSD_COMP /* Get FIONREAD on Solaris2 */
+#include <sys/ioctl.h>
+#endif
+#if defined(HAVE_SYS_FILIO_H) /* Get FIONREAD on Solaris 2.5 */
+#include <sys/filio.h>
+#endif
+
+#if defined(HAVE_SYS_STAT_H)
+#include <sys/stat.h>
+#endif
+
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
+#if defined(HAVE_SYS_SELECT_H)
+#include <sys/select.h>
+#endif
+
+#include <utime.h>
+
+#include "cpnative.h"
+#include "cpio.h"
+
+/* Some POSIX systems don't have O_SYNC and O_DYSNC so we define them here.  */
+#if !defined (O_SYNC) && defined (O_FSYNC)
+#define O_SYNC O_FSYNC
+#endif
+#if !defined (O_DSYNC) && defined (O_FSYNC)
+#define O_DSYNC O_FSYNC
+#endif
+/* If O_DSYNC is still not defined, use O_SYNC (needed for newlib).  */
+#if !defined (O_DSYNC)
+#define O_DSYNC O_SYNC
+#endif
+
+JNIEXPORT int cpio_openFile (const char *filename, int *fd, int flags, int permissions)
+{
+  int sflags = 0;
+  int rwflags = flags & CPFILE_FLAG_READWRITE;
+  int perms;
+
+  if (flags & CPFILE_FLAG_CREATE)
+    sflags |= O_CREAT;
+  if (flags & CPFILE_FLAG_APPEND)
+    sflags |= O_APPEND;
+  if (flags & CPFILE_FLAG_TRUNCATE)
+    sflags |= O_TRUNC;
+  if (flags & CPFILE_FLAG_SYNC)
+    sflags |= O_SYNC;
+  if (flags & CPFILE_FLAG_DSYNC)
+    sflags |= O_DSYNC;
+#if defined(O_BINARY)
+  if (flags & CPFILE_FLAG_BINARY)
+    sflags |= O_BINARY;
+#endif
+
+  switch (rwflags)
+    {
+    case CPFILE_FLAG_READ:
+      sflags |= O_RDONLY;
+      break;
+    case CPFILE_FLAG_WRITE:
+      sflags |= O_WRONLY;
+      break;
+    case CPFILE_FLAG_READWRITE:
+      sflags |= O_RDWR;
+      break;
+    }
+
+  if (permissions == CPFILE_PERMISSION_NORMAL)
+	  perms = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+  else
+	  perms = 0;
+
+  *fd = open (filename, sflags, perms);
+  
+  if (*fd < 0)
+    return errno;
+
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_closeFile (int fd)
+{
+  if (close (fd) < 0)
+    return errno;
+  
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_availableBytes (int fd, jlong *bytes_available)
+{
+#if defined (FIONREAD)
+  ssize_t n;
+
+  if (ioctl (fd, FIONREAD, (char *)&n) != 0)
+    return errno;
+
+  *bytes_available = n;
+  return CPNATIVE_OK;  
+#elif defined(HAVE_FSTAT)
+  struct stat statBuffer;
+  off_t n;
+  int result;
+
+  *bytes_available = 0
+  if ((fstat (fd, &statBuffer) == 0) && S_ISREG (statBuffer.st_mode))
+    {
+      n = lseek (fd, 0, SEEK_CUR);
+      if (n != -1) 
+       { 
+         *bytes_available = statBuffer.st_size - n; 
+         result = 0;
+       } 
+      else 
+       { 
+         result = errno;
+       } 
+    } 
+  else 
+    { 
+      result = errno;
+    } 
+  
+  return result;
+#elif defined(HAVE_SELECT)
+  fd_set filedescriptset;
+  struct timeval tv;
+  int result;
+
+  *bytes_available = 0;
+  
+  FD_ZERO (&filedescriptset);
+  FD_SET (fd,&filedescriptset);
+  memset (&tv, 0, sizeof(tv));
+
+  switch (select (fd+1, &filedescriptset, NULL, NULL, &timeval)) \
+    {
+    case -1: 
+      result=errno; 
+      break;
+    case  0:
+      *bytes_available = 0;
+      result = CPNATIVE_OK;
+      break;      
+    default: 
+      *bytes_available = 1;
+      result = CPNATIVE_OK;
+      break;
+    }
+  return result;
+
+#else
+  *bytes_available = 0;
+  return ENOTSUP;
+#endif
+}
+
+JNIEXPORT int cpio_getFileSize (int fd, jlong *filesize)
+{
+  struct stat statBuffer;
+
+  if (fstat(fd, &statBuffer) < 0)
+    return errno;
+  
+  *filesize = statBuffer.st_size;
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_getFilePosition (int fd, jlong *offset)
+{
+  *offset = lseek (fd, 0, SEEK_CUR);
+  if (*offset < 0)
+    return errno;
+  
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_setFilePosition (int fd, jlong position)
+{
+  if (lseek (fd, position, SEEK_SET) < 0)
+    return errno;
+
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_read (int fd, void *buffer, jint length, jint *bytes_read)
+{
+  *bytes_read = read (fd, buffer, length);
+  
+  if (*bytes_read < 0)
+  {
+    return errno;
+  }
+
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_write (int fd, const void *buffer, jint length, jint *bytes_written)
+{
+  *bytes_written = write (fd, buffer, length);
+  
+  if (*bytes_written < 0)
+    return errno;
+
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_fsync (int fd)
+{
+  if (fsync (fd) < 0)
+    return errno;
+
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_truncate (int fd, jlong size)
+{
+  if (ftruncate (fd, size) < 0)
+    return errno;
+
+  return CPNATIVE_OK;
+}
+
+JNIEXPORT int cpio_setFileSize (int native_fd, jlong new_size)
+{
+  jlong file_size;
+  jlong save_offset;
+  int result;
+  char data;
+  jint bytes_written;
+  
+  result = cpio_getFileSize (native_fd, &file_size);
+  if (result != CPNATIVE_OK)
+    return result;
+
+  /* Save off current position */
+  result = cpio_getFilePosition (native_fd, &save_offset);
+  if (result != CPNATIVE_OK)
+    return result;
+
+  if (file_size < new_size)
+    {
+      /* File is too short -- seek to one byte short of where we want,
+       * then write a byte */
+
+      /* move to position n-1 */
+      result = cpio_setFilePosition (native_fd, new_size-1);
+      if (result != CPNATIVE_OK)
+	return result;
+
+      /* write a byte
+         Note: This will fail if we somehow get here in read only mode
+         * That shouldn't happen */
+      data = '\0';
+      result = cpio_write (native_fd, &data, 1, &bytes_written);
+      if (result != CPNATIVE_OK)
+	return result;
+
+      /* Reposition file pointer to where we started if not beyond new len. */
+      if (save_offset < new_size)
+	{
+	  result = cpio_setFilePosition (native_fd, save_offset);
+	  if (result != CPNATIVE_OK)
+	    return result;
+	}
+    }
+  else if (new_size < file_size)
+    {
+      /* File is too long - use ftruncate if available */
+      result = cpio_truncate (native_fd, new_size);
+      if (result != CPNATIVE_OK)
+	  return result;
+
+      /* Reposition file pointer when it now is beyond the end of file. */
+      if (new_size < save_offset)
+	{
+	  result = cpio_setFilePosition (native_fd, new_size);
+	  if (result != CPNATIVE_OK)
+	    return result;
+	}
+    }
+
+  return CPNATIVE_OK;
+}
+
+int cpio_setFileReadonly (const char *filename)
+{
+  struct stat statbuf;
+
+  if (stat(filename, &statbuf) < 0)
+    return errno;
+ 
+  if (chmod(filename, statbuf.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH)) < 0)
+    return errno;
+
+  return 0;
+}
+
+int cpio_isFileExists (const char *filename)
+{
+  struct stat statbuf;
+
+  if (stat(filename, &statbuf) < 0)
+    {
+      return errno;
+    }
+
+  return 0;
+}
+
+int cpio_checkType (const char *filename, jint *entryType)
+{
+  struct stat statbuf;
+
+  if (stat(filename, &statbuf) < 0)
+    return errno;
+
+  if (S_ISDIR(statbuf.st_mode))
+    *entryType = CPFILE_DIRECTORY;
+  else
+    *entryType = CPFILE_FILE;
+
+  return 0;
+}
+
+int cpio_getModificationTime (const char *filename, jlong *mtime)
+{
+  struct stat statbuf;
+
+  if (stat(filename, &statbuf) < 0)
+    return errno;
+
+  *mtime = (jlong)statbuf.st_mtime * (jlong)1000;
+
+  return 0;
+}
+
+int cpio_setModificationTime (const char *filename, jlong mtime)
+{
+  struct stat statbuf;
+  struct utimbuf buf;
+
+  if (stat(filename, &statbuf) < 0)
+    return errno;
+
+  buf.actime = statbuf.st_atime;
+  buf.modtime = mtime / 1000;
+
+  if (utime(filename, &buf) < 0)
+    return errno;
+
+  return 0;
+}
+
+int cpio_removeFile (const char *filename)
+{
+  if (unlink(filename) < 0 && rmdir(filename) < 0)
+    return errno;
+
+  return 0;
+}
+
+int cpio_mkdir (const char *path)
+{
+  if (mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO) < 0)
+    return errno;
+  
+  return 0;
+}
+
+int cpio_rename (const char *old_name, const char *new_name)
+{
+  if (rename(old_name, new_name) < 0)
+    return errno;
+
+  return 0;
+}
+
+int cpio_openDir (const char *dirname, void **handle)
+{
+  *handle = (void *)opendir(dirname);
+  if (*handle == NULL)
+    return errno;
+  
+  return 0;
+}
+
+int cpio_closeDir (void *handle)
+{
+  closedir((DIR *)handle);
+  return 0;
+}
+
+
+int cpio_readDir (void *handle, char *filename)
+{
+#ifdef HAVE_READDIR_R
+  struct dirent dent;
+#endif /* HAVE_READDIR_R */
+  struct dirent *dBuf;
+
+#ifdef HAVE_READDIR_R
+  readdir_r ((DIR *) handle, &dent, &dBuf);
+#else
+  dBuf = readdir((DIR *)handle);
+#endif /* HAVE_READDIR_R */
+
+  if (dBuf == NULL)
+    {
+      /* Some OS's (OS X) return NULL on end-of-dir, but
+         don't set errno to anything. */
+      if (errno == 0)
+        return ENOENT; /* Whatever. */
+      return errno;
+    }
+
+  strncpy (filename, dBuf->d_name, FILENAME_MAX);
+  return 0;
+}
+
+
+int
+cpio_closeOnExec(int fd)
+{
+	if (fcntl (fd, F_SETFD, FD_CLOEXEC) == -1)
+	  return errno;
+	  
+	return 0;
+}
diff --git a/libjava/classpath/native/jni/native-lib/cpio.h b/libjava/classpath/native/jni/native-lib/cpio.h
new file mode 100644
index 00000000000..b388b5b501d
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpio.h
@@ -0,0 +1,85 @@
+/* cpio.h -
+   Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#ifndef _CLASSPATH_IO_H_INCLUDED
+#define _CLASSPATH_IO_H_INCLUDED
+
+#include <jni.h>
+
+#define CPFILE_FLAG_CREATE   0x0001
+#define CPFILE_FLAG_APPEND   0x0002
+#define CPFILE_FLAG_TRUNCATE 0x0004
+#define CPFILE_FLAG_SYNC     0x0008
+#define CPFILE_FLAG_DSYNC    0x0010
+#define CPFILE_FLAG_BINARY   0x0020
+#define CPFILE_FLAG_READ     0x0040
+#define CPFILE_FLAG_WRITE    0x0080
+
+#define CPFILE_PERMISSION_NORMAL 1
+
+#define CPFILE_FLAG_READWRITE (CPFILE_FLAG_READ|CPFILE_FLAG_WRITE)
+
+JNIEXPORT int cpio_openFile (const char *filename, int *fd, int flags, int permissions);
+JNIEXPORT int cpio_closeFile (int fd);
+JNIEXPORT int cpio_availableBytes (int fd, jlong *avail);
+JNIEXPORT int cpio_getFileSize (int fd, jlong *filesize);
+JNIEXPORT int cpio_setFileSize (int fd, jlong filesize);
+JNIEXPORT int cpio_getFilePosition (int fd, jlong *position);
+JNIEXPORT int cpio_setFilePosition (int fd, jlong position);
+JNIEXPORT int cpio_read (int fd, void *data, jint len, jint *bytes_read);
+JNIEXPORT int cpio_write (int fd, const void *data, jint len, jint *bytes_written);
+JNIEXPORT int cpio_fsync (int fd);
+JNIEXPORT int cpio_truncate (int fd, jlong size);
+JNIEXPORT int cpio_closeOnExec(int fd);
+
+#define CPFILE_FILE 0
+#define CPFILE_DIRECTORY 1
+
+JNIEXPORT int cpio_setFileReadonly (const char *filename);
+JNIEXPORT int cpio_isFileExists (const char *filename);
+JNIEXPORT int cpio_checkType (const char *filename, jint *entryType);
+JNIEXPORT int cpio_getModificationTime (const char *filename, jlong *mtime);
+JNIEXPORT int cpio_setModificationTime (const char *filename, jlong mtime);
+JNIEXPORT int cpio_removeFile (const char *filename);
+JNIEXPORT int cpio_mkdir (const char *filename);
+JNIEXPORT int cpio_rename (const char *old_name, const char *new_name);
+
+JNIEXPORT int cpio_openDir (const char *dirname, void **handle);
+JNIEXPORT int cpio_closeDir (void *handle);
+JNIEXPORT int cpio_readDir (void *handle, char *filename);
+
+#endif
diff --git a/libjava/classpath/native/jni/native-lib/cpnative.h b/libjava/classpath/native/jni/native-lib/cpnative.h
new file mode 100644
index 00000000000..4ba7726036a
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpnative.h
@@ -0,0 +1,49 @@
+/* cpnative.h -
+   Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#ifndef _CLASSPATH_NATIVE_H_INCLUDED
+#define _CLASSPATH_NATIVE_H_INCLUDED
+
+#include <errno.h>
+#include <string.h>
+
+#define CPNATIVE_OK 0
+#define CPNATIVE_EINTR EINTR
+
+#define cpnative_getErrorString strerror
+
+#endif
diff --git a/libjava/classpath/native/jni/native-lib/cpnet.c b/libjava/classpath/native/jni/native-lib/cpnet.c
new file mode 100644
index 00000000000..85c4640e16f
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpnet.c
@@ -0,0 +1,768 @@
+/* cpnet.c -
+   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include "config.h"
+#include <jni.h>
+#include <assert.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+
+#include "cpnet.h"
+
+#define SOCKET_DEFAULT_TIMEOUT -1 /* milliseconds */
+
+#if defined (HAVE_MSG_NOSIGNAL)
+#define SOCKET_NOSIGNAL MSG_NOSIGNAL
+#elif defined (HAVE_SO_NOSIGPIPE)
+#define SOCKET_NOSIGNAL SO_NOSIGPIPE
+#else
+#error "No suitable flag found to ommit a SIGPIPE on signal errors with send()."
+#endif
+
+static int socketTimeouts[FD_SETSIZE];
+
+static jint waitForWritable(jint fd)
+{
+  struct timeval tv;
+  fd_set writeset;
+  int ret;
+  
+ 
+  FD_ZERO(&writeset);
+  FD_SET(fd, &writeset);
+  if (socketTimeouts[fd] > 0)
+    {
+      tv.tv_sec = socketTimeouts[fd] / 1000;
+      tv.tv_usec = (socketTimeouts[fd] % 1000) * 1000;
+      ret = select(fd+1, NULL, &writeset, NULL, &tv);
+    }
+  else
+    ret = select(fd+1, NULL, &writeset, NULL, NULL);
+
+  return (ret <= 0) ? -1 : 0;
+}
+
+static jint waitForReadable(jint fd)
+{
+  struct timeval tv;
+  fd_set readset;
+  int ret;
+
+
+  FD_ZERO(&readset);
+  FD_SET(fd, &readset);
+  if (socketTimeouts[fd] > 0)
+    {
+      tv.tv_sec = socketTimeouts[fd] / 1000;
+      tv.tv_usec = (socketTimeouts[fd] % 1000) * 1000;
+      ret = select(fd+1, &readset, NULL, NULL, &tv);
+    }
+  else
+    ret = select(fd+1, &readset, NULL, NULL, NULL);
+
+  return (ret <= 0) ? -1 : 0;
+}
+
+jint cpnet_openSocketStream(JNIEnv *env UNUSED, jint *fd, jint family)
+{
+  *fd = socket(family, SOCK_STREAM, 0);
+  if (*fd == -1)
+    return errno;
+
+  fcntl(*fd, F_SETFD, FD_CLOEXEC);
+  assert(*fd < FD_SETSIZE);
+  socketTimeouts[*fd] = SOCKET_DEFAULT_TIMEOUT;
+  return 0;
+}
+
+jint cpnet_openSocketDatagram(JNIEnv *env UNUSED, jint *fd, jint family)
+{
+  *fd = socket(family, SOCK_DGRAM, 0);
+  if (*fd == -1)
+    return errno;
+
+  fcntl(*fd, F_SETFD, FD_CLOEXEC);
+  assert(*fd < FD_SETSIZE);
+  socketTimeouts[*fd] = SOCKET_DEFAULT_TIMEOUT;
+  return 0;
+}
+
+jint cpnet_shutdown (JNIEnv *env UNUSED, jint fd, jbyte flag)
+{
+  int ret;
+  int shut_flag = 0;
+
+  if (flag == CPNET_SHUTDOWN_READ)
+    shut_flag = SHUT_RD;
+  else if (flag == CPNET_SHUTDOWN_WRITE)
+    shut_flag = SHUT_WR;
+
+  ret = shutdown (fd, shut_flag);
+  if (ret != 0)
+    return errno;
+  return 0;
+}
+
+jint cpnet_close(JNIEnv *env UNUSED, jint fd)
+{
+  if (close (fd) != 0)
+    return errno;
+  return 0;
+}
+
+jint cpnet_listen(JNIEnv *env UNUSED, jint fd, jint queuelen)
+{
+  if (listen (fd, queuelen) != 0)
+    return errno;
+  return 0;
+}
+
+jint cpnet_accept(JNIEnv *env UNUSED, jint fd, jint *newfd)
+{
+  if (waitForReadable (fd) < 0)
+    return ETIMEDOUT;
+
+  *newfd = accept(fd, NULL, 0);
+  if (*newfd != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_bind(JNIEnv *env UNUSED, jint fd, cpnet_address *addr)
+{
+  int ret;
+
+  ret = bind(fd, (struct sockaddr *)addr->data, addr->len);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_connect(JNIEnv *env UNUSED, jint fd, cpnet_address *addr)
+{
+  int ret;
+
+  /* TODO: implement socket time out */
+  ret = connect(fd, (struct sockaddr *)addr->data, addr->len);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getLocalAddr(JNIEnv *env, jint fd, cpnet_address **addr)
+{
+  socklen_t slen = 1024;
+  int ret;
+
+  *addr = JCL_malloc(env, slen);
+
+  slen -= sizeof(jint);
+  ret = getsockname(fd, (struct sockaddr *)(*addr)->data, &slen );
+  if (ret != 0)
+    {
+      int err = errno;
+      JCL_free(env, *addr);
+      return err;
+    }
+
+  (*addr)->len = slen;
+  
+  return 0;
+}
+
+jint cpnet_getRemoteAddr(JNIEnv *env, jint fd, cpnet_address **addr)
+{
+  socklen_t slen = 1024;
+  int ret;
+
+  *addr = JCL_malloc(env, slen);
+
+  slen -= sizeof(jint);
+  ret = getpeername(fd, (struct sockaddr *)(*addr)->data, &slen );
+  if (ret != 0)
+    {
+      int err = errno;
+      JCL_free(env, *addr);
+      return err;
+    }
+
+  (*addr)->len = slen;
+  
+  return 0;
+}
+
+jint cpnet_setBroadcast(JNIEnv *env UNUSED, jint fd, jint flag)
+{
+  int ret;
+
+  ret = setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &flag, sizeof(flag));
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_send (JNIEnv *env UNUSED, jint fd, jbyte *data, jint len, jint *bytes_sent)
+{
+  ssize_t ret;
+
+  if (waitForWritable(fd) < 0)
+    return ETIMEDOUT;
+
+  ret = send(fd, data, len, SOCKET_NOSIGNAL);
+  if (ret < 0)
+    return errno;
+
+  *bytes_sent = ret;
+
+  return 0;
+}
+
+jint cpnet_sendTo (JNIEnv *env UNUSED, jint fd, jbyte *data, jint len, cpnet_address *addr, jint *bytes_sent)
+{
+  ssize_t ret;
+
+  if (waitForWritable(fd) < 0)
+    return ETIMEDOUT;
+
+  ret = sendto(fd, data, len, SOCKET_NOSIGNAL, (struct sockaddr *)addr->data,
+	       addr->len);
+  if (ret < 0)
+    return errno;
+
+  *bytes_sent = ret;
+  return 0;
+}
+
+jint cpnet_recv (JNIEnv *env UNUSED, jint fd, jbyte *data, jint len, jint *bytes_recv)
+{
+  ssize_t ret;
+
+  if (waitForReadable(fd) < 0)
+    return ETIMEDOUT;
+
+  ret = recv(fd, data, len, 0);
+  if (ret < 0)
+    return errno;
+
+  *bytes_recv = ret;
+
+  return 0;
+}
+
+jint cpnet_recvFrom (JNIEnv *env, jint fd, jbyte *data, jint len, cpnet_address **addr, jint *bytes_recv)
+{
+  socklen_t slen = 1024;
+  ssize_t ret;
+
+  if (waitForReadable(fd) < 0)
+    return ETIMEDOUT;
+
+  *addr = JCL_malloc(env, slen);
+
+  slen -= sizeof(jint);
+  ret = recvfrom(fd, data, len, 0, (struct sockaddr *) (*addr)->data, &slen);
+  if (ret < 0)
+    {
+      int err = errno;
+      JCL_free(env, *addr);
+      return err;
+    }
+
+  (*addr)->len = slen;
+  *bytes_recv = ret;
+
+  return 0;
+}
+
+jint cpnet_setSocketTCPNoDelay (JNIEnv *env UNUSED, jint fd, jint nodelay)
+{
+  socklen_t len = sizeof(jint);
+  int ret;
+
+  ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &nodelay, len);
+  if (ret < 0)
+    return errno;
+
+  return 0; 
+}
+
+jint cpnet_getSocketTCPNoDelay (JNIEnv *env UNUSED, jint fd, jint *nodelay)
+{
+  socklen_t len = sizeof(jint);
+  int ret;
+
+  ret = getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, nodelay, &len);
+  if (ret < 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_setLinger (JNIEnv *env UNUSED, jint fd, jint flag, jint value)
+{
+  socklen_t len = sizeof(struct linger);
+  int ret;
+  struct linger __linger;
+
+  if (flag)
+    {
+      __linger.l_onoff = 0;
+    }
+  else
+    {
+      __linger.l_linger = value;
+      __linger.l_onoff = 1;
+    }
+
+  ret = setsockopt(fd, SOL_SOCKET, SO_LINGER, &__linger, len);
+  if (ret < 0)
+    return errno;
+
+  return 0; 
+}
+
+jint cpnet_getLinger (JNIEnv *env UNUSED, jint fd, jint *flag, jint *value)
+{
+  socklen_t slen = sizeof(struct linger);
+  struct linger __linger;
+  int ret;
+
+  ret = getsockopt(fd, SOL_SOCKET, SO_LINGER, &__linger, &slen);
+  if (ret != 0)
+    return errno;
+
+  *flag = __linger.l_onoff;
+  *value = __linger.l_linger;
+
+  return ret;
+}
+
+jint cpnet_setSocketTimeout (JNIEnv *env UNUSED, jint fd, jint value)
+{
+  socketTimeouts[fd] = value;
+  return 0;
+}
+
+jint cpnet_getSocketTimeout (JNIEnv *env UNUSED, jint fd, jint *value)
+{
+  *value = socketTimeouts[fd];
+  return 0;
+}
+
+jint cpnet_setSendBuf (JNIEnv *env UNUSED, jint fd, jint value)
+{
+  int ret;
+
+  ret = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value));
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getSendBuf (JNIEnv *env UNUSED, jint fd, jint *value)
+{
+  int ret;
+  socklen_t slen = sizeof(*value);
+
+  ret = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, value, &slen);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_setRecvBuf (JNIEnv *env UNUSED, jint fd, jint value)
+{
+  int ret;
+
+  ret = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value));
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getRecvBuf (JNIEnv *env UNUSED, jint fd, jint *value)
+{
+  int ret;
+  socklen_t slen = sizeof(*value);
+
+  ret = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, value, &slen);
+  if (ret != 0)
+    return errno;
+  
+  return 0;
+}
+
+jint cpnet_setTTL (JNIEnv *env UNUSED, jint fd, jint value)
+{ 
+  int ret;
+
+  ret = setsockopt(fd, IPPROTO_IP, IP_TTL, &value, sizeof(value));
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getTTL (JNIEnv *env UNUSED, jint fd, jint *value)
+{
+  int ret;
+  socklen_t slen = sizeof(*value);
+
+  ret = getsockopt(fd, IPPROTO_IP, IP_TTL, value, &slen);
+  if (ret != 0)
+    return errno;
+  
+  return 0;
+}
+
+jint cpnet_setMulticastIF (JNIEnv *env UNUSED, jint fd, cpnet_address *addr)
+{
+  int ret;
+
+  ret = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (struct sockaddr *)addr->data, addr->len);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getMulticastIF (JNIEnv *env, jint fd, cpnet_address **addr)
+{
+  socklen_t slen = 1024;
+  int ret;
+
+  *addr = JCL_malloc(env, slen);
+
+  slen -= sizeof(jint);
+  ret = getsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (struct sockaddr *)(*addr)->data, &slen);
+  (*addr)->len = slen;
+
+  if (ret != 0)
+    return errno;
+  
+  return 0;
+}
+
+jint cpnet_setReuseAddress (JNIEnv *env UNUSED, jint fd, jint reuse)
+{
+  int ret;
+
+  ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getReuseAddress (JNIEnv *env UNUSED, jint fd, jint *reuse)
+{
+  int ret;
+  socklen_t slen = sizeof(*reuse);
+
+  ret = getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, reuse, &slen);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_setKeepAlive (JNIEnv *env UNUSED, jint fd, jint keep)
+{
+  int ret;
+
+  ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keep, sizeof(keep));
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getKeepAlive (JNIEnv *env UNUSED, jint fd, jint *keep)
+{
+  int ret;
+  socklen_t slen = sizeof(*keep);
+
+  ret = getsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, keep, &slen);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_addMembership (JNIEnv *env UNUSED, jint fd, cpnet_address *addr)
+{
+  struct ip_mreq req;
+  int ret;
+  
+  memset(&req, 0, sizeof(req));
+  req.imr_multiaddr = ((struct sockaddr_in *)addr->data)->sin_addr;
+  req.imr_interface.s_addr = INADDR_ANY;
+  ret = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &req, sizeof(req));
+  if (ret != 0)
+    return errno;
+  
+  return 0;
+}
+
+jint cpnet_dropMembership (JNIEnv *env UNUSED, jint fd, cpnet_address *addr)
+{
+  struct ip_mreq req;
+  int ret;
+  
+  memset(&req, 0, sizeof(req));
+  req.imr_multiaddr = ((struct sockaddr_in *)addr->data)->sin_addr;
+  req.imr_interface.s_addr = INADDR_ANY;
+  ret = setsockopt(fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &req, sizeof(req));
+  if (ret != 0)
+    return errno;
+  
+  return 0;
+}
+
+jint cpnet_getAvailableBytes (JNIEnv *env UNUSED, jint fd, jint *availableBytes)
+{
+  int ret;
+
+  ret = ioctl(fd, FIONREAD, availableBytes);
+  if (ret != 0)
+    return errno;
+
+  return 0;
+}
+
+jint cpnet_getHostname (JNIEnv *env UNUSED, char *hostname, jint hostname_len)
+{
+  int ret;
+
+  ret = gethostname(hostname, hostname_len);
+  if (ret != 0)
+    return errno;
+
+  hostname[hostname_len-1] = 0;
+  return 0;
+}
+
+jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***addresses, jint *addresses_count)
+{
+  struct hostent hret;
+  struct hostent *result;
+  jint buflen = 1024;
+  int herr = 0;
+  int ret = 0;
+  int counter = 0;
+  cpnet_address **addr_arr;
+  int i;
+  char *buf;
+
+  do
+    {
+      buf = (char *)JCL_malloc(env, buflen);
+#ifdef HAVE_GETHOSTBYNAME_R
+      ret = gethostbyname_r (hostname, &hret, buf, buflen, &result, &herr);
+#else
+      hret.h_addr_list = NULL;
+      hret.h_addrtype = 0;
+
+      result = gethostbyname (hostname);
+      if (result == NULL)
+        return -errno;
+      memcpy (&hret, result, sizeof (struct hostent));
+#endif
+      if (ret != 0 || result == NULL)
+	{
+	  if (herr == ERANGE)
+	    {
+	      buflen *= 2;
+	      JCL_free(env, buf);
+	      continue;
+	    }
+	  JCL_free(env, buf);	  
+
+	  return -herr;
+	}
+
+      break;
+    }
+  while (1);
+  
+  while (hret.h_addr_list[counter] != NULL)
+    counter++;
+
+  *addresses_count = counter;
+  addr_arr = *addresses = JCL_malloc(env, sizeof(cpnet_address *) * counter);
+  switch (hret.h_addrtype)
+    {
+    case AF_INET:
+      for (i = 0; i < counter; i++)
+	{
+	  addr_arr[i] = cpnet_newIPV4Address(env);
+	  cpnet_bytesToIPV4Address(addr_arr[i], (jbyte *)hret.h_addr_list[i]);
+	}
+      break;
+    case AF_INET6:
+      for (i = 0; i < counter; i++)
+	{
+	  addr_arr[i] = cpnet_newIPV6Address(env);
+	  cpnet_bytesToIPV6Address(addr_arr[i], (jbyte *)hret.h_addr_list[i]);
+	}
+      break;
+    default:
+      *addresses_count = 0;
+      JCL_free(env, addr_arr);
+      break;
+    }
+
+  JCL_free(env, buf);
+
+  return 0;
+}
+
+jint cpnet_getHostByAddr (JNIEnv *env UNUSED, cpnet_address *addr, char *hostname, jint hostname_len)
+{
+  union 
+  {
+    struct sockaddr_in *addr_v4;
+    struct sockaddr_in6 *addr_v6;
+    char *data;
+  } haddr;
+  void *raw_addr;
+  int addr_type;
+  struct hostent *ret;
+  int addr_len;
+
+  haddr.data = addr->data;
+  
+  if (haddr.addr_v4->sin_family == AF_INET)
+    {
+      raw_addr = &haddr.addr_v4->sin_addr;
+      addr_len = sizeof(haddr.addr_v4->sin_addr);
+      addr_type = AF_INET;
+    }
+  else if (haddr.addr_v6->sin6_family == AF_INET6)
+    {
+      raw_addr = &haddr.addr_v6->sin6_addr;
+      addr_type = AF_INET6;
+      addr_len = sizeof(haddr.addr_v6->sin6_addr);
+    }
+  else
+    return EINVAL;
+
+  /* Here we do not have any thread safe call. VM implementors will have to
+   * do a big lock. Or it should be put on the Classpath VM interface.
+   */
+  ret = gethostbyaddr(raw_addr, addr_len, addr_type);
+  if (ret == NULL)
+    {
+      /* The trouble here is how to distinguish the two cases ? */
+      if (h_errno != 0)
+	return h_errno;
+      else
+	return errno;
+
+    }
+  strncpy(hostname, ret->h_name, hostname_len);
+
+  return 0;
+}
+
+jint cpnet_aton (JNIEnv *env, const char *hostname, cpnet_address **addr)
+{
+  jbyte *bytes = NULL;
+#ifdef HAVE_INET_PTON
+  jbyte inet6_addr[16];
+#endif
+
+#ifdef HAVE_INET_ATON
+  struct in_addr laddr;
+  if (inet_aton (hostname, &laddr))
+    {
+      bytes = (jbyte *) &laddr;
+    }
+#elif defined(HAVE_INET_ADDR)
+#if ! HAVE_IN_ADDR_T
+  typedef jint in_addr_t;
+#endif
+  in_addr_t laddr = inet_addr (hostname);
+  if (laddr != (in_addr_t)(-1))
+    {
+      bytes = (jbyte *) &laddr;
+    }
+#endif
+  if (bytes)
+    {
+      *addr = cpnet_newIPV4Address(env);
+      cpnet_bytesToIPV4Address(*addr, bytes);
+      return 0;
+    }
+
+#ifdef HAVE_INET_PTON
+  if (inet_pton (AF_INET6, hostname, inet6_addr) > 0)
+    {
+      *addr = cpnet_newIPV6Address(env);
+      cpnet_bytesToIPV6Address(*addr, inet6_addr);
+      return 0;
+    }
+#endif
+
+  *addr = NULL;
+  return 0;
+}
+
+void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count)
+{
+  jint i;
+
+  for (i = 0; i < addresses_count; i++)
+    cpnet_freeAddress(env, addr[i]);
+}
diff --git a/libjava/classpath/native/jni/native-lib/cpnet.h b/libjava/classpath/native/jni/native-lib/cpnet.h
new file mode 100644
index 00000000000..3705c76ecd5
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpnet.h
@@ -0,0 +1,209 @@
+/* cpnet.h -
+   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#ifndef _CLASSPATH_NET_H_INCLUDED
+#define _CLASSPATH_NET_H_INCLUDED
+
+#include <jni.h>
+#include <jcl.h>
+#include <string.h>
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
+typedef struct {
+  jint len;
+  char data[1];
+} cpnet_address;
+
+#define CPNET_SHUTDOWN_READ 1
+#define CPNET_SHUTDOWN_WRITE 2
+
+JNIEXPORT jint cpnet_openSocketStream(JNIEnv *env, jint *fd, jint family);
+JNIEXPORT jint cpnet_openSocketDatagram(JNIEnv *env, jint *fd, jint family);
+JNIEXPORT jint cpnet_shutdown (JNIEnv *env, jint fd, jbyte flag);
+JNIEXPORT jint cpnet_close(JNIEnv *env, jint fd);
+JNIEXPORT jint cpnet_listen(JNIEnv *env, jint fd, jint queuelen);
+JNIEXPORT jint cpnet_accept(JNIEnv *env, jint fd, jint *newfd);
+JNIEXPORT jint cpnet_bind(JNIEnv *env, jint fd, cpnet_address *addr);
+JNIEXPORT jint cpnet_connect(JNIEnv *env, jint fd, cpnet_address *addr);
+JNIEXPORT jint cpnet_getLocalAddr(JNIEnv *env, jint fd, cpnet_address **addr);
+JNIEXPORT jint cpnet_getRemoteAddr(JNIEnv *env, jint fd, cpnet_address **addr);
+JNIEXPORT jint cpnet_setBroadcast(JNIEnv *env, jint fd, jint flag);
+JNIEXPORT jint cpnet_send (JNIEnv *env, jint fd, jbyte *data, jint len, jint *bytes_sent);
+JNIEXPORT jint cpnet_sendTo (JNIEnv *env, jint fd, jbyte *data, jint len, cpnet_address *addr, jint *bytes_sent);
+JNIEXPORT jint cpnet_recv (JNIEnv *env, jint fd, jbyte *data, jint len, jint *bytes_recv);
+JNIEXPORT jint cpnet_recvFrom (JNIEnv *env, jint fd, jbyte *data, jint len, cpnet_address **addr, jint *bytes_recv);
+JNIEXPORT jint cpnet_setSocketTCPNoDelay (JNIEnv *env, jint fd, jint nodelay);
+JNIEXPORT jint cpnet_getSocketTCPNoDelay (JNIEnv *env, jint fd, jint *nodelay);
+JNIEXPORT jint cpnet_setLinger (JNIEnv *env, jint fd, jint flag, jint value);
+JNIEXPORT jint cpnet_getLinger (JNIEnv *env, jint fd, jint *flag, jint *value);
+JNIEXPORT jint cpnet_setSocketTimeout (JNIEnv *env, jint fd, jint value);
+JNIEXPORT jint cpnet_getSocketTimeout (JNIEnv *env, jint fd, jint *value);
+JNIEXPORT jint cpnet_setSendBuf (JNIEnv *env, jint fd, jint value);
+JNIEXPORT jint cpnet_getSendBuf (JNIEnv *env, jint fd, jint *value);
+JNIEXPORT jint cpnet_setRecvBuf (JNIEnv *env, jint fd, jint value);
+JNIEXPORT jint cpnet_getRecvBuf (JNIEnv *env, jint fd, jint *value);
+JNIEXPORT jint cpnet_setTTL (JNIEnv *env, jint fd, jint value);
+JNIEXPORT jint cpnet_getTTL (JNIEnv *env, jint fd, jint *value);
+JNIEXPORT jint cpnet_setMulticastIF (JNIEnv *env, jint fd, cpnet_address *addr);
+JNIEXPORT jint cpnet_getMulticastIF (JNIEnv *env, jint fd, cpnet_address **addr);
+JNIEXPORT jint cpnet_setReuseAddress (JNIEnv *env, jint fd, jint reuse);
+JNIEXPORT jint cpnet_getReuseAddress (JNIEnv *env, jint fd, jint *reuse);
+JNIEXPORT jint cpnet_setKeepAlive (JNIEnv *env, jint fd, jint keep);
+JNIEXPORT jint cpnet_getKeepAlive (JNIEnv *env, jint fd, jint *keep);
+JNIEXPORT jint cpnet_getBindAddress (JNIEnv *env, jint fd, cpnet_address **addr);
+JNIEXPORT jint cpnet_addMembership (JNIEnv *env, jint fd, cpnet_address *addr);
+JNIEXPORT jint cpnet_dropMembership (JNIEnv *env, jint fd, cpnet_address *addr);
+JNIEXPORT jint cpnet_getAvailableBytes (JNIEnv *env, jint fd, jint *availableBytes);
+JNIEXPORT jint cpnet_getHostname (JNIEnv *env, char *hostname, jint hostname_len);
+JNIEXPORT jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***adresses, jint *addresses_count);
+JNIEXPORT jint cpnet_getHostByAddr (JNIEnv *env, cpnet_address *addr, char *hostname, jint hostname_len);
+JNIEXPORT jint cpnet_aton (JNIEnv *env, const char *hostname, cpnet_address **addr);
+JNIEXPORT void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count);
+
+static inline cpnet_address *cpnet_newIPV4Address(JNIEnv * env)
+{
+  cpnet_address *addr = (cpnet_address *)JCL_malloc(env, sizeof(cpnet_address) + sizeof(struct sockaddr_in));
+  struct sockaddr_in *netaddr = (struct sockaddr_in *)&(addr->data[0]);
+
+  addr->len = sizeof(struct sockaddr_in);
+  memset(netaddr, 0, addr->len);
+  netaddr->sin_family = AF_INET;
+  return addr;
+}
+
+static inline void cpnet_setIPV4Any(cpnet_address *addr)
+{
+  struct sockaddr_in *netaddr = (struct sockaddr_in *)&(addr->data[0]);
+  
+  netaddr->sin_addr.s_addr = INADDR_ANY;
+}
+
+static inline cpnet_address *cpnet_newIPV6Address(JNIEnv * env)
+{
+  cpnet_address * addr = (cpnet_address *)JCL_malloc(env, sizeof(cpnet_address) + sizeof(struct sockaddr_in6));
+  struct sockaddr_in6 *netaddr = (struct sockaddr_in6 *)&(addr->data[0]);
+
+  addr->len = sizeof(struct sockaddr_in6);
+  memset(netaddr, 0, addr->len);
+  netaddr->sin6_family = AF_INET6;
+
+  return addr;
+}
+
+static inline void cpnet_freeAddress(JNIEnv * env, cpnet_address *addr)
+{
+  JCL_free(env, addr);
+}
+
+static inline void cpnet_addressSetPort(cpnet_address *addr, jint port)
+{
+  struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(addr->data[0]);
+
+  ipaddr->sin_port = htons(port);
+}
+
+static inline jint cpnet_addressGetPort(cpnet_address *addr)
+{
+  struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(addr->data[0]);
+
+  return ntohs(ipaddr->sin_port);
+}
+
+static inline jboolean cpnet_isAddressEqual(cpnet_address *addr1, cpnet_address *addr2)
+{
+  if (addr1->len != addr2->len)
+    return JNI_FALSE;
+
+  return memcmp(addr1->data, addr2->data, addr1->len) == 0;
+}
+
+static inline jboolean cpnet_isIPV6Address(cpnet_address *addr)
+{
+  struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(addr->data[0]);
+
+  return ipaddr->sin_family == AF_INET6;
+}
+
+static inline jboolean cpnet_isIPV4Address(cpnet_address *addr)
+{
+  struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(addr->data[0]);
+
+  return ipaddr->sin_family == AF_INET;
+}
+
+static inline void cpnet_IPV4AddressToBytes(cpnet_address *netaddr, jbyte *octets)
+{
+  struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(netaddr->data[0]);
+  unsigned long sysaddr = ntohl(ipaddr->sin_addr.s_addr);
+
+  octets[0] = ((sysaddr >> 24) & 0xff);
+  octets[1] = ((sysaddr >> 16) & 0xff);
+  octets[2] = ((sysaddr >> 8) & 0xff);
+  octets[3] = (sysaddr & 0xff);
+}
+
+static inline void cpnet_bytesToIPV4Address(cpnet_address *netaddr, jbyte *octets)
+{
+  jint sysaddr;
+  struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(netaddr->data[0]);
+
+  sysaddr = ((jint)(unsigned char)octets[0]) << 24;
+  sysaddr |= ((jint)(unsigned char)octets[1]) << 16;
+  sysaddr |= ((jint)(unsigned char)octets[2]) << 8;
+  sysaddr |= ((jint)(unsigned char)octets[3]);
+
+  ipaddr->sin_addr.s_addr = htonl(sysaddr);
+}
+
+static inline void cpnet_IPV6AddressToBytes(cpnet_address *netaddr, jbyte *octets)
+{
+  struct sockaddr_in6 *ipaddr = (struct sockaddr_in6 *)&(netaddr->data[0]);
+
+  memcpy(octets, &ipaddr->sin6_addr, 16);
+}
+
+static inline void cpnet_bytesToIPV6Address(cpnet_address *netaddr, jbyte *octets)
+{
+  struct sockaddr_in6 *ipaddr = (struct sockaddr_in6 *)&(netaddr->data[0]);
+
+  memcpy(&ipaddr->sin6_addr, octets, 16);
+}
+
+#endif
diff --git a/libjava/classpath/native/jni/native-lib/cpproc.c b/libjava/classpath/native/jni/native-lib/cpproc.c
new file mode 100644
index 00000000000..b6e9030b562
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpproc.c
@@ -0,0 +1,136 @@
+/* cpproc.c -
+   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include "config.h"
+#include <jni.h>
+#include "cpproc.h"
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+
+static void close_all_fds(int *fds, int numFds)
+{
+  int i;
+
+  for (i = 0; i < numFds; i++)
+    close(fds[i]);
+}
+
+int cpproc_forkAndExec (char * const *commandLine, char * const * newEnviron,
+			int *fds, int pipe_count, pid_t *out_pid, const char *wd)
+{
+  int local_fds[6];
+  int i;
+  pid_t pid;
+
+  for (i = 0; i < (pipe_count * 2); i += 2)
+    {
+      if (pipe(&local_fds[i]) < 0)
+	{
+	  int err = errno;
+
+	  close_all_fds(local_fds, i);
+	  
+	  return err;
+	}
+    }
+  
+  pid = fork();
+  
+  switch (pid)
+    {
+    case 0:
+      dup2(local_fds[0], 0);
+      dup2(local_fds[3], 1);
+      if (pipe_count == 3)
+	dup2(local_fds[5], 2);
+      else
+	dup2(1, 2);
+
+      close_all_fds(local_fds, pipe_count * 2);
+
+      chdir(wd);
+      if (newEnviron == NULL)
+	execvp(commandLine[0], commandLine);
+      else
+	execve(commandLine[0], commandLine, newEnviron);
+      
+      abort();
+      
+      break;
+    case -1:
+      {
+	int err = errno;
+	
+	close_all_fds(local_fds, pipe_count * 2);
+	return err;
+      }
+    default: 
+      close(local_fds[0]);
+      close(local_fds[3]);
+      if (pipe_count == 3)
+	close(local_fds[5]);
+
+      fds[0] = local_fds[1];
+      fds[1] = local_fds[2];
+      fds[2] = local_fds[4];
+      *out_pid = pid;
+      return 0;
+    }
+}
+
+int cpproc_waitpid (pid_t pid, int *status, pid_t *outpid, int options)
+{
+  pid_t wp = waitpid(pid, status, options);
+
+  if (wp < 0)
+    return errno;
+
+  *outpid = wp;
+  return 0;
+}
+
+int cpproc_kill (pid_t pid, int signal)
+{
+  if (kill(pid, signal) < 0)
+    return errno;
+
+  return 0;
+}
diff --git a/libjava/classpath/native/jni/native-lib/cpproc.h b/libjava/classpath/native/jni/native-lib/cpproc.h
new file mode 100644
index 00000000000..5e8db5800a2
--- /dev/null
+++ b/libjava/classpath/native/jni/native-lib/cpproc.h
@@ -0,0 +1,52 @@
+/* cpproc.h -
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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 2, or (at your option)
+any later version.
+
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+#ifndef _CLASSPATH_PROC_H_INCLUDED
+#define _CLASSPATH_PROC_H_INCLUDED
+
+#include <sys/types.h>
+
+#define CPIO_EXEC_STDIN 0
+#define CPIO_EXEC_STDOUT 1
+#define CPIO_EXEC_STDERR 2
+#define CPIO_EXEC_NUM_PIPES 3
+
+JNIEXPORT int cpproc_forkAndExec (char * const *commandLine, char * const * newEnviron,
+				  int *fds, int pipe_count, pid_t *pid, const char *wd);
+JNIEXPORT int cpproc_waitpid (pid_t pid, int *status, pid_t *outpid, int options);
+JNIEXPORT int cpproc_kill (pid_t pid, int signal);
+
+#endif
diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.am b/libjava/classpath/native/jni/qt-peer/Makefile.am
index b123ed36e6c..1728b6b530e 100644
--- a/libjava/classpath/native/jni/qt-peer/Makefile.am
+++ b/libjava/classpath/native/jni/qt-peer/Makefile.am
@@ -1,7 +1,8 @@
 # Qt AWT backend for Classpath
 #
 
-nativeexeclib_LTLIBRARIES = libqtpeer.la
+## GCJ LOCAL: don't install this library
+noinst_LTLIBRARIES = libqtpeer.la
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.in b/libjava/classpath/native/jni/qt-peer/Makefile.in
index 6171542c7b7..c60ea1938a2 100644
--- a/libjava/classpath/native/jni/qt-peer/Makefile.in
+++ b/libjava/classpath/native/jni/qt-peer/Makefile.in
@@ -45,26 +45,20 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
-nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
 libqtpeer_la_LIBADD =
 am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \
 	mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \
@@ -209,6 +203,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -330,9 +326,8 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
-nativeexeclib_LTLIBRARIES = libqtpeer.la
+noinst_LTLIBRARIES = libqtpeer.la
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CXXFLAGS = @QT_CFLAGS@
@@ -435,35 +430,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
-	@list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-nativeexeclibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativeexeclibdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativeexeclibdir)/$$p"; \
-	done
 
-clean-nativeexeclibLTLIBRARIES:
-	-test -z "$(nativeexeclib_LTLIBRARIES)" || rm -f $(nativeexeclib_LTLIBRARIES)
-	@list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(nativeexeclibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -624,9 +601,6 @@ check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(nativeexeclibdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
@@ -656,7 +630,7 @@ maintainer-clean-generic:
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-nativeexeclibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -677,7 +651,7 @@ info-am:
 
 install-data-am:
 
-install-exec-am: install-nativeexeclibLTLIBRARIES
+install-exec-am:
 
 install-info: install-info-am
 
@@ -703,20 +677,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
-	install-nativeexeclibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-nativeexeclibLTLIBRARIES
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
 
 
 slotcallbacks.moc.h: slotcallbacks.cpp
diff --git a/libjava/classpath/native/jni/xmlj/.cvsignore b/libjava/classpath/native/jni/xmlj/.cvsignore
new file mode 100644
index 00000000000..e9f2658a694
--- /dev/null
+++ b/libjava/classpath/native/jni/xmlj/.cvsignore
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
diff --git a/libjava/classpath/native/jni/xmlj/Makefile.in b/libjava/classpath/native/jni/xmlj/Makefile.in
index a43311b3a82..3f3a1613cc0 100644
--- a/libjava/classpath/native/jni/xmlj/Makefile.in
+++ b/libjava/classpath/native/jni/xmlj/Makefile.in
@@ -42,12 +42,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
+	$(top_srcdir)/../../config/no-executables.m4 \
 	$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -185,6 +187,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@
+JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@
+JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@
 JAY = @JAY@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
@@ -306,7 +310,6 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libxmlj.la
 libxmlj_la_SOURCES = \