configure: Rebuilt.
* configure: Rebuilt. * configure.in: Set classpath when invoking gcj. Use changequote around sed invocation. * java/net/natPlainSocketImpl.cc: Stub native functions if DISABLE_JAVA_NET is defined. * java/net/natPlainDatagramSocketImpl.cc (setTimeToLive): Fixed typo in exception string. (getTimeToLive): Likewise. Stub native functions if DISABLE_JAVA_NET is defined. * java/net/natInetAddress.cc: Stub native functions if DISABLE_JAVA_NET is defined. * configure.host: Disable java.net for mips-tx39. * configure, include/config.h.in: Rebuilt. * acconfig.h (DISABLE_JAVA_NET): Undefine. * configure.in: Added --disable-java-net and new define `DISABLE_JAVA_NET'. From-SVN: r29759
This commit is contained in:
parent
95f1a0447f
commit
4b68fe8a36
9 changed files with 414 additions and 210 deletions
|
@ -1,3 +1,23 @@
|
||||||
|
1999-10-01 Tom Tromey <tromey@cygnus.com>
|
||||||
|
|
||||||
|
* configure: Rebuilt.
|
||||||
|
* configure.in: Set classpath when invoking gcj. Use changequote
|
||||||
|
around sed invocation.
|
||||||
|
|
||||||
|
* java/net/natPlainSocketImpl.cc: Stub native functions if
|
||||||
|
DISABLE_JAVA_NET is defined.
|
||||||
|
* java/net/natPlainDatagramSocketImpl.cc (setTimeToLive): Fixed
|
||||||
|
typo in exception string.
|
||||||
|
(getTimeToLive): Likewise.
|
||||||
|
Stub native functions if DISABLE_JAVA_NET is defined.
|
||||||
|
* java/net/natInetAddress.cc: Stub native functions if
|
||||||
|
DISABLE_JAVA_NET is defined.
|
||||||
|
* configure.host: Disable java.net for mips-tx39.
|
||||||
|
* configure, include/config.h.in: Rebuilt.
|
||||||
|
* acconfig.h (DISABLE_JAVA_NET): Undefine.
|
||||||
|
* configure.in: Added --disable-java-net and new define
|
||||||
|
`DISABLE_JAVA_NET'.
|
||||||
|
|
||||||
1999-09-30 Tom Tromey <tromey@cygnus.com>
|
1999-09-30 Tom Tromey <tromey@cygnus.com>
|
||||||
|
|
||||||
* java/net/natPlainDatagramSocketImpl.cc: Indentation fix.
|
* java/net/natPlainDatagramSocketImpl.cc: Indentation fix.
|
||||||
|
|
|
@ -109,3 +109,6 @@
|
||||||
|
|
||||||
/* Define if pthread_mutex_t has __m_count member. */
|
/* Define if pthread_mutex_t has __m_count member. */
|
||||||
#undef PTHREAD_MUTEX_HAVE___M_COUNT
|
#undef PTHREAD_MUTEX_HAVE___M_COUNT
|
||||||
|
|
||||||
|
/* Define if java.net native functions should be stubbed out. */
|
||||||
|
#undef DISABLE_JAVA_NET
|
||||||
|
|
436
libjava/configure
vendored
436
libjava/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -52,6 +52,7 @@ case "${host}" in
|
||||||
AM_RUNTESTFLAGS="--target_board=jmr3904-sim"
|
AM_RUNTESTFLAGS="--target_board=jmr3904-sim"
|
||||||
# Use "Ecos" processes since they are a no-op.
|
# Use "Ecos" processes since they are a no-op.
|
||||||
PROCESS=Ecos
|
PROCESS=Ecos
|
||||||
|
enable_java_net_default=no
|
||||||
;;
|
;;
|
||||||
i686-*|i586-*)
|
i686-*|i586-*)
|
||||||
libgcj_flags="${libgcj_flags} -ffloat-store"
|
libgcj_flags="${libgcj_flags} -ffloat-store"
|
||||||
|
|
|
@ -50,6 +50,19 @@ AC_ARG_ENABLE(interpreter,
|
||||||
AC_DEFINE(INTERPRETER)
|
AC_DEFINE(INTERPRETER)
|
||||||
fi)
|
fi)
|
||||||
|
|
||||||
|
dnl See if the user wants to disable java.net. This is the mildly
|
||||||
|
dnl ugly way that we admit that target-side configuration sucks.
|
||||||
|
AC_ARG_ENABLE(java-net,
|
||||||
|
[ --disable-java-net disable java.net])
|
||||||
|
|
||||||
|
dnl Whether java.net is built by default can depend on the target.
|
||||||
|
if test -n "$enable_java_net"; then
|
||||||
|
enable_java_net=${enable_java_net_default-yes}
|
||||||
|
fi
|
||||||
|
if test "$enable_java_net" != yes; then
|
||||||
|
AC_DEFINE(DISABLE_JAVA_NET)
|
||||||
|
fi
|
||||||
|
|
||||||
dnl If the target is an eCos system, use the appropriate eCos
|
dnl If the target is an eCos system, use the appropriate eCos
|
||||||
dnl I/O routines.
|
dnl I/O routines.
|
||||||
dnl FIXME: this should not be a local option but a global target
|
dnl FIXME: this should not be a local option but a global target
|
||||||
|
@ -516,7 +529,9 @@ if test "$GCJ" = ""; then
|
||||||
if test -z "${with_multisubdir}"; then
|
if test -z "${with_multisubdir}"; then
|
||||||
builddotdot=.
|
builddotdot=.
|
||||||
else
|
else
|
||||||
|
changequote(<<,>>)
|
||||||
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
|
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
|
||||||
|
changequote([,])
|
||||||
fi
|
fi
|
||||||
dir="`cd ${builddotdot}/../../gcc && pwd`"
|
dir="`cd ${builddotdot}/../../gcc && pwd`"
|
||||||
GCJ="$dir/gcj -B$dir/"
|
GCJ="$dir/gcj -B$dir/"
|
||||||
|
@ -533,7 +548,8 @@ cat > conftest.java << 'END'
|
||||||
public class conftest { }
|
public class conftest { }
|
||||||
END
|
END
|
||||||
use_fuse=yes
|
use_fuse=yes
|
||||||
$GCJ -fuse-divide-subroutine -fsyntax-only conftest.java > /dev/null 2>&1 \
|
$GCJ -classpath $srcdir -fuse-divide-subroutine -fsyntax-only \
|
||||||
|
conftest.java > /dev/null 2>&1 \
|
||||||
|| use_fuse=no
|
|| use_fuse=no
|
||||||
rm -f conftest.java
|
rm -f conftest.java
|
||||||
if test "$use_fuse" = no; then
|
if test "$use_fuse" = no; then
|
||||||
|
|
|
@ -125,6 +125,9 @@
|
||||||
/* Define if pthread_mutex_t has __m_count member. */
|
/* Define if pthread_mutex_t has __m_count member. */
|
||||||
#undef PTHREAD_MUTEX_HAVE___M_COUNT
|
#undef PTHREAD_MUTEX_HAVE___M_COUNT
|
||||||
|
|
||||||
|
/* Define if java.net native functions should be stubbed out. */
|
||||||
|
#undef DISABLE_JAVA_NET
|
||||||
|
|
||||||
/* Define if you have the access function. */
|
/* Define if you have the access function. */
|
||||||
#undef HAVE_ACCESS
|
#undef HAVE_ACCESS
|
||||||
|
|
||||||
|
|
|
@ -49,6 +49,28 @@ details. */
|
||||||
extern "C" int gethostname (char *name, int namelen);
|
extern "C" int gethostname (char *name, int namelen);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef DISABLE_JAVA_NET
|
||||||
|
|
||||||
|
jbyteArray
|
||||||
|
java::net::InetAddress::aton (jstring)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
JArray<java::net::InetAddress*> *
|
||||||
|
java::net::InetAddress::lookup (jstring, java::net::InetAddress *, jboolean)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
jstring
|
||||||
|
java::net::InetAddress::getLocalHostname ()
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* DISABLE_JAVA_NET */
|
||||||
|
|
||||||
jbyteArray
|
jbyteArray
|
||||||
java::net::InetAddress::aton (jstring host)
|
java::net::InetAddress::aton (jstring host)
|
||||||
{
|
{
|
||||||
|
@ -300,3 +322,5 @@ java::net::InetAddress::getLocalHostname ()
|
||||||
// anyway, thanks to the InetAddress.localhost cache.
|
// anyway, thanks to the InetAddress.localhost cache.
|
||||||
return JvNewStringUTF (chars);
|
return JvNewStringUTF (chars);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* DISABLE_JAVA_NET */
|
||||||
|
|
|
@ -47,6 +47,71 @@ details. */
|
||||||
#include <java/lang/Boolean.h>
|
#include <java/lang/Boolean.h>
|
||||||
#include <java/lang/Integer.h>
|
#include <java/lang/Integer.h>
|
||||||
|
|
||||||
|
#ifdef DISABLE_JAVA_NET
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::create ()
|
||||||
|
{
|
||||||
|
JvThrow (new SocketException (JvNewStringLatin1 ("DatagramSocketImpl.create: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::bind (jint, java::net::InetAddress *)
|
||||||
|
{
|
||||||
|
JvThrow (new BindException (JvNewStringLatin1 ("DatagramSocketImpl.bind: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
jint
|
||||||
|
java::net::PlainDatagramSocketImpl::peek (java::net::InetAddress *)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("DatagramSocketImpl.peek: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("DatagramSocketImpl.send: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("DatagramSocketImpl.receive: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::setTimeToLive (jint)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("DatagramSocketImpl.setTimeToLive: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
jint
|
||||||
|
java::net::PlainDatagramSocketImpl::getTimeToLive ()
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("DatagramSocketImpl.getTimeToLive: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *,
|
||||||
|
jboolean)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("DatagramSocketImpl.mcastGrp: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainDatagramSocketImpl::setOption (jint, java::lang::Object *)
|
||||||
|
{
|
||||||
|
JvThrow (new SocketException (JvNewStringLatin1 ("DatagramSocketImpl.setOption: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
java::lang::Object *
|
||||||
|
java::net::PlainDatagramSocketImpl::getOption (jint)
|
||||||
|
{
|
||||||
|
JvThrow (new SocketException (JvNewStringLatin1 ("DatagramSocketImpl.getOption: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* DISABLE_JAVA_NET */
|
||||||
|
|
||||||
#ifndef HAVE_SOCKLEN_T
|
#ifndef HAVE_SOCKLEN_T
|
||||||
typedef int socklen_t;
|
typedef int socklen_t;
|
||||||
#endif
|
#endif
|
||||||
|
@ -296,7 +361,7 @@ java::net::PlainDatagramSocketImpl::setTimeToLive (jint ttl)
|
||||||
|
|
||||||
char msg[100];
|
char msg[100];
|
||||||
char* strerr = strerror (errno);
|
char* strerr = strerror (errno);
|
||||||
sprintf (msg, "DatagramSocketImpl.setTimeToLime: %.*s", 80, strerr);
|
sprintf (msg, "DatagramSocketImpl.setTimeToLive: %.*s", 80, strerr);
|
||||||
JvThrow (new java::io::IOException (JvNewStringUTF (msg)));
|
JvThrow (new java::io::IOException (JvNewStringUTF (msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -311,7 +376,7 @@ java::net::PlainDatagramSocketImpl::getTimeToLive ()
|
||||||
|
|
||||||
char msg[100];
|
char msg[100];
|
||||||
char* strerr = strerror (errno);
|
char* strerr = strerror (errno);
|
||||||
sprintf (msg, "DatagramSocketImpl.setTimeToLime: %.*s", 80, strerr);
|
sprintf (msg, "DatagramSocketImpl.getTimeToLive: %.*s", 80, strerr);
|
||||||
JvThrow (new java::io::IOException (JvNewStringUTF (msg)));
|
JvThrow (new java::io::IOException (JvNewStringUTF (msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -573,3 +638,5 @@ java::net::PlainDatagramSocketImpl::getOption (jint optID)
|
||||||
sprintf (msg, "DatagramSocketImpl.getOption: %.*s", 80, strerr);
|
sprintf (msg, "DatagramSocketImpl.getOption: %.*s", 80, strerr);
|
||||||
JvThrow (new java::net::SocketException (JvNewStringUTF (msg)));
|
JvThrow (new java::net::SocketException (JvNewStringUTF (msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* DISABLE_JAVA_NET */
|
||||||
|
|
|
@ -41,6 +41,52 @@ details. */
|
||||||
#include <java/lang/Class.h>
|
#include <java/lang/Class.h>
|
||||||
#include <java/lang/Integer.h>
|
#include <java/lang/Integer.h>
|
||||||
|
|
||||||
|
#ifdef DISABLE_JAVA_NET
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainSocketImpl::create (jboolean)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("SocketImpl.create: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainSocketImpl::bind (java::net::InetAddress *, jint)
|
||||||
|
{
|
||||||
|
JvThrow (new BindException (JvNewStringLatin1 ("SocketImpl.bind: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainSocketImpl::connect (java::net::InetAddress *, jint)
|
||||||
|
{
|
||||||
|
JvThrow (new ConnectException (JvNewStringLatin1 ("SocketImpl.connect: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainSocketImpl::listen (jint)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("SocketImpl.listen: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *)
|
||||||
|
{
|
||||||
|
JvThrow (new java::io::IOException (JvNewStringLatin1 ("SocketImpl.accept: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
java::net::PlainSocketImpl::setOption (jint, java::lang::Object *)
|
||||||
|
{
|
||||||
|
JvThrow (new SocketException (JvNewStringLatin1 ("SocketImpl.setOption: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
java::lang::Object *
|
||||||
|
java::net::PlainSocketImpl::getOption (jint)
|
||||||
|
{
|
||||||
|
JvThrow (new SocketException (JvNewStringLatin1 ("SocketImpl.create: unimplemented")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* DISABLE_JAVA_NET */
|
||||||
|
|
||||||
#ifndef HAVE_SOCKLEN_T
|
#ifndef HAVE_SOCKLEN_T
|
||||||
typedef int socklen_t;
|
typedef int socklen_t;
|
||||||
#endif
|
#endif
|
||||||
|
@ -422,3 +468,5 @@ java::net::PlainSocketImpl::getOption (jint optID)
|
||||||
sprintf (msg, "SocketImpl.getOption: %.*s", 80, strerr);
|
sprintf (msg, "SocketImpl.getOption: %.*s", 80, strerr);
|
||||||
JvThrow (new java::net::SocketException (JvNewStringUTF (msg)));
|
JvThrow (new java::net::SocketException (JvNewStringUTF (msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* DISABLE_JAVA_NET */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue