17 files changed, 63 insertions, 69 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aa456129c72..989d7704a3a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,37 @@
+2012-03-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac (alpha*-dec-osf*): Remove.
+	* configure: Regenerate.
+	* configure.host (alpha*-dec-osf*): Remove.
+
+	* gnu/java/net/natPlainDatagramSocketImplPosix.cc (setOption): Use
+	IPV6_MULTICAST_IF unconditionally.
+	* gnu/java/net/natPlainDatagramSocketImplWin32.cc (setOption):
+	Likewise.
+	* gnu/java/net/natPlainSocketImplPosix.cc
+	(gnu::java::net::PlainSocketImpl::accept): Use ::accept instead of
+	_Jv_accept.
+	* include/posix-signal.h [__alpha__ && __osf__]: Remove.
+	* include/posix.h (_POSIX_PII_SOCKET): Don't define.
+	(_Jv_accept): Remove.
+
+	* java/io/File.java (File._access): Rename to access.
+	Change callers.
+	(File._stat): Likewise.
+	* java/io/File.h: Regenerate.
+	* classpath/lib/java/io/File.class: Regenerate.
+	* java/io/natFilePosix.cc (java::io::File::_access): Rename to
+	access.
+	(java::io::File::_stat): Rename to stat.
+	* java/io/natFileWin32.cc: Likewise.
+
+	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
+	Remove alpha*-dec-osf* handling.
+	* testsuite/libjava.jvmti/jvmti-interp.exp
+	(gcj_jni_compile_c_to_so): Likewise.
+	* testsuite/libjava.jvmti/jvmti.exp (gcj_jvmti_compile_cxx_to_o):
+	Likewise.
+
 2012-02-23  Patrick Marlier  <patrick.marlier@gmail.com>
 	    Jack Howarth  <howarth@bromo.med.uc.edu>
 
diff --git a/libjava/classpath/lib/java/io/File.class b/libjava/classpath/lib/java/io/File.class
index 8bcfe7989f9..3481ccff47f 100644
--- a/libjava/classpath/lib/java/io/File.class
+++ b/libjava/classpath/lib/java/io/File.class
diff --git a/libjava/configure b/libjava/configure
index 8ea1aec5ee0..2d80c8067f6 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -20744,7 +20744,7 @@ case "$THREADS" in
 	THREADLDFLAGS=-pthread
 	THREADSPEC=-lpthread
 	;;
-     alpha*-dec-osf* | hppa*-hp-hpux*)
+     hppa*-hp-hpux*)
 	THREADCXXFLAGS=-pthread
 	# boehm-gc needs some functions from librt, so link that too.
 	THREADLIBS='-lpthread -lrt'
@@ -24220,7 +24220,7 @@ SYSDEP_SOURCES=
 SIGNAL_HANDLER_AUX=
 
 case "${host}" in
- alpha*-dec-osf* | mips-sgi-irix* | *-*-solaris2*)
+ mips-sgi-irix* | *-*-solaris2*)
     SIGNAL_HANDLER=include/posix-signal.h
     ;;
  i?86-*-linux*)
diff --git a/libjava/configure.ac b/libjava/configure.ac
index ce428cac257..434f92364dd 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1088,7 +1088,7 @@ case "$THREADS" in
 	THREADLDFLAGS=-pthread
 	THREADSPEC=-lpthread
 	;;
-     alpha*-dec-osf* | hppa*-hp-hpux*)
+     hppa*-hp-hpux*)
 	THREADCXXFLAGS=-pthread
 	# boehm-gc needs some functions from librt, so link that too.
 	THREADLIBS='-lpthread -lrt'
@@ -1732,7 +1732,7 @@ SYSDEP_SOURCES=
 SIGNAL_HANDLER_AUX=
 
 case "${host}" in
- alpha*-dec-osf* | mips-sgi-irix* | *-*-solaris2*)
+ mips-sgi-irix* | *-*-solaris2*)
     SIGNAL_HANDLER=include/posix-signal.h
     ;;
  i?86-*-linux*)
diff --git a/libjava/configure.host b/libjava/configure.host
index 105785e5434..8ce7044a574 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -277,9 +277,6 @@ EOF
 	  rm -f conftest conftest.c
 	fi
 	;;
-  alpha*-dec-osf*)
-	can_unwind_signal=yes
-	;;
   i[34567]86*-kfreebsd*-gnu | x86_64*-kfreebsd*-gnu)
         libgcj_ld_symbolic='-Wl,-Bsymbolic'
         slow_pthread_self=
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
index 7cbf011ab50..65a42f95d42 100644
--- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
+++ b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2005, 2006  Free Software Foundation
+/* Copyright (C) 2003, 2005, 2006, 2012 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -660,8 +660,6 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
 	    len = sizeof (struct in_addr);
 	    ptr = (const char *) &u.addr;
 	  }
-// Tru64 UNIX V5.0 has struct sockaddr_in6, but no IPV6_MULTICAST_IF
-#if defined (HAVE_INET6) && defined (IPV6_MULTICAST_IF)
 	else if (len == 16)
 	  {
 	    level = IPPROTO_IPV6;
@@ -670,7 +668,6 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
 	    len = sizeof (struct in6_addr);
 	    ptr = (const char *) &u.addr6;
 	  }
-#endif
 	else
 	  throw
 	    new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
index e410196653d..8d83720fffe 100644
--- a/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
+++ b/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2006 Free Software Foundation
+/* Copyright (C) 2003, 2006, 2012 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -545,8 +545,6 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
       len = sizeof (struct in_addr);
       ptr = (const char *) &u.addr;
     }
-// Tru64 UNIX V5.0 has struct sockaddr_in6, but no IPV6_MULTICAST_IF
-#if defined (HAVE_INET6) && defined (IPV6_MULTICAST_IF)
   else if (len == 16)
     {
       level = IPPROTO_IPV6;
@@ -555,7 +553,6 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID,
       len = sizeof (struct in6_addr);
       ptr = (const char *) &u.addr6;
     }
-#endif
   else
     throw
       new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
index e21013bf72e..dabf6e65fc0 100644
--- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation
+/* Copyright (C) 2003, 2004, 2005, 2006, 2007, 2012  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -277,7 +277,7 @@ gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s)
 	                                  JvNewStringUTF("Accept timed out"));
     }
 
-  new_socket = _Jv_accept (native_fd, (sockaddr*) &u, &addrlen);
+  new_socket = ::accept (native_fd, (sockaddr*) &u, &addrlen);
 
   if (new_socket < 0)
     goto error;
diff --git a/libjava/include/posix-signal.h b/libjava/include/posix-signal.h
index 726fde3a66e..7be37f59b1f 100644
--- a/libjava/include/posix-signal.h
+++ b/libjava/include/posix-signal.h
@@ -1,6 +1,6 @@
 // posix-signal.h - Catch runtime signals and turn them into exceptions.
 
-/* Copyright (C) 1998, 1999, 2000, 2009, 2011  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2009, 2011, 2012 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -20,8 +20,7 @@ details.  */
    SA_SIGINFO being set or fail if so.  Cf. gcc/ada/init.c
    (__gnat_install_handler) for details.  */
 
-#if (defined __alpha__ && defined __osf__) \
-  || (defined __sun__ && defined __svr4__)
+#if defined __sun__ && defined __svr4__
 #define SA_FLAGS SA_NODEFER | SA_SIGINFO
 #elif defined __sgi__
 #define SA_FLAGS SA_NODEFER
diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index c49da05eb11..6bd560c5a23 100644
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -1,6 +1,6 @@
 // posix.h -- Helper functions for POSIX-flavored OSs.
 
-/* Copyright (C) 2000, 2002, 2003, 2006, 2010  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003, 2006, 2010, 2012  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -11,11 +11,6 @@ details.  */
 #ifndef __JV_POSIX_H__
 #define __JV_POSIX_H__
 
-/* Required on Tru64 UNIX V4/V5 so <sys/socket.h> defines prototypes of
-   socket functions with socklen_t instead of size_t.  This must be defined
-   early so <standards.h> defines the correct version of __PIIX.  */
-#define _POSIX_PII_SOCKET
-
 #include <time.h>
 #include <sys/types.h>
 
@@ -155,15 +150,6 @@ _Jv_bind (int fd, struct sockaddr *addr, int addrlen)
 
 #undef bind
 
-// Same problem with accept on Tru64 UNIX with _POSIX_PII_SOCKET
-inline int
-_Jv_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
-{
-  return ::accept (fd, addr, addrlen);
-}
-
-#undef accept
-
 inline int
 _Jv_listen (int fd, int backlog)
 {
diff --git a/libjava/java/io/File.h b/libjava/java/io/File.h
index b53f6ab7d02..f1365361bce 100644
--- a/libjava/java/io/File.h
+++ b/libjava/java/io/File.h
@@ -25,8 +25,8 @@ class java::io::File : public ::java::lang::Object
 {
 
   jlong attr(jint);
-  jboolean _access(jint);
-  jboolean _stat(jint);
+  jboolean access(jint);
+  jboolean stat(jint);
   static void init_native();
 public:
   virtual jboolean canRead();
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 0c4fb6932f5..ff008e0643d 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -1,5 +1,5 @@
 /* File.java -- Class representing a file on disk
-   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2012
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,11 +79,8 @@ public class File implements Serializable, Comparable<File>
   private final static int LENGTH = 1;
   
   private final native long attr (int query);
-  // On OSF1 V5.0, `stat' is a macro.  It is easiest to use the name
-  // `_stat' instead.  We do the same thing for `_access' just in
-  // case.
-  private final native boolean _access (int query);
-  private final native boolean _stat (int query);
+  private final native boolean access (int query);
+  private final native boolean stat (int query);
 
   /**
    * This is the path separator string for the current host. This field
@@ -161,7 +158,7 @@ public class File implements Serializable, Comparable<File>
   public boolean canRead()
   {
     checkRead();
-    return _access (READ);
+    return access (READ);
   }
 
   /**
@@ -181,7 +178,7 @@ public class File implements Serializable, Comparable<File>
   public boolean canWrite()
   {
     checkWrite();
-    return _access (WRITE);
+    return access (WRITE);
   }
   
   /**
@@ -202,7 +199,7 @@ public class File implements Serializable, Comparable<File>
     if (!exists())
       return false;
     checkExec();
-    return _access (EXEC);
+    return access (EXEC);
   }
 
   private native boolean performCreate() throws IOException;
@@ -288,7 +285,7 @@ public class File implements Serializable, Comparable<File>
    */
   private boolean internalExists()
   {
-    return _access (EXISTS);
+    return access (EXISTS);
   }
   
   /**
@@ -725,7 +722,7 @@ public class File implements Serializable, Comparable<File>
    */
   private boolean internalIsDirectory()
   {
-    return _stat (DIRECTORY);
+    return stat (DIRECTORY);
   }
   
   /**
@@ -757,7 +754,7 @@ public class File implements Serializable, Comparable<File>
   public boolean isFile()
   {
     checkRead();
-    return _stat (ISFILE);
+    return stat (ISFILE);
   }
 
   /**
@@ -774,7 +771,7 @@ public class File implements Serializable, Comparable<File>
   public boolean isHidden()
   {
     checkRead();
-    return _stat (ISHIDDEN);
+    return stat (ISHIDDEN);
   }
 
   /**
diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc
index 5b6ec8458ac..2c255beacee 100644
--- a/libjava/java/io/natFilePosix.cc
+++ b/libjava/java/io/natFilePosix.cc
@@ -1,6 +1,6 @@
 // natFile.cc - Native part of File class for POSIX.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2008, 2012
    Free Software Foundation
 
    This file is part of libgcj.
@@ -38,7 +38,7 @@ details.  */
 #include <java/lang/System.h>
 
 jboolean
-java::io::File::_access (jint query)
+java::io::File::access (jint query)
 {
   char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1);
   jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
@@ -62,7 +62,7 @@ java::io::File::_access (jint query)
 }
 
 jboolean
-java::io::File::_stat (jint query)
+java::io::File::stat (jint query)
 {
   if (query == ISHIDDEN)
     return getName()->charAt(0) == '.';
diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc
index 316977b08a9..a8e88789222 100644
--- a/libjava/java/io/natFileWin32.cc
+++ b/libjava/java/io/natFileWin32.cc
@@ -1,6 +1,6 @@
 // natFileWin32.cc - Native part of File class for Win32.
 
-/* Copyright (C) 1998, 1999, 2002, 2003  Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2002, 2003, 2012 Free Software Foundation, Inc.
 
    This file is part of libgcj.
 
@@ -38,7 +38,7 @@ details.  */
 #define WIN32_EPOCH_MILLIS 11644473600000LL
 
 jboolean
-java::io::File::_access (jint query)
+java::io::File::access (jint query)
 {
   JV_TEMP_STRING_WIN32 (canon, getCanonicalPath());
   if (!canon)
@@ -63,7 +63,7 @@ java::io::File::_access (jint query)
 }
 
 jboolean
-java::io::File::_stat (jint query)
+java::io::File::stat (jint query)
 {
   JV_TEMP_STRING_WIN32 (canon, getCanonicalPath());
   if (!canon)
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index c84d86f2f2a..ebdee1b44c9 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -280,11 +280,6 @@ proc gcj_jni_get_cxxflags_invocation {} {
     lappend cxxflags "-shared-libgcc"
   }
 
-  # Tru64 UNIX needs -liconv linked explicitly since gcc does the linking.
-  if { [istarget "alpha*-dec-osf*"] } {
-    lappend cxxflags $libiconv
-  }
-
   return $cxxflags
 }
 
diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
index fd660f35164..62c82e92afc 100644
--- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
@@ -37,10 +37,6 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
   if { [istarget "arm*"] } {
       lappend options "additional_flags=-Wno-abi"
   }
-  # Tru64 UNIX requires <pthread.h> to be compiled with -pthread.
-  if { [istarget "alpha*-dec-osf*"] } {
-      lappend options "additional_flags=-pthread"
-  }
 
   set filename [file tail $file]
   set name [file rootname $filename]
diff --git a/libjava/testsuite/libjava.jvmti/jvmti.exp b/libjava/testsuite/libjava.jvmti/jvmti.exp
index 2d939852e5e..571952e807c 100644
--- a/libjava/testsuite/libjava.jvmti/jvmti.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti.exp
@@ -20,10 +20,6 @@ proc gcj_jvmti_compile_cxx_to_o {file {options {}}} {
   if { [istarget "arm*"] } {
       lappend options "additional_flags=-Wno-abi"
   }
-  # Tru64 UNIX requires <pthread.h> to be compiled with -pthread.
-  if { [istarget "alpha*-dec-osf*"] } {
-      lappend options "additional_flags=-pthread"
-  }
 
   set x [libjava_prune_warnings \
 	   [target_compile $file $oname object $options]]