1998-09-06 17:36:06 +02:00
|
|
|
|
# Top level makefile fragment for the GNU compiler for the Java(TM)
|
|
|
|
|
# language.
|
All files with updated copyright when applicable.
2001-01-07 Alexandre Petit-Bianco <apbianco@cygnus.com>
All files with updated copyright when applicable.
* Make-lang.in (JVGENMAIN_OBS): Removed java/mangle.o.
* class.c (mangle_class_field): Function removed.
(append_gpp_mangled_type, mangle_static_field, mangle_field): Likewise.
(utf8_cmp, cxx_keyword_p): Moved to lex.c.
(build_class_ref): Call `java_mangle_class_field' instead of
`mangle_class_field.'
(build_dtable_decl): Rewritten to call `java_mangle_vtable.'
(layout_class): Call `java_mangle_decl' instead of
`mangle_static_field.'
(cxx_keywords): Initialized static array moved to `lex.c.'
(layout_class_method): Changed leading comment. Simplified to
call `java_mangle_decl.' Local `ptr' moved in for loop body.
* decl.c (lang_mark_tree): Mark field `package_list.'
* java-tree.h (TYPE_PACKAGE_LIST): New macro.
(struct lang_type): New field `package_list.'
(unicode_mangling_length): Prototype removed.
(append_gpp_mangled_name, append_gpp_mangled_classtype,
emit_unicode_mangled_name): Likewise.
(cxx_keyword_p): New prototype.
(java_mangle_decl, java_mangle_class_field,
java_mangle_class_field_from_string, java_mangle_vtable): Likewise.
* jcf-parse.c (jcf_parse_source): Constify `file' argument to
`build_expr_wfl.'
* jvgenmain.c (main_method_prefix): Global variable removed.
(main_method_suffix): Likewise.
(do_mangle_classname): New function.
(main): Call it. Format changed to accomodate new mangling scheme.
* lex.c: (utf8_cmp): Conditionally prototyped.
(cxx_keywords): Moved from class.c, conditionally defined.
(utf8_cmp, cxx_keyword_p): Likewise.
* mangle.c (obstack.h, ggc.h): Included.
(mangle_field_decl): New function.
(mangle_method_decl, mangle_type, mangle_pointer_type,
mangle_array_type, mangle_record_type,
find_compression_pointer_match, find_compression_array_match,
find_compression_record_match,
find_compression_array_template_match, set_type_package_list,
entry_match_pointer_p, emit_compression_string, init_mangling,
finish_mangling, compression_table_add, mangle_member_name): Likewise.
(mangle_obstack): New global.
(MANGLE_RAW_STRING): New macro.
(unicode_mangling_length): Turned static.
(append_unicode_mangled_name): Renamed from
`emit_unicode_mangled_name.' Turned static. `mangle_obstack'
replaces `obstack', removed from the parameter list.
(append_gpp_mangled_name): Turned static. `mangle_obstack'
replaces parameter `obstack', removed from the parameter list. Call
`append_unicode_mangled_name' instead of `emit_unicode_mangled_name.
(append_gpp_mangled_classtype): Removed.
(compression_table, compression_next): New static variables.
* parse.y (temporary_obstack): Extern declaration removed.
(This is the new C++ ABI compatibility patch:
http://gcc.gnu.org/ml/gcc-patches/2001-01/msg01225.html)
From-SVN: r39031
2001-01-15 09:01:22 +01:00
|
|
|
|
# Copyright (C) 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
|
|
|
|
#This file is part of GNU CC.
|
|
|
|
|
|
|
|
|
|
#GNU CC is free software; you can redistribute it and/or modify
|
|
|
|
|
#it under the terms of the GNU General Public License as published by
|
|
|
|
|
#the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
#any later version.
|
|
|
|
|
|
|
|
|
|
#GNU CC is distributed in the hope that it will be useful,
|
|
|
|
|
#but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
#GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
#You should have received a copy of the GNU General Public License
|
|
|
|
|
#along with GNU CC; see the file COPYING. If not, write to
|
|
|
|
|
#the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
|
|
|
#Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
|
|
#Java and all Java-based marks are trademarks or registered trademarks
|
|
|
|
|
#of Sun Microsystems, Inc. in the United States and other countries.
|
|
|
|
|
#The Free Software Foundation is independent of Sun Microsystems, Inc.
|
|
|
|
|
|
|
|
|
|
# This file provides the language dependent support in the main Makefile.
|
|
|
|
|
# Each language makefile fragment must provide the following targets:
|
|
|
|
|
#
|
|
|
|
|
# foo.all.build, foo.all.cross, foo.start.encap, foo.rest.encap,
|
|
|
|
|
# foo.info, foo.dvi,
|
|
|
|
|
# foo.install-normal, foo.install-common, foo.install-info, foo.install-man,
|
2000-11-05 11:35:33 +01:00
|
|
|
|
# foo.uninstall,
|
1998-09-06 17:36:06 +02:00
|
|
|
|
# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean,
|
|
|
|
|
# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4
|
|
|
|
|
#
|
|
|
|
|
# where `foo' is the name of the language.
|
|
|
|
|
#
|
|
|
|
|
# It should also provide rules for:
|
|
|
|
|
#
|
|
|
|
|
# - making any compiler driver (eg: g++)
|
|
|
|
|
# - the compiler proper (eg: jc1)
|
|
|
|
|
# - define the names for selecting the language in LANGUAGES.
|
|
|
|
|
|
|
|
|
|
# Actual names to use when installing a native compiler.
|
|
|
|
|
JAVA_INSTALL_NAME = `t='$(program_transform_name)'; echo gcj | sed $$t`
|
|
|
|
|
|
|
|
|
|
# Actual names to use when installing a cross-compiler.
|
|
|
|
|
JAVA_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcj | sed $$t`
|
|
|
|
|
|
1998-09-10 11:34:50 +02:00
|
|
|
|
GCJ = gcj
|
|
|
|
|
|
1998-09-06 17:36:06 +02:00
|
|
|
|
# Define the names for selecting java in LANGUAGES.
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \
|
|
|
|
|
gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext)
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
|
|
|
|
# Define the name of target independant tools to be installed in $(bindir)
|
|
|
|
|
# Names are subject to changes
|
|
|
|
|
JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh jv-scan jcf-dump
|
|
|
|
|
|
|
|
|
|
# Tell GNU make to ignore these if they exist.
|
|
|
|
|
.PHONY: java
|
|
|
|
|
|
gcc toplevel:
* Makefile.in (HOST_CFLAGS): Add -DGENERATOR_FILE.
(rtl.o, print-rtl.o, bitmap.o, obstack.o): Build with -DGENERATOR_FILE.
(alloca.o, vfprintf.o, ggc-none.o, errors.o): Likewise.
(splay-tree.o, hash.o): Likewise.
GCONFIG_H: New.
(rtl.o, print-rtl.o): Depend on $(GCONFIG_H) instead of $(CONFIG_H).
(bitmap.o, obstack.o, vfprintf.o, ggc-none.o, errors.o): Likewise.
(hashtab.o): Likewise.
(gcov.o): Depend on $(CONFIG_H).
* configure.in: #include insn-codes.h in tm.h.
f:
* Make-lang.in (g77spec.o): Depend on $(CONFIG_H).
java:
* Make-lang.in (jvspec.o): Depend on $(CONFIG_H).
cp:
* Make-lang.in (g++spec.o, cxxmain.o): Depend on $(CONFIG_H).
From-SVN: r37680
2000-11-23 03:22:03 +01:00
|
|
|
|
jvspec.o: $(srcdir)/java/jvspec.c system.h $(GCC_H) $(CONFIG_H)
|
2001-02-05 06:46:16 +01:00
|
|
|
|
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
$(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION)
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
|
|
|
|
# Create the compiler driver for $(GCJ).
|
1999-03-26 00:36:47 +01:00
|
|
|
|
$(GCJ)$(exeext): gcc.o jvspec.o version.o \
|
1999-03-21 08:52:59 +01:00
|
|
|
|
prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
|
1999-03-26 00:36:47 +01:00
|
|
|
|
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o jvspec.o prefix.o intl.o \
|
1999-02-03 22:57:59 +01:00
|
|
|
|
version.o $(EXTRA_GCC_OBJS) $(LIBS)
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
|
|
|
|
# Create a version of the $(GCJ) driver which calls the cross-compiler.
|
|
|
|
|
$(GCJ)-cross$(exeext): $(GCJ)$(exeext)
|
|
|
|
|
-rm -f $(GCJ)-cross$(exeext)
|
|
|
|
|
cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext)
|
|
|
|
|
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
$(INTL_TARGETS): $(srcdir)/java/parse.c $(srcdir)/java/parse-scan.c
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
$(srcdir)/java/parse.c: $(srcdir)/java/parse.y
|
|
|
|
|
(cd $(srcdir)/java && \
|
|
|
|
|
$(BISON) -t --name-prefix=java_ $(BISONFLAGS) -o p$$$$.c parse.y && \
|
|
|
|
|
mv -f p$$$$.c parse.c)
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
$(srcdir)/java/parse-scan.c: $(srcdir)/java/parse-scan.y
|
|
|
|
|
(cd $(srcdir)/java && \
|
|
|
|
|
$(BISON) -t $(BISONFLAGS) -o ps$$$$.c parse-scan.y && \
|
|
|
|
|
mv -f ps$$$$.c parse-scan.c)
|
|
|
|
|
|
|
|
|
|
$(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf
|
|
|
|
|
(cd $(srcdir)/java || exit 1; \
|
2000-11-20 23:37:22 +01:00
|
|
|
|
gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,4,$$ \
|
|
|
|
|
keyword.gperf > k$$$$.h || { \
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2; \
|
|
|
|
|
rm -f k$$$$.h; \
|
2000-11-20 23:37:22 +01:00
|
|
|
|
exit 1; } ; \
|
|
|
|
|
mv -f k$$$$.h keyword.h)
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
|
|
|
|
|
# Executables built by this Makefile:
|
|
|
|
|
JAVA_OBJS = java/parse.o java/class.o java/decl.o java/expr.o \
|
|
|
|
|
java/constants.o java/lang.o java/typeck.o java/except.o java/verify.o \
|
|
|
|
|
java/zextract.o java/jcf-io.o java/jcf-parse.o java/mangle.o \
|
|
|
|
|
java/jcf-write.o java/buffer.o java/check-init.o java/jcf-depend.o \
|
|
|
|
|
java/jcf-path.o java/xref.o java/boehm.o mkdeps.o
|
|
|
|
|
|
|
|
|
|
GCJH_OBJS = java/gjavah.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
|
|
|
|
|
java/zextract.o version.o mkdeps.o errors.o
|
|
|
|
|
|
|
|
|
|
JVSCAN_OBJS = java/parse-scan.o java/jv-scan.o version.o
|
|
|
|
|
|
|
|
|
|
JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
|
|
|
|
|
java/zextract.o errors.o version.o mkdeps.o
|
|
|
|
|
|
All files with updated copyright when applicable.
2001-01-07 Alexandre Petit-Bianco <apbianco@cygnus.com>
All files with updated copyright when applicable.
* Make-lang.in (JVGENMAIN_OBS): Removed java/mangle.o.
* class.c (mangle_class_field): Function removed.
(append_gpp_mangled_type, mangle_static_field, mangle_field): Likewise.
(utf8_cmp, cxx_keyword_p): Moved to lex.c.
(build_class_ref): Call `java_mangle_class_field' instead of
`mangle_class_field.'
(build_dtable_decl): Rewritten to call `java_mangle_vtable.'
(layout_class): Call `java_mangle_decl' instead of
`mangle_static_field.'
(cxx_keywords): Initialized static array moved to `lex.c.'
(layout_class_method): Changed leading comment. Simplified to
call `java_mangle_decl.' Local `ptr' moved in for loop body.
* decl.c (lang_mark_tree): Mark field `package_list.'
* java-tree.h (TYPE_PACKAGE_LIST): New macro.
(struct lang_type): New field `package_list.'
(unicode_mangling_length): Prototype removed.
(append_gpp_mangled_name, append_gpp_mangled_classtype,
emit_unicode_mangled_name): Likewise.
(cxx_keyword_p): New prototype.
(java_mangle_decl, java_mangle_class_field,
java_mangle_class_field_from_string, java_mangle_vtable): Likewise.
* jcf-parse.c (jcf_parse_source): Constify `file' argument to
`build_expr_wfl.'
* jvgenmain.c (main_method_prefix): Global variable removed.
(main_method_suffix): Likewise.
(do_mangle_classname): New function.
(main): Call it. Format changed to accomodate new mangling scheme.
* lex.c: (utf8_cmp): Conditionally prototyped.
(cxx_keywords): Moved from class.c, conditionally defined.
(utf8_cmp, cxx_keyword_p): Likewise.
* mangle.c (obstack.h, ggc.h): Included.
(mangle_field_decl): New function.
(mangle_method_decl, mangle_type, mangle_pointer_type,
mangle_array_type, mangle_record_type,
find_compression_pointer_match, find_compression_array_match,
find_compression_record_match,
find_compression_array_template_match, set_type_package_list,
entry_match_pointer_p, emit_compression_string, init_mangling,
finish_mangling, compression_table_add, mangle_member_name): Likewise.
(mangle_obstack): New global.
(MANGLE_RAW_STRING): New macro.
(unicode_mangling_length): Turned static.
(append_unicode_mangled_name): Renamed from
`emit_unicode_mangled_name.' Turned static. `mangle_obstack'
replaces `obstack', removed from the parameter list.
(append_gpp_mangled_name): Turned static. `mangle_obstack'
replaces parameter `obstack', removed from the parameter list. Call
`append_unicode_mangled_name' instead of `emit_unicode_mangled_name.
(append_gpp_mangled_classtype): Removed.
(compression_table, compression_next): New static variables.
* parse.y (temporary_obstack): Extern declaration removed.
(This is the new C++ ABI compatibility patch:
http://gcc.gnu.org/ml/gcc-patches/2001-01/msg01225.html)
From-SVN: r39031
2001-01-15 09:01:22 +01:00
|
|
|
|
JVGENMAIN_OBJS = java/jvgenmain.o
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
|
|
|
|
|
# Use loose warnings for this front end.
|
|
|
|
|
java-warn =
|
|
|
|
|
|
|
|
|
|
jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS)
|
|
|
|
|
rm -f $@
|
|
|
|
|
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
|
|
|
|
|
$(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBS)
|
|
|
|
|
|
|
|
|
|
gcjh$(exeext): $(GCJH_OBJS) $(LIBDEPS)
|
|
|
|
|
rm -f $@
|
|
|
|
|
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJH_OBJS) $(ZLIB) $(LIBS)
|
|
|
|
|
|
|
|
|
|
jv-scan$(exeext): $(JVSCAN_OBJS) $(LIBDEPS)
|
|
|
|
|
rm -f $@
|
|
|
|
|
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVSCAN_OBJS) $(LIBS)
|
|
|
|
|
|
|
|
|
|
jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIBDEPS)
|
|
|
|
|
rm -f $@
|
|
|
|
|
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) $(ZLIB) $(LIBS)
|
|
|
|
|
|
|
|
|
|
jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
|
|
|
|
|
rm -f $@
|
|
|
|
|
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
|
2000-06-06 09:23:42 +02:00
|
|
|
|
|
1998-12-20 14:24:18 +01:00
|
|
|
|
#
|
1998-09-06 17:36:06 +02:00
|
|
|
|
# Build hooks:
|
|
|
|
|
|
1998-09-09 16:33:06 +02:00
|
|
|
|
java.all.build: $(GCJ)$(exeext)
|
|
|
|
|
java.all.cross: $(GCJ)-cross$(exeext)
|
1998-09-06 17:36:06 +02:00
|
|
|
|
java.start.encap: $(GCJ)$(exeext)
|
1998-09-09 16:33:06 +02:00
|
|
|
|
java.rest.encap:
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
2001-01-18 00:14:11 +01:00
|
|
|
|
java.info: $(srcdir)/java/gcj.info
|
|
|
|
|
java.dvi: java/gcj.dvi
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
|
|
|
|
# Install hooks:
|
|
|
|
|
# jc1, gcj, jvgenmain, and gcjh are installed elsewhere as part
|
|
|
|
|
# of $(COMPILERS).
|
|
|
|
|
|
|
|
|
|
# Nothing to do here.
|
|
|
|
|
java.install-normal:
|
|
|
|
|
|
|
|
|
|
java.install-common:
|
|
|
|
|
-if [ -f $(GCJ)$(exeext) ]; then \
|
|
|
|
|
if [ -f $(GCJ)-cross$(exeext) ]; then \
|
|
|
|
|
rm -f $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \
|
|
|
|
|
$(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \
|
|
|
|
|
chmod a+x $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \
|
|
|
|
|
else \
|
|
|
|
|
rm -f $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
|
|
|
|
|
$(INSTALL_PROGRAM) $(GCJ)$(exeext) $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
|
|
|
|
|
chmod a+x $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
|
|
|
|
|
fi ; \
|
|
|
|
|
fi ; \
|
|
|
|
|
for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS); do \
|
|
|
|
|
if [ -f $$tool$(exeext) ]; then \
|
|
|
|
|
rm -f $(bindir)/$$tool$(exeext); \
|
|
|
|
|
$(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool$(exeext); \
|
|
|
|
|
chmod a+x $(bindir)/$$tool$(exeext); \
|
|
|
|
|
fi ; \
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
java.install-man:
|
|
|
|
|
|
|
|
|
|
java.uninstall:
|
|
|
|
|
-rm -rf $(bindir)/$(JAVA_INSTALL_NAME)$(exeext)
|
|
|
|
|
-rm -rf $(bindir)/$(JAVA_CROSS_NAME)$(exeext)
|
|
|
|
|
|
|
|
|
|
java.install-info:
|
2001-01-18 00:14:11 +01:00
|
|
|
|
if [ -f jc1$(exeext) ] ; then \
|
|
|
|
|
if [ -f $(srcdir)/java/gcj.info ]; then \
|
|
|
|
|
rm -f $(infodir)/gcj.info*; \
|
|
|
|
|
for f in $(srcdir)/java/gcj.info*; do \
|
|
|
|
|
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
|
|
|
|
|
$(INSTALL_DATA) $$f $(infodir)/$$realfile; \
|
|
|
|
|
done; \
|
|
|
|
|
chmod a-x $(infodir)/gcj.info*; \
|
|
|
|
|
else true; fi; \
|
|
|
|
|
else true; fi
|
|
|
|
|
-if [ -f jc1$(exeext) ] && [ -f $(infodir)/gcj.info ]; then \
|
|
|
|
|
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
|
|
|
|
|
install-info --dir-file=$(infodir)/dir $(infodir)/gcj.info; \
|
|
|
|
|
else true; fi; \
|
|
|
|
|
else true; fi
|
1998-09-06 17:36:06 +02:00
|
|
|
|
|
1998-12-20 14:24:18 +01:00
|
|
|
|
#
|
1998-09-06 17:36:06 +02:00
|
|
|
|
# Clean hooks:
|
|
|
|
|
# A lot of the ancillary files are deleted by the main makefile.
|
|
|
|
|
# We just have to delete files specific to us.
|
|
|
|
|
|
|
|
|
|
java.mostlyclean:
|
|
|
|
|
-rm -f java/*$(objext) $(DEMANGLER_PROG)
|
2000-08-31 20:19:01 +02:00
|
|
|
|
-rm -f jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) s-java
|
1998-09-06 17:36:06 +02:00
|
|
|
|
java.clean:
|
|
|
|
|
java.distclean:
|
|
|
|
|
-rm -f java/config.status java/Makefile
|
|
|
|
|
-rm -f java/parse.output
|
|
|
|
|
java.extraclean:
|
|
|
|
|
java.maintainer-clean:
|
1998-11-12 17:15:18 +01:00
|
|
|
|
-rm -f java/parse.c java/parse-scan.c java/parse.output java/y.tab.c
|
1998-12-20 14:24:18 +01:00
|
|
|
|
#
|
1998-09-06 17:36:06 +02:00
|
|
|
|
# Stage hooks:
|
|
|
|
|
# The main makefile has already created stage?/java.
|
|
|
|
|
|
1999-06-25 10:21:47 +02:00
|
|
|
|
java.stage1: stage1-start
|
1998-09-06 17:36:06 +02:00
|
|
|
|
-mv java/*$(objext) stage1/java
|
1999-06-25 10:21:47 +02:00
|
|
|
|
java.stage2: stage2-start
|
1998-09-06 17:36:06 +02:00
|
|
|
|
-mv java/*$(objext) stage2/java
|
1999-06-25 10:21:47 +02:00
|
|
|
|
java.stage3: stage3-start
|
1998-09-06 17:36:06 +02:00
|
|
|
|
-mv java/*$(objext) stage3/java
|
1999-06-25 10:21:47 +02:00
|
|
|
|
java.stage4: stage4-start
|
1998-09-06 17:36:06 +02:00
|
|
|
|
-mv java/*$(objext) stage4/java
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# .o:.h dependencies.
|
|
|
|
|
JAVA_TREE_H = $(TREE_H) java/java-tree.h java/java-tree.def
|
2000-12-13 23:47:13 +01:00
|
|
|
|
JAVA_LEX_C = java/lex.c java/keyword.h java/chartables.h
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
|
|
|
|
|
java/parse.o: java/parse.c java/jcf-reader.c $(CONFIG_H) system.h \
|
|
|
|
|
function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h java/lex.h $(GGC_H)
|
|
|
|
|
java/jcf-dump.o: $(CONFIG_H) system.h $(JAVA_TREE_H) java/jcf-dump.c \
|
|
|
|
|
java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def version.h
|
|
|
|
|
java/gjavah.o: $(CONFIG_H) system.h $(JAVA_TREE_H) java/gjavah.c \
|
|
|
|
|
java/jcf-reader.c java/jcf.h java/javaop.h version.h
|
|
|
|
|
java/boehm.o: java/boehm.c $(CONFIG_H) system.h $(TREE_H) $(JAVA_TREE_H) \
|
|
|
|
|
java/parse.h
|
|
|
|
|
java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h gansidecl.h \
|
|
|
|
|
system.h toplev.h
|
|
|
|
|
java/check-init.o: java/check-init.c $(CONFIG_H) gansidecl.h \
|
|
|
|
|
$(JAVA_TREE_H) system.h toplev.h
|
|
|
|
|
java/class.o: java/class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \
|
|
|
|
|
java/parse.h gansidecl.h toplev.h system.h output.h $(GGC_H)
|
|
|
|
|
java/constants.o: java/constants.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
|
|
|
|
|
toplev.h system.h $(GGC_H)
|
|
|
|
|
java/decl.o: java/decl.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
|
2001-01-28 02:50:22 +01:00
|
|
|
|
toplev.h system.h function.h gcc.h
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
java/except.o: java/except.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \
|
|
|
|
|
$(RTL_H) java/javaop.h java/java-opcodes.h except.h java/java-except.h \
|
|
|
|
|
eh-common.h toplev.h system.h function.h
|
|
|
|
|
java/expr.o: java/expr.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \
|
|
|
|
|
$(RTL_H) $(EXPR_H) java/javaop.h java/java-opcodes.h except.h \
|
|
|
|
|
java/java-except.h java/java-except.h java/parse.h toplev.h \
|
|
|
|
|
system.h $(GGC_H)
|
|
|
|
|
java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) system.h java/jcf.h
|
|
|
|
|
java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) flags.h \
|
|
|
|
|
input.h java/java-except.h system.h toplev.h java/parse.h $(GGC_H)
|
|
|
|
|
java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
|
|
|
|
|
$(RTL_H) java/java-opcodes.h java/parse.h java/buffer.h system.h \
|
|
|
|
|
toplev.h $(GGC_H)
|
|
|
|
|
java/jv-scan.o: java/jv-scan.c $(CONFIG_H) system.h version.h
|
|
|
|
|
java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) system.h
|
|
|
|
|
java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
|
|
|
|
|
toplev.h system.h $(RTL_H) $(EXPR_H)
|
|
|
|
|
java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) system.h \
|
|
|
|
|
toplev.h $(GGC_H)
|
|
|
|
|
java/parse-scan.o: $(CONFIG_H) system.h toplev.h $(JAVA_LEX_C) java/parse.h \
|
|
|
|
|
java/lex.h
|
|
|
|
|
java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
|
|
|
|
|
java/convert.h toplev.h system.h $(GGC_H)
|
|
|
|
|
java/verify.o: java/verify.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
|
|
|
|
|
java/javaop.h java/java-opcodes.h java/java-except.h toplev.h system.h
|
|
|
|
|
java/xref.o: java/xref.c java/xref.h $(CONFIG_H) $(JAVA_TREE_H) toplev.h \
|
|
|
|
|
system.h
|
|
|
|
|
java/zextract.o: java/zextract.c $(CONFIG_H) system.h java/zipfile.h
|
|
|
|
|
|
|
|
|
|
# jcf-io.o needs $(ZLIBINC) added to cflags.
|
|
|
|
|
java/jcf-io.o: java/jcf-io.c $(CONFIG_H) system.h $(JAVA_TREE_H)
|
|
|
|
|
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \
|
|
|
|
|
$(srcdir)/java/jcf-io.c $(OUTPUT_OPTION)
|
|
|
|
|
|
|
|
|
|
# jcf-path.o needs a -D.
|
|
|
|
|
java/jcf-path.o: java/jcf-path.c $(CONFIG_H) system.h java/jcf.h
|
|
|
|
|
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
|
Top level ChangeLog:
2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com>
* libjava: Imported from /cvs/java.
* libffi: Likewise.
* Boehm-gc: Likewise.
libjava/ChangeLog:
2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com>
* Makefile.am (data_DATA): libgcj.jar replaces libgcj.zip.
(ZIP): Points at fastjar instead of zip.
(libgcj_la_DEPENDENCIES): libgcj.jar replaces libgcj.zip.
(libgcj_la_LDFLAGS): Correctly point at libsupc++.
(libgcjx_la_DEPENDENCIES): libgcj.jar replaces libgcj.zip.
(libgcjx_la_LDFLAGS): Correctly point at libsupc++.
($(java_source_files:.java=.class):): libgcj.jar replaces libgcj.zip.
($(x_java_source_files:.java=.class):): Likewise.
(libgcj.jar:): Replaces libgcj.zip:, builds libgcj.jar and uses
fastar's flags.
(CLEANFILES): libgcj.jar replaces libgcj.zip.
(java/lang/ClassLoader.h:): Depends on libgcj.jar.
(gnu/gcj/runtime/FirstThread.h:, java/lang/Thread.h:,
java/lang/String.h:, java/lang/reflect/Constructor.h:,
java/lang/reflect/Field.h:, java/lang/reflect/Method.h:,
gnu/gcj/runtime/VMClassLoader.h:,
java/io/ObjectInputStream$$GetField.h:,
java/io/ObjectOutputStream$$PutField.h:, header-check:): Likewise.
(Makefile.in): Rebuilt.
gcc/java/ChangeLog:
2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com>
* Make-lang.in (java/jcf-path.o:): libgcj.jar replaces libgcj.zip.
jcf-path.c: Likewise.
From-SVN: r38167
2000-12-10 06:32:49 +01:00
|
|
|
|
-DLIBGCJ_ZIP_FILE='"$(prefix)/share/libgcj.jar"' \
|
configure.in: If not NO_MINUS_C_MINUS_O, substitute OUTPUT_OPTION with '-o $@'.
* configure.in: If not NO_MINUS_C_MINUS_O, substitute
OUTPUT_OPTION with '-o $@'. Make zlibdir, zlibinc relative to
top level. Kill oldstyle_subdirs. Do not include
$srcdir/$s/Makefile.in in all_lang_makefiles, but do include
$outputs. Do not run configure.lang from config.status.
Rearrange warning-flag logic to correspond to what the
makefile wants. Put special vax stage1 options in
@stage1_flags@ not @stage1_warn_cflags@. Don't do anything
with extra_c_objs, extra_cxx_objs, or extra_cpp_objs.
(--enable-c-cpplib): AC_SUBST(maybe_cpplib) with "libcpp.a" if
switch is given, nothing otherwise.
* configure.lang: Delete.
* Makefile.in: Expunge all traces of extra_c_objs,
extra_cxx_objs, and extra_cpp_objs. Set MAYBE_CPPLIB from
@maybe_cpplib@. Add $(MAYBE_CPPLIB) to C_AND_OBJC_OBJS. Set
warning options via a three level scheme so that -pedantic and
-Wtraditional are not used for non-C front ends: LOOSE_WARN,
STRICT1_WARN, STRICT2_WARN -> $(@D)-warn, GCC_WARN_CFLAGS ->
WARN_CFLAGS. Distinguish STAGE1_CFLAGS from BOOT_CFLAGS.
Add -I$(@D) and -I$(srcdir)/$(@D) to INCLUDES.
Set OUTPUT_OPTION, ZLIB, ZLIBINC. Do not set P,
LANG_FLAGS_TO_PASS. Add OUTPUT_OPTION to all object-file
generation rules. Wrap all rules that change the current
directory in parentheses; pmake doesn't spawn a new shell for
each command. Expunge all references to $(P). When one
command depends on another and they're run all at once, use &&
to separate them, not ;. Add libgcc_s$(SHLIB_EXT) to files
deleted on make clean. Force OUTPUT_OPTION='-o $@' in stage2
and beyond.
* cp/Make-lang.in, f/Make-lang.in, java/Make-lang.in,
objc/Make-lang.in: Wrap all rules that change the current
directory in parentheses. Expunge all references to $(P).
When one command depends on another and they're run all at
once, use && to separate them, not ;. Add OUTPUT_OPTION to
all object-file generation rules. Delete obsolete variables.
Move all build rules here from the corresponding Makefile.in and
adapt to the new environment.
* cp/Makefile.in, f/Makefile.in, java/Makefile.in, objc/Makefile.in:
Delete.
* cp/config-lang.in, f/config-lang.in, java/config-lang.in:
Delete outputs= line.
From-SVN: r37088
2000-10-27 22:22:28 +02:00
|
|
|
|
$(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
|
|
|
|
|
|
2001-01-18 00:14:11 +01:00
|
|
|
|
# Documentation
|
|
|
|
|
$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi
|
|
|
|
|
if test "x$(BUILD_INFO)" = xinfo; then \
|
|
|
|
|
rm -f $(srcdir)/java/gcc.info*; \
|
|
|
|
|
cd $(srcdir)/java && $(MAKEINFO) -o gcj.info gcj.texi; \
|
|
|
|
|
else true; fi
|
|
|
|
|
|
|
|
|
|
java/gcj.dvi: $(srcdir)/java/gcj.texi
|
|
|
|
|
TEXINPUTS=${texidir}:$(srcdir)/java:$$TEXINPUTS tex gcj.texi
|
|
|
|
|
texindex gcj.??
|
|
|
|
|
TEXINPUTS=${texidir}:$(srcdir)/java:$$TEXINPUTS tex gcj.texi
|