This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH: PR libgcj/30550: Missing dependencies for ecjx target
- From: "H. J. Lu" <hjl at lucon dot org>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Tue, 23 Jan 2007 11:42:02 -0800
- Subject: Re: PATCH: PR libgcj/30550: Missing dependencies for ecjx target
- References: <20070123030204.GA27096@lucon.org> <m3veixok5j.fsf@localhost.localdomain>
On Tue, Jan 23, 2007 at 08:08:40AM -0700, Tom Tromey wrote:
> >>>>> "H.J." == H J Lu <hjl@lucon.org> writes:
>
> H.J.> LIBGCJ_SPEC="%{s-bc-abi:-lgcj_bc;:-lgcj}"
>
> H.J.> libgcj_bc will be used with libgcj.spec if $use_libgcj_bc is yes.
> H.J.> But there is no such dependency in Makefile.am for targets depend
> H.J.> on libgcj.spec. This patch adds libgcj_bc dependency when
> H.J.> $use_libgcj_bc is yes.
>
> I think we should only need this dependency when linking with
> -findirect-dispatch, i.e., only in one case when linking ecjx.
I don't know much about Java. I will take your word for it. Here is
the patch to make it ecjx only.
H.J.
---
2007-01-22 H.J. Lu <hongjiu.lu@intel.com>
PR libgcj/30550
* Makefile.am (ecjx_DEPENDENCIES): Add libgcj_bc.la if needed.
* Makefile.in: Regenerated.
--- libjava/Makefile.am.ejcx 2007-01-22 13:26:14.000000000 -0800
+++ libjava/Makefile.am 2007-01-22 15:49:17.000000000 -0800
@@ -678,6 +678,9 @@ endif !ENABLE_SHARED
ecjx_LDADD = -L$(here)/.libs libgcj.la
ecjx_DEPENDENCIES = libgcj.la libgcj.spec
+if USE_LIBGCJ_BC
+ecjx_DEPENDENCIES += libgcj_bc.la
+endif
else !NATIVE
--- libjava/Makefile.in.ejcx 2007-01-22 13:26:14.000000000 -0800
+++ libjava/Makefile.in 2007-01-22 15:49:45.000000000 -0800
@@ -74,7 +74,8 @@ DIST_COMMON = README $(am__configure_dep
$(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT)
-@XLIB_AWT_TRUE@am__append_15 = $(xlib_nat_headers)
+@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_15 = libgcj_bc.la
+@XLIB_AWT_TRUE@am__append_16 = $(xlib_nat_headers)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -7799,7 +7800,8 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
@NATIVE_FALSE@ecjx_LDADD =
@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
@NATIVE_FALSE@ecjx_DEPENDENCIES =
-@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec
+@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
+@NATIVE_TRUE@ $(am__append_15)
gappletviewer_SOURCES =
gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
@@ -7990,7 +7992,7 @@ gnu/gcj/xlib/natXImage.cc \
gnu/gcj/xlib/natXUnmapEvent.cc
sourcesdir = $(jardir)
-headers_to_make = $(nat_headers) $(am__append_15)
+headers_to_make = $(nat_headers) $(am__append_16)
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and