diff options
| author | Paolo Bonzini <bonzini@gcc.gnu.org> | 2005-08-17 12:57:04 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2005-08-17 12:57:04 +0000 |
| commit | 00bfde6bc75ca33017adb4941a492ca743afbf17 (patch) | |
| tree | 53856de20800206b6e0be63fa77320a9b1b96329 /libjava/include | |
| parent | f1690d452232413b80b9e5429cd9bcb0c2c8441f (diff) | |
backport: re PR java/21436 (imports not remembered for previously compiled files)
libjava:
2005-08-17 Paolo Bonzini <bonzini@gnu.org>
Backport from mainline:
2005-05-18 Paolo Bonzini <bonzini@gnu.org>
* Makefile.am (Makefile.deps): Do not use \0, it is unportable.
* Makefile.in: Regenerate.
2005-05-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac (--enable-libgcj-multifile): Remove.
* Makefile.am (all_native_compiled_source_files,
(all_native_compiled_dirs, all_java_dirs, all_java_lo_files,
all_libgcj_lo_files, all_xlib_lo_files,
all_java_deps_files, all_java_stamp_files,
all_java_filelist_files): New variables.
(EXTRA_DIST): New Automake variable.
(CLEANFILES): Add .stamp, .list and .lo files.
(%.list, %.lo, %.stamp, Makefile.deps): New rules.
(classes.stamp): Depend on $(all_java_stamp_files).
(libgcj.la): Pass $(libgcj_la_LIBADD) to the linker without
going through write_entries_to_file.
(all_java_source_files, all_property_files): Move earlier.
(libgcj_la_OBJECTS, javao_files, xlib_javao_files,
all_java_class_files): Remove.
(gtk_awt_peer_sources): Rename to...
(gtk_awt_peer_source_files): ... this. Adjust throughout.
(ONESTEP): Remove.
(libgcj0_convenience_la_SOURCES): Remove Java source files.
(libgcj0_convenience_la_LIBADD): Add $(all_libgcj_lo_files).
(libgcj0_convenience_la_DEPENDENCIES): Likewise.
(libgcj_la_SOURCES): Remove.
(lib_gnu_awt_xlib_la_SOURCES): Remove Java source files.
(lib_gnu_awt_xlib_la_LIBADD): Add $(all_xlib_lo_files).
(lib_gnu_awt_xlib_la_DEPENDENCIES): Likewise.
* configure: Regenerate.
* Makefile.in: Regenerate.
* external/Makefile.in: Regenerate.
* external/sax/Makefile.in: Regenerate.
* external/w3c_dom/Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* libltdl/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
2005-05-10 Paolo Bonzini <bonzini@gnu.org>
PR java/21436
* testsuite/libjava.jacks/jacks.xfail: Adjust.
gcc/java:
2005-08-17 Paolo Bonzini <bonzini@gnu.org>
Backport from mainline:
2005-05-19 Paolo Bonzini <bonzini@gnu.org>
PR java/17845
* parse.y (register_package, package_list): Remove.
(package_declaration): Do not call register_package.
(do_resolve_class): Do not use package_list.
2005-05-10 Paolo Bonzini <bonzini@gnu.org>
PR java/21436
* class.c (maybe_layout_super_class): Look for imports in this_class.
* parse.h (ctxp_for_generation_last): New.
(do_resolve_class): Add a parameter.
* parse.y (ctxp_for_generation_last): New.
(java_pop_parser_context): Add at end of list.
(find_in_imports, find_in_imports_on_demand): Look in ctxp
if the TYPE_IMPORT_LIST or respectively the TYPE_IMPORT_DEMAND_LIST of
the given type are NULL.
(do_resolve_class): Look into the imports of the new second parameter.
Adjust recursive calls.
(resolve_class, resolve_inner_class, find_as_inner_class): Adjust
calls to do_resolve_class.
(create_class): Set the TYPE_IMPORT_LIST and TYPE_IMPORT_DEMAND_LIST.
(java_complete_class): Do not do that here.
From-SVN: r103214
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/Makefile.in | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 9d139f0cf56..41826b25c1b 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -167,8 +167,6 @@ NATIVE_TRUE = @NATIVE_TRUE@ NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@ NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@ OBJEXT = @OBJEXT@ -ONESTEP_FALSE = @ONESTEP_FALSE@ -ONESTEP_TRUE = @ONESTEP_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ |