procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/17290 (Wrong Java dependencies are generated)

Browse source 
2004-09-03  Bryce McKinlay  <mckinlay@redhat.com>
            H.J. Lu  <hongjiu.lu@intel.com>

	PR libgcj/17290
	* Makefile.am (GCJCOMPILE): Remove definition.
	(AM_CFLAGS): Add -fclasspath and -fbootclasspath flags.
	Use LTGCJCOMPILE, not GCJCOMPILE, to build .lo targets.
	* Makefile.in: Rebuilt.

Co-Authored-By: H.J. Lu <hongjiu.lu@intel.com>

From-SVN: r87074
This commit is contained in:
Bryce McKinlay 2004-09-04 03:30:12 +00:00 • committed by Bryce McKinlay
parent 40923b202d
commit 351cfd8b8d
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libjava/ChangeLog
View file

@ -1,3 +1,12 @@
2004-09-03 Bryce McKinlay <mckinlay@redhat.com>
H.J. Lu <hongjiu.lu@intel.com>
PR libgcj/17290
* Makefile.am (GCJCOMPILE): Remove definition.
(AM_CFLAGS): Add -fclasspath and -fbootclasspath flags.
Use LTGCJCOMPILE, not GCJCOMPILE, to build .lo targets.
* Makefile.in: Rebuilt.
2004-09-03 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac (enable-gc-debug): Update help for new syntax.

10
libjava/Makefile.am
View file

@ -137,7 +137,6 @@ ZIP = @ZIP@
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
@ -170,6 +169,7 @@ AM_CXXFLAGS = \
AM_GCJFLAGS = \
@LIBGCJ_JAVAFLAGS@ \
-fclasspath= -fbootclasspath=$(here) \
--encoding=UTF-8 \
-Wno-deprecated
@ -453,7 +453,7 @@ gnu/regexp/MessagesBundle_fr.properties
propertyo_files = $(property_files:.properties=.properties.lo)
%.properties.lo: %.properties
$(GCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
$(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
if ONESTEP
@ -519,16 +519,16 @@ SUFFIXES = .class .java .h .properties
## Note: we omit StackTrace here, since it has an explicit rule a bit
## later, and GNU make will warn in this case.
$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java
$(GCJCOMPILE) -o $@ $<
$(LTGCJCOMPILE) -o $@ -c $<
$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
$(GCJCOMPILE) -fjni -o $@ $<
$(LTGCJCOMPILE) -fjni -o $@ -c $<
## A special case. The sibcall optimization can change the number of
## frames on the stack, and StackTrace makes assumptions about this
## number.
gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java
$(GCJCOMPILE) -fno-optimize-sibling-calls -o $@ $<
$(LTGCJCOMPILE) -fno-optimize-sibling-calls -o $@ -c $<
lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES)
@echo Creating list of files to link...

11
libjava/Makefile.in
View file

@ -3827,6 +3827,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
$(GCJFLAGS)
GCJLD = $(GCJ)
@ -4129,7 +4130,6 @@ secdir = $(libdir)/security
propdir = $(libdir)
bin_SCRIPTS = addr2name.awk
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
JAVAC = $(GCJ_WITH_FLAGS) -C
@ -4152,6 +4152,7 @@ AM_CXXFLAGS = \
AM_GCJFLAGS = \
@LIBGCJ_JAVAFLAGS@ \
-fclasspath= -fbootclasspath=$(here) \
--encoding=UTF-8 \
-Wno-deprecated
@ -21748,7 +21749,7 @@ $(gtk_jni_headers): $(gtk_awt_peer_sources)
$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
%.properties.lo: %.properties
$(GCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
$(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
# Compile all classfiles in one go.
@ -21793,13 +21794,13 @@ clean-nat:
rm -f $(nat_files) $(xlib_nat_files)
$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java
$(GCJCOMPILE) -o $@ $<
$(LTGCJCOMPILE) -o $@ -c $<
$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
$(GCJCOMPILE) -fjni -o $@ $<
$(LTGCJCOMPILE) -fjni -o $@ -c $<
gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java
$(GCJCOMPILE) -fno-optimize-sibling-calls -o $@ $<
$(LTGCJCOMPILE) -fno-optimize-sibling-calls -o $@ -c $<
lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES)
@echo Creating list of files to link...