diff options
Diffstat (limited to 'gcc47-cross-ecjx.patch')
| -rw-r--r-- | gcc47-cross-ecjx.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/gcc47-cross-ecjx.patch b/gcc47-cross-ecjx.patch new file mode 100644 index 0000000..16179d1 --- /dev/null +++ b/gcc47-cross-ecjx.patch @@ -0,0 +1,52 @@ +--- a/libjava/configure.ac 2013-06-27 23:25:19.370920178 -0500 ++++ b/libjava/configure.ac 2013-06-27 23:25:44.904921607 -0500 +@@ -414,8 +414,8 @@ if test -n "${with_cross_host}"; then + # use ac_exeext, because that is for the target platform. + NATIVE=no + cross_host_exeext= +- GCJ_FOR_ECJX="${with_cross_host}-gcj" +- GCC_FOR_ECJX="${with_cross_host}-gcc" ++ GCJ_FOR_ECJX="gcj" ++ GCC_FOR_ECJX="gcc" + case "${with_cross_host}" in + *mingw* | *cygwin*) + cross_host_exeext=.exe +--- a/libjava/configure 2013-06-27 23:25:22.521920354 -0500 ++++ b/libjava/configure 2013-06-27 23:25:57.828922331 -0500 +@@ -6726,8 +6726,8 @@ if test -n "${with_cross_host}"; then + # use ac_exeext, because that is for the target platform. + NATIVE=no + cross_host_exeext= +- GCJ_FOR_ECJX="${with_cross_host}-gcj" +- GCC_FOR_ECJX="${with_cross_host}-gcc" ++ GCJ_FOR_ECJX="gcj" ++ GCC_FOR_ECJX="gcc" + case "${with_cross_host}" in + *mingw* | *cygwin*) + cross_host_exeext=.exe +--- a/libjava/Makefile.am 2011-08-05 09:37:48.000000000 -0500 ++++ b/libjava/Makefile.am 2012-06-12 02:57:16.508693300 -0500 +@@ -1167,7 +1167,11 @@ endif + else !NATIVE + + ecjx_LINK = $(GCJ_FOR_ECJX_LINK) $(ecjx_LDFLAGS) ++if INSTALL_ECJ_JAR + ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) ++else ++ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR) ++endif + ecjx_LDADD = + ecjx_DEPENDENCIES = + ecjx.$(OBJEXT): ecjx.cc +--- a/libjava/Makefile.in 2012-06-12 03:04:48.185527700 -0500 ++++ b/libjava/Makefile.in 2012-03-22 02:37:39.000000000 -0500 +@@ -8445,7 +8445,8 @@ ECJX_BASE_FLAGS = -findirect-dispatch \ + @NATIVE_TRUE@ecjx_LINK = $(GCJLINK) $(ecjx_LDFLAGS) + @ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH) + @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR) +-@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) ++@INSTALL_ECJ_JAR_FALSE@@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR) ++@INSTALL_ECJ_JAR_TRUE@@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) + @NATIVE_FALSE@ecjx_LDADD = + @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \ + @NATIVE_TRUE@ $(am__append_28) |