summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2010-08-27 04:27:40 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2010-08-27 04:27:40 +0000
commitcda5fe864d366d244bbfb4da6d492cfc837dea7d (patch)
treef65631ede4a921c4935389a45f2258cc29d1a33d
parent2f1887bd485c2c34b5f1e5bc300db4b9afaf0e23 (diff)
downloadgcc-cda5fe864d366d244bbfb4da6d492cfc837dea7d.tar.gz
Fix building ecjx in cross compile mode.
libjava/: PR libgcj/40868 * configure.ac: Add GCC_FOR_ECJX variable. Ensure GCJ_FOR_ECJX is always set. * Makefile.am [!NATIVE] (ecjx.$(OBJEXT)): New rule. * Makefile.in: Regenerate. * configure: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163580 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog13
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in3
-rwxr-xr-xlibjava/configure12
-rw-r--r--libjava/configure.ac5
-rw-r--r--libjava/gcj/Makefile.in1
-rw-r--r--libjava/include/Makefile.in1
-rw-r--r--libjava/testsuite/Makefile.in1
8 files changed, 33 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 986bd78cde1..7094149fb2c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-27 Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+ Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ PR libgcj/40868
+ * configure.ac: Add GCC_FOR_ECJX variable. Ensure
+ GCJ_FOR_ECJX is always set.
+ * Makefile.am [!NATIVE] (ecjx.$(OBJEXT)): New rule.
+ * Makefile.in: Regenerate.
+ * configure: Regenerate.
+ * gcj/Makefile.in: Regenerate.
+ * include/Makefile.in: Regenerate.
+ * testsuite/Makefile.in: Regenerate.
+
2010-08-18 Jack Howarth <howarth@bromo.med.uc.edu>
* libjava/configure.ac (THREADLIBS): Don't set on Darwin.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index dcdf8273007..52d09955609 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1170,6 +1170,8 @@ ecjx_LINK = $(GCJ_FOR_ECJX_LINK) $(ecjx_LDFLAGS)
ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
ecjx_LDADD =
ecjx_DEPENDENCIES =
+ecjx.$(OBJEXT): ecjx.cc
+ $(GCC_FOR_ECJX) -c $<
endif !NATIVE
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 591624c66e3..c29d5cd1c31 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -550,6 +550,7 @@ EGREP = @EGREP@
EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCC_FOR_ECJX = @GCC_FOR_ECJX@
GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
GCDEPS = @GCDEPS@
GCINCS = @GCINCS@
@@ -12632,6 +12633,8 @@ write-entries-to-file-check:
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ >> tmp-0212; \
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ mv tmp-0212 $(srcdir)/gnu/gcj/convert/JIS0212.h
+@NATIVE_FALSE@ecjx.$(OBJEXT): ecjx.cc
+@NATIVE_FALSE@ $(GCC_FOR_ECJX) -c $<
src.zip:
-rm -f src.zip
diff --git a/libjava/configure b/libjava/configure
index 955332bb2d0..8fa4baffd68 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -773,6 +773,7 @@ LIBLTDL
INCLTDL
host_exeext
GCJH
+GCC_FOR_ECJX
GCJ_FOR_ECJX
X_AWT_FALSE
X_AWT_TRUE
@@ -6703,7 +6704,8 @@ NATIVE=yes
# Which gcj and host gcj (for ecjx) do we use?
which_gcj=default
host_exeext=${ac_exeext}
-GCJ_FOR_ECJX=
+GCJ_FOR_ECJX='$(GCJ)'
+GCC_FOR_ECJX='$(CXX)'
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
if test -n "${with_cross_host}"; then
# We are being configured with a cross compiler. We can't
@@ -6711,6 +6713,7 @@ if test -n "${with_cross_host}"; then
NATIVE=no
cross_host_exeext=
GCJ_FOR_ECJX="${with_cross_host}-gcj"
+ GCC_FOR_ECJX="${with_cross_host}-gcc"
case "${with_cross_host}" in
*mingw* | *cygwin*)
cross_host_exeext=.exe
@@ -6779,6 +6782,7 @@ export JAVAC
+
# Create it, so that compile/link tests don't fail
test -f libgcj.spec || touch libgcj.spec
@@ -13349,7 +13353,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13352 "configure"
+#line 13356 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13455,7 +13459,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13458 "configure"
+#line 13462 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19434,7 +19438,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
enableval=$enable_sjlj_exceptions; :
else
cat > conftest.$ac_ext << EOF
-#line 19437 "configure"
+#line 19441 "configure"
struct S { ~S(); };
void bar();
void foo()
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 685cb725575..df6bca3f662 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -394,7 +394,8 @@ NATIVE=yes
# Which gcj and host gcj (for ecjx) do we use?
which_gcj=default
host_exeext=${ac_exeext}
-GCJ_FOR_ECJX=
+GCJ_FOR_ECJX='$(GCJ)'
+GCC_FOR_ECJX='$(CXX)'
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
if test -n "${with_cross_host}"; then
# We are being configured with a cross compiler. We can't
@@ -402,6 +403,7 @@ if test -n "${with_cross_host}"; then
NATIVE=no
cross_host_exeext=
GCJ_FOR_ECJX="${with_cross_host}-gcj"
+ GCC_FOR_ECJX="${with_cross_host}-gcc"
case "${with_cross_host}" in
*mingw* | *cygwin*)
cross_host_exeext=.exe
@@ -467,6 +469,7 @@ JAVAC="$GCJ -C"
export JAVAC
AC_SUBST(GCJ_FOR_ECJX)
+AC_SUBST(GCC_FOR_ECJX)
AC_SUBST(GCJH)
AC_SUBST(host_exeext)
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index 6dcf2f73e94..b2f6f149174 100644
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -133,6 +133,7 @@ EGREP = @EGREP@
EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCC_FOR_ECJX = @GCC_FOR_ECJX@
GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
GCDEPS = @GCDEPS@
GCINCS = @GCINCS@
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index 0983eefc03f..5df713e1fc4 100644
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -134,6 +134,7 @@ EGREP = @EGREP@
EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCC_FOR_ECJX = @GCC_FOR_ECJX@
GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
GCDEPS = @GCDEPS@
GCINCS = @GCINCS@
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index c91dfc5e0ab..37f81c21005 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -109,6 +109,7 @@ EGREP = @EGREP@
EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GCC_FOR_ECJX = @GCC_FOR_ECJX@
GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
GCDEPS = @GCDEPS@
GCINCS = @GCINCS@