diff options
| author | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-22 16:35:17 +0000 |
|---|---|---|
| committer | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-22 16:35:17 +0000 |
| commit | 5f63cb3eb8f54827a80424dd346620fbf279ef6f (patch) | |
| tree | d171c045404a295d18ee746a18e6fc270c642ae0 /libjava/Makefile.am | |
| parent | 31838f66e13ef4480e69104284ee846406320281 (diff) | |
| download | gcc-5f63cb3eb8f54827a80424dd346620fbf279ef6f.tar.gz | |
2003-10-22 David Daney <ddaney@avtrex.com)
* include/mips-signal.h: New file.
* sysdep/dwarf2-backtrace.cc: New file.
* sysdep/mips: New directory.
* sysdep/mips/locks.h: New file.
* Makefile.am(extra_cc_files): New, to allow extra c++ files to be
added to libgcj.
(extra_cc_source_files): Ditto.
* configure.host(disable_dladdr): New shell variable passed to
configure.
(mips*-*-linux*): sysdeps_dir=mips,
can_unwind_signal=yes, disable_dladdr=yes, use -mxgot.
(mipsel*-linux* | mipsisa32el*-linux*): Enable hash synchronization.
* configure.in:(mips*-*-linux*): Use sysdep/dwarf2-backtrace.cc to
generate backtrace, and include/mips-signal.h as SIGNAL_HANDLER
(HAVE_DLADDR): Make it depend on setting of disable_dladdr.
(EXTRA_CC_FILES): New, to support conditional addition of
sysdep/dwarf2-backtrace.cc.
* configure: Regenerated.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/config.h.in: Regenerated.
* include/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72808 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index bc4ea9a7130..91d1647ff9e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -138,6 +138,7 @@ nat_files = $(nat_source_files:.cc=.lo) x_nat_files = $(x_nat_source_files:.cc=.lo) ## Objects from C sources in subdirs. c_files = $(c_source_files:.c=.lo) +extra_cc_files = $(extra_cc_source_files:.cc=.lo) ## Objects from gtk-related C sources in subdirs. gtk_c_files = $(gtk_c_source_files:.c=.lo) ## Objects from Java sources in subdirs. @@ -149,13 +150,13 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ - win32-threads.cc posix.cc win32.cc \ - $(c_source_files) $(java_source_files) $(built_java_source_files) + win32-threads.cc posix.cc win32.cc $(c_source_files) \ + $(extra_cc_source_files) $(java_source_files) $(built_java_source_files) libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \ - $(c_files) $(GCOBJS) $(THREADOBJS) $(PLATFORMOBJS) $(LIBLTDL) \ - $(LIBFFI) $(ZLIBS) $(GCLIBS) + $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ + $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) -libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \ +libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \ $(THREADOBJS) $(PLATFORMOBJS) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: @@ -418,6 +419,9 @@ $(nat_files) $(x_nat_files): %.lo: %.cc $(c_files): %.lo: %.c $(LTCOMPILE) -c -o $@ $< +$(extra_cc_files): %.lo: %.cc + $(LTCXXCOMPILE) -c -o $@ $< + $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h ## FIXME: see above @@ -2632,6 +2636,8 @@ c_source_files = \ java/lang/e_sqrt.c java/lang/s_scalbn.c java/lang/sf_rint.c \ java/lang/k_cos.c java/lang/s_sin.c java/lang/sf_fabs.c +extra_cc_source_files = $(EXTRA_CC_FILES) + #java/awt/natToolkit.cc ## This lists all the C++ source files in subdirectories. |