diff options
| author | Tom Tromey <tromey@redhat.com> | 2004-01-15 18:29:29 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-01-15 18:29:29 +0000 |
| commit | e18243dd1d0edb102f67ef4da45f9dc73eaf28e9 (patch) | |
| tree | 31ba4db489093253c6aaac05570f2ef36f778b2c /libjava | |
| parent | 34bf1fe3adbcbf91e15e8ad167075e78ac947079 (diff) | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (gnu/gcj/runtime/StackTrace.lo): New rule.
(%.lo: %.java) Filter out StackTrace.lo.
From-SVN: r75934
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 11 | ||||
| -rw-r--r-- | libjava/Makefile.in | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index da5d8c9fc94..763f2b0c918 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-01-15 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.am (gnu/gcj/runtime/StackTrace.lo): New rule. + (%.lo: %.java) Filter out StackTrace.lo. + 2004-01-14 Kelley Cook <kcook@gcc.gnu.org> * configure.in: Add in AC_PREREQ(2.13) diff --git a/libjava/Makefile.am b/libjava/Makefile.am index f9d581da89e..de91f8942f0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -452,12 +452,21 @@ $(gtk_c_files): %.lo: %.c $(gtk_c_files): $(gtk_c_headers) ## FIXME: see above. -$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java + +## 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)) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java $(GCJCOMPILE) -fjni -o $@ $< +## 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 $@ $< + ## Pass the list of object files to libtool in a temporary file to ## avoid tripping platform command line length limits. libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 1b67819d71d..d6cfda3545f 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -5246,12 +5246,15 @@ $(gtk_c_files): %.lo: %.c $(gtk_c_files): $(gtk_c_headers) -$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java +$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< $(gtk_awt_peer_sources:.java=.lo): %.lo: %.java $(GCJCOMPILE) -fjni -o $@ $< +gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java + $(GCJCOMPILE) -fno-optimize-sibling-calls -o $@ $< + libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) @echo Creating list of files to link... @: $(call write_entries_to_file,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),libgcj.objectlist) |