Commit d6f6aaf6 by Mohan Embar Committed by Tom Tromey

Makefile.am: Use cross-compiling gcjh from the path for a crossed-native build.

2003-07-26  Mohan Embar  <gnustuff@thisiscool.com>
	    Ranjit Mathew  <rmathew@hotmail.com>

	* Makefile.am: Use cross-compiling gcjh from the path for
	a crossed-native build.
	* Makefile.in: Rebuilt.
	* configure.in: Include libltdl in non-newlib builds.
	Moved determination of gcj used to build libraries to
	its own section. Fixed cross-compilation issues for
	non-newlib builds.
	* configure: Rebuilt.

Co-Authored-By: Ranjit Mathew <rmathew@hotmail.com>

From-SVN: r69836
parent f369aae4
2003-07-26 Mohan Embar <gnustuff@thisiscool.com>
Ranjit Mathew <rmathew@hotmail.com>
* Makefile.am: Use cross-compiling gcjh from the path for
a crossed-native build.
* Makefile.in: Rebuilt.
* configure.in: Include libltdl in non-newlib builds.
Moved determination of gcj used to build libraries to
its own section. Fixed cross-compilation issues for
non-newlib builds.
* configure: Rebuilt.
2003-07-25 Tom Tromey <tromey@redhat.com>
* java/io/natFileDescriptorPosix.cc (write): Try again on EINTR.
......
......@@ -64,10 +64,11 @@ if NULL_TARGET
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
GCJH = gcjh
else
ZIP = jar
GCJH = $(target_alias)-gcjh
endif
GCJH = gcjh
else # CANADIAN
GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
......
......@@ -176,7 +176,8 @@ bin_SCRIPTS = addr2name.awk
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
@CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh
@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
......@@ -3095,8 +3096,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/awt/GraphicsConfiguration.P .deps/java/awt/GraphicsDevice.P \
.deps/java/awt/GraphicsEnvironment.P \
.deps/java/awt/GridBagConstraints.P .deps/java/awt/GridBagLayout.P \
.deps/java/awt/GridBagLayoutInfo.P \
.deps/java/awt/GridLayout.P .deps/java/awt/HeadlessException.P \
.deps/java/awt/GridBagLayoutInfo.P .deps/java/awt/GridLayout.P \
.deps/java/awt/HeadlessException.P \
.deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \
.deps/java/awt/ImageCapabilities.P .deps/java/awt/Insets.P \
.deps/java/awt/ItemSelectable.P .deps/java/awt/JobAttributes.P \
......
......@@ -23,8 +23,8 @@ LIBGCJ_CONFIGURE(.)
AM_CONFIG_HEADER(include/config.h gcj/libgcj-config.h)
# Only use libltdl for native builds.
if test -z "${with_cross_host}"; then
# Only use libltdl for non-newlib builds.
if test "x${with_newlib}" = "xno"; then
AC_LIBLTDL_CONVENIENCE
AC_LIBTOOL_DLOPEN
DIRLTDL=libltdl
......@@ -555,16 +555,6 @@ if test "x${with_newlib}" = "xyes"; then
dnl Assume we do not have getuid and friends.
AC_DEFINE(NO_GETUID)
# If Canadian cross, then don't pick up tools from the build
# directory.
if test x"$build" != x"$with_cross_host" \
&& test x"$build" != x"$target"; then
CANADIAN=yes
GCC_UNWIND_INCLUDE=
GCJ="${target_alias}-gcj"
fi
NATIVE=no
PLATFORMNET=NoNet
else
AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep opendir)
......@@ -809,15 +799,69 @@ changequote(<<,>>)
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
changequote([,])
fi
if test -x "${builddotdot}/../../gcc/gcj"; then
dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`"
GCJ="$dir/gcj -B`${PWDCMD-pwd}`/ -B$dir/"
else
fi
# Which gcj do we use?
which_gcj=default
built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`"
if test -n "${with_cross_host}"; then
# We are being configured with a cross compiler. We can't
# use ac_exeext, because that is for the target platform.
NATIVE=no
cross_host_exeext=
case "${with_cross_host}" in
*mingw* | *cygwin*)
cross_host_exeext=.exe
;;
esac
if test -x "${built_gcc_dir}/gcj${cross_host_exeext}"; then
if test x"$build" = x"$with_cross_host"; then
# Ordinary cross (host!=target and host=build)
which_gcj=built
else
# Canadian cross (host!=target and host!=build)
which_gcj=cross
fi
else
which_gcj=cross
fi
else
# We are being configured with a native or crossed-native compiler
if test -x "${built_gcc_dir}/gcj${ac_exeext}"; then
if test x"$build" = x"$host"; then
# True native build (host=target and host=build)
which_gcj=built
else
# Crossed-native build (host=target and host!=build)
which_gcj=cross
fi
else
which_gcj=path
fi
fi
case "${which_gcj}" in
built)
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
;;
cross)
# See the comment in Makefile.am about CANADIAN being a misnomer
CANADIAN=yes
NULL_TARGET=no
if test "x${with_newlib}" = "xyes"; then
# FIXME (comment): Why is this needed?
GCC_UNWIND_INCLUDE=
GCJ="${target_alias}-gcj"
else
GCJ="${target_alias}-gcj -B`${PWDCMD-pwd}`/"
fi
;;
path)
# See the comment in Makefile.am about CANADIAN being a misnomer
CANADIAN=yes
NULL_TARGET=yes
GCJ="gcj -B`${PWDCMD-pwd}`/"
fi
fi
;;
esac
# Create it, so that compile/link tests don't fail
test -f libgcj.spec || touch libgcj.spec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment