Skip to content

R
riscv-gcc-1
Commit 27e934d8 by Tom Tromey Committed by Tom Tromey
Options

configure: Rebuilt. 

	* configure: Rebuilt.
	* configure.in: Build include/Makefile.
	* Makefile.in: Rebuilt.
	* Makefile.am (SUBDIRS): Added gcj and include.
	(install-data-local): New target.
	(extra_headers): New macro.
	* include/Makefile.in: New file.
	* include/Makefile.am: New file.

	* interpret.cc: Don't include gcj/field.h or gcj/cni.h.
	* java/lang/reflect/natField.cc: Don't include gcj/field.h or
	gcj/cni.h.
	* boehm.cc: Don't include java-threads.h or gcj/field.h.
	* resolve.cc: Include config.h.
	* defineclass.cc: Include config.h.
	* include/java-interp.h: Don't include config.h.
	* include/jvm.h: Include java-threads.h, Object.h, java-gc.h,
	cni.h.

	* gcj/javaprims.h: Regenerated namespace decls.
	* classes.pl (scan): Don't put `;' after closing brace.

	* Makefile.in: Rebuilt.
	* Makefile.am (INCLUDES): Added -I for top_srcdir.
	* configure.in: Create gcj/Makefile.
	* gcj/Makefile.in: New file.
	* gcj/Makefile.am: New file.
	* java/lang/Object.h: Don't include any other headers.
	* gcj/array.h: Renamed from include/java-array.h.
	* gcj/field.h: Renamed from include/java-field.h.
	* gcj/method.h: Renamed from include/java-method.h.
	* gcj/cni.h, gcj/javaprims.h: Moved from include/.
	Updated all files to reflect new include structure.

From-SVN: r29278
parent 512d594b
Showing with 739 additions and 155 deletions
libjava/ChangeLog
1999-09-10 Tom Tromey <tromey@cygnus.com>
* configure: Rebuilt.
* configure.in: Build include/Makefile.
* Makefile.in: Rebuilt.
* Makefile.am (SUBDIRS): Added gcj and include.
(install-data-local): New target.
(extra_headers): New macro.
* include/Makefile.in: New file.
* include/Makefile.am: New file.
* interpret.cc: Don't include gcj/field.h or gcj/cni.h.
* java/lang/reflect/natField.cc: Don't include gcj/field.h or
gcj/cni.h.
* boehm.cc: Don't include java-threads.h or gcj/field.h.
* resolve.cc: Include config.h.
* defineclass.cc: Include config.h.
* include/java-interp.h: Don't include config.h.
* include/jvm.h: Include java-threads.h, Object.h, java-gc.h,
cni.h.
* gcj/javaprims.h: Regenerated namespace decls.
* classes.pl (scan): Don't put `;' after closing brace.
* Makefile.in: Rebuilt.
* Makefile.am (INCLUDES): Added -I for top_srcdir.
* configure.in: Create gcj/Makefile.
* gcj/Makefile.in: New file.
* gcj/Makefile.am: New file.
* java/lang/Object.h: Don't include any other headers.
* gcj/array.h: Renamed from include/java-array.h.
* gcj/field.h: Renamed from include/java-field.h.
* gcj/method.h: Renamed from include/java-method.h.
* gcj/cni.h, gcj/javaprims.h: Moved from include/.
Updated all files to reflect new include structure.
1999-09-09 Tom Tromey <tromey@cygnus.com> 1999-09-09 Tom Tromey <tromey@cygnus.com>
* configure: Rebuilt. * configure: Rebuilt.
......
libjava/Makefile.am
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
AUTOMAKE_OPTIONS = foreign no-installinfo AUTOMAKE_OPTIONS = foreign no-installinfo
if TESTSUBDIR if TESTSUBDIR
SUBDIRS = testsuite SUBDIRS = testsuite gcj include
else
SUBDIRS = gcj include
endif endif
## ################################################################ ## ################################################################
...@@ -79,7 +81,8 @@ JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ ...@@ -79,7 +81,8 @@ JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) \ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
$(GCINCS) $(THREADINCS) \
$(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS) $(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS)
DIVIDESPEC = @DIVIDESPEC@ DIVIDESPEC = @DIVIDESPEC@
...@@ -248,6 +251,20 @@ gnu/gcj/runtime/MethodInvocation.h: gnu/gcj/runtime/MethodInvocation.class libgc ...@@ -248,6 +251,20 @@ gnu/gcj/runtime/MethodInvocation.h: gnu/gcj/runtime/MethodInvocation.class libgc
-friend 'class _Jv_InterpMethod;' \ -friend 'class _Jv_InterpMethod;' \
$(basename $<) $(basename $<)
## Headers we maintain by hand and which we want to install.
extra_headers = java/lang/Object.h java/lang/Class.h
## Install the headers. It is fairly ugly that we have to do this by
## hand.
install-data-local:
$(PRE_INSTALL)
@for f in $(nat_headers) $(extra_headers); do \
d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
$(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \
if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \
done
## ################################################################ ## ################################################################
......
libjava/Makefile.in
...@@ -105,9 +105,10 @@ here = @here@ ...@@ -105,9 +105,10 @@ here = @here@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
AUTOMAKE_OPTIONS = foreign no-installinfo AUTOMAKE_OPTIONS = foreign no-installinfo
@TESTSUBDIR_TRUE@SUBDIRS = \ @TESTSUBDIR_TRUE@SUBDIRS = \
@TESTSUBDIR_TRUE@testsuite @TESTSUBDIR_TRUE@testsuite gcj include
@TESTSUBDIR_FALSE@SUBDIRS = \
@TESTSUBDIR_FALSE@gcj include
@USE_LIBDIR_TRUE@toolexeclibdir = \ @USE_LIBDIR_TRUE@toolexeclibdir = \
@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = \ @USE_LIBDIR_FALSE@toolexeclibdir = \
...@@ -158,7 +159,8 @@ JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ ...@@ -158,7 +159,8 @@ JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) \ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
$(GCINCS) $(THREADINCS) \
$(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS) $(EH_COMMON_INCLUDE) $(ZINCS) $(LIBFFIINCS)
...@@ -197,6 +199,8 @@ nat_headers = $(ordinary_java_source_files:.java=.h) \ ...@@ -197,6 +199,8 @@ nat_headers = $(ordinary_java_source_files:.java=.h) \
$(built_java_source_files:.java=.h) $(built_java_source_files:.java=.h)
extra_headers = java/lang/Object.h java/lang/Class.h
NM = nm NM = nm
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \ @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
...@@ -705,15 +709,14 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ...@@ -705,15 +709,14 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DATA = $(data_DATA) $(toolexeclib_DATA) DATA = $(data_DATA) $(toolexeclib_DATA)
DIST_COMMON = COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS THANKS \ DIST_COMMON = COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS THANKS \
acconfig.h acinclude.m4 aclocal.m4 configure configure.in \ acinclude.m4 aclocal.m4 configure configure.in libgcj.spec.in
include/config.h.in include/stamp-h.in libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = testsuite DIST_SUBDIRS = testsuite gcj include gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/$(srcdir)/$(CONVERT_DIR)/make-trie.P .deps/boehm.P \ .deps/$(srcdir)/$(CONVERT_DIR)/make-trie.P .deps/boehm.P \
.deps/defineclass.P .deps/exception.P .deps/gij.P \ .deps/defineclass.P .deps/exception.P .deps/gij.P \
...@@ -928,34 +931,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ...@@ -928,34 +931,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
include/config.h: include/stamp-h
@if test ! -f $@; then \
rm -f include/stamp-h; \
$(MAKE) include/stamp-h; \
else :; fi
include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=include/config.h \
$(SHELL) ./config.status
@echo timestamp > include/stamp-h 2> /dev/null
$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/include/stamp-h.in; \
$(MAKE) $(srcdir)/include/stamp-h.in; \
else :; fi
$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
cd $(top_srcdir) && $(AUTOHEADER)
@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
mostlyclean-hdr:
clean-hdr:
distclean-hdr:
-rm -f include/config.h
maintainer-clean-hdr:
libgcj.spec: $(top_builddir)/config.status libgcj.spec.in libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
...@@ -1324,7 +1299,7 @@ install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \ ...@@ -1324,7 +1299,7 @@ install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \
install-toolexeclibDATA install-toolexeclibDATA
install-exec: install-exec-recursive install-exec: install-exec-recursive
install-data-am: install-dataDATA install-data-am: install-dataDATA install-data-local
install-data: install-data-recursive install-data: install-data-recursive
install-am: all-am install-am: all-am
...@@ -1354,32 +1329,29 @@ distclean-generic: ...@@ -1354,32 +1329,29 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]* -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \ mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
mostlyclean-compile mostlyclean-libtool \ mostlyclean-libtool mostlyclean-binPROGRAMS \
mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ mostlyclean-noinstPROGRAMS mostlyclean-tags \
mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-recursive mostlyclean: mostlyclean-recursive
clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \ clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \ clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
clean-tags clean-depend clean-generic mostlyclean-am \ clean-depend clean-generic mostlyclean-am clean-local
clean-local
clean: clean-recursive clean: clean-recursive
distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \ distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
distclean-compile distclean-libtool \ distclean-libtool distclean-binPROGRAMS \
distclean-binPROGRAMS distclean-noinstPROGRAMS \ distclean-noinstPROGRAMS distclean-tags \
distclean-tags distclean-depend distclean-generic \ distclean-depend distclean-generic clean-am
clean-am
-rm -f libtool -rm -f libtool
distclean: distclean-recursive distclean: distclean-recursive
-rm -f config.status -rm -f config.status
maintainer-clean-am: maintainer-clean-hdr \ maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
maintainer-clean-toolexeclibLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-binPROGRAMS \ maintainer-clean-binPROGRAMS \
maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
...@@ -1391,9 +1363,9 @@ maintainer-clean-am: maintainer-clean-hdr \ ...@@ -1391,9 +1363,9 @@ maintainer-clean-am: maintainer-clean-hdr \
maintainer-clean: maintainer-clean-recursive maintainer-clean: maintainer-clean-recursive
-rm -f config.status -rm -f config.status
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ .PHONY: mostlyclean-toolexeclibLTLIBRARIES \
mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \ distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \
clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-toolexeclibLTLIBRARIES \
uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \ mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
...@@ -1412,10 +1384,11 @@ distclean-tags clean-tags maintainer-clean-tags distdir \ ...@@ -1412,10 +1384,11 @@ distclean-tags clean-tags maintainer-clean-tags distdir \
mostlyclean-depend distclean-depend clean-depend \ mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info-am info dvi-am dvi check check-am \ maintainer-clean-depend info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-info-am install-info \ installcheck-am installcheck install-info-am install-info \
install-exec-am install-exec install-data-am install-data install-am \ install-exec-am install-exec install-data-local install-data-am \
install uninstall-am uninstall all-redirect all-am all installdirs-am \ install-data install-am install uninstall-am uninstall all-redirect \
installdirs mostlyclean-generic distclean-generic clean-generic \ all-am all installdirs-am installdirs mostlyclean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
$(java_source_files:.java=.class): libgcj.zip $(java_source_files:.java=.class): libgcj.zip
...@@ -1506,6 +1479,16 @@ gnu/gcj/runtime/MethodInvocation.h: gnu/gcj/runtime/MethodInvocation.class libgc ...@@ -1506,6 +1479,16 @@ gnu/gcj/runtime/MethodInvocation.h: gnu/gcj/runtime/MethodInvocation.class libgc
-friend 'class _Jv_InterpMethod;' \ -friend 'class _Jv_InterpMethod;' \
$(basename $<) $(basename $<)
install-data-local:
$(PRE_INSTALL)
@for f in $(nat_headers) $(extra_headers); do \
d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
$(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \
if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \
done
maintainer-check: libgcj.la maintainer-check: libgcj.la
$(NM) .libs/libgcj.a | grep ' T ' \ $(NM) .libs/libgcj.a | grep ' T ' \
| grep -v '4java' \ | grep -v '4java' \
......
libjava/boehm.cc
...@@ -12,10 +12,10 @@ details. */ ...@@ -12,10 +12,10 @@ details. */
#include <stdio.h> #include <stdio.h>
#include <cni.h>
#include <java/lang/Class.h>
#include <jvm.h> #include <jvm.h>
#include <java-field.h> #include <gcj/cni.h>
#include <java/lang/Class.h>
#include <java-interp.h> #include <java-interp.h>
// More nastiness: the GC wants to define TRUE and FALSE. We don't // More nastiness: the GC wants to define TRUE and FALSE. We don't
......
libjava/classes.pl
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# details. # details.
# Usage: cd <top-srcdir> ; perl classes.pl. # Usage: cd <top-srcdir> ; perl classes.pl.
# Can also be run from the `include' directory; this lets us # Can also be run from the `gcj' directory; this lets us
# more easily insert the output into javaprims.h (which is where it goes). # more easily insert the output into javaprims.h (which is where it goes).
use DirHandle; use DirHandle;
...@@ -100,5 +100,5 @@ sub scan ...@@ -100,5 +100,5 @@ sub scan
&scan ("$dir/$_", $indent + 2); &scan ("$dir/$_", $indent + 2);
} }
print $spaces, "};\n"; print $spaces, "}\n";
} }
libjava/configure
...@@ -5411,7 +5411,7 @@ done ...@@ -5411,7 +5411,7 @@ done
ac_given_srcdir=$srcdir ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL" ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile libgcj.spec testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 trap 'rm -fr `echo "Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
...@@ -5564,7 +5564,7 @@ EOF ...@@ -5564,7 +5564,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec testsuite/Makefile"} CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile"}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
......
libjava/configure.in
...@@ -624,7 +624,7 @@ fi ...@@ -624,7 +624,7 @@ fi
here=`pwd` here=`pwd`
AC_SUBST(here) AC_SUBST(here)
AC_OUTPUT(Makefile libgcj.spec testsuite/Makefile, AC_OUTPUT(Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile,
[if test -n "$CONFIG_FILES"; then [if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
fi], fi],
......
libjava/defineclass.cc
...@@ -18,12 +18,14 @@ details. */ ...@@ -18,12 +18,14 @@ details. */
currently being ignored ("InnerClasses", "LineNumber", etc...). currently being ignored ("InnerClasses", "LineNumber", etc...).
*/ */
#include <config.h>
#include <java-interp.h> #include <java-interp.h>
#ifdef INTERPRETER #ifdef INTERPRETER
#include <java-cpool.h> #include <java-cpool.h>
#include <cni.h> #include <gcj/cni.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/Float.h> #include <java/lang/Float.h>
......
libjava/exception.cc
...@@ -15,7 +15,7 @@ details. */ ...@@ -15,7 +15,7 @@ details. */
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/NullPointerException.h> #include <java/lang/NullPointerException.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
// eh-common.h needs gansidecl.h. // eh-common.h needs gansidecl.h.
......
libjava/gcj/Makefile.am 0 → 100644
## Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = foreign no-installinfo
gcjdir = $(includedir)/gcj
gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
libjava/gcj/Makefile.in 0 → 100644
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
AR = @AR@
AS = @AS@
CC = @CC@
COMPPATH = @COMPPATH@
CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@
EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
EXEEXT = @EXEEXT@
GCDEPS = @GCDEPS@
GCINCS = @GCINCS@
GCLIBS = @GCLIBS@
GCOBJS = @GCOBJS@
GCSPEC = @GCSPEC@
LD = @LD@
LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
PACKAGE = @PACKAGE@
PERL = @PERL@
RANLIB = @RANLIB@
SYSTEMSPEC = @SYSTEMSPEC@
THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
ZDEPS = @ZDEPS@
ZINCS = @ZINCS@
ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@
here = @here@
libgcj_basedir = @libgcj_basedir@
AUTOMAKE_OPTIONS = foreign no-installinfo
gcjdir = $(includedir)/gcj
gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../include/config.h
CONFIG_CLEAN_FILES =
HEADERS = $(gcj_HEADERS)
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --foreign gcj/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-gcjHEADERS: $(gcj_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(gcjdir)
@list='$(gcj_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gcjdir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(gcjdir)/$$p; \
done
uninstall-gcjHEADERS:
@$(NORMAL_UNINSTALL)
list='$(gcj_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(gcjdir)/$$p; \
done
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = gcj
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gcj/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-info-am:
install-info: install-info-am
install-exec-am:
install-exec: install-exec-am
install-data-am: install-gcjHEADERS
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-gcjHEADERS
uninstall: uninstall-am
all-am: Makefile $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(gcjdir)
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-tags clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-tags distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: uninstall-gcjHEADERS install-gcjHEADERS tags mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck install-info-am \
install-info install-exec-am install-exec install-data-am install-data \
install-am install uninstall-am uninstall all-redirect all-am all \
installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
libjava/include/java-array.h → libjava/gcj/array.h
// java-array.h - Header file for CNI arrays. -*- c++ -*- // array.h - Header file for CNI arrays. -*- c++ -*-
/* Copyright (C) 1998, 1999 Cygnus Solutions /* Copyright (C) 1998, 1999 Cygnus Solutions
...@@ -8,8 +8,8 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,8 +8,8 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#ifndef __JAVA_ARRAY_H__ #ifndef __GCJ_ARRAY_H__
#define __JAVA_ARRAY_H__ #define __GCJ_ARRAY_H__
#pragma interface #pragma interface
...@@ -74,4 +74,4 @@ void _Jv_RunMain (const char* name, int argc, const char **argv); ...@@ -74,4 +74,4 @@ void _Jv_RunMain (const char* name, int argc, const char **argv);
inline jsize JvGetArrayLength (jarray array) { return array->length; } inline jsize JvGetArrayLength (jarray array) { return array->length; }
#endif /* __JAVA_ARRAY_H__ */ #endif /* __GCJ_ARRAY_H__ */
libjava/include/cni.h → libjava/gcj/cni.h
// cni.h -*- c++ -*- // gcj/cni.h -*- c++ -*-
// This file describes the Cygnus Native Interface, CNI. // This file describes the Cygnus Native Interface, CNI.
// It provides a nicer interface to many of the things in javaprims.h. // It provides a nicer interface to many of the things in gcj/javaprims.h.
/* Copyright (C) 1998, 1999 Cygnus Solutions /* Copyright (C) 1998, 1999 Cygnus Solutions
...@@ -10,14 +10,13 @@ This software is copyrighted work licensed under the terms of the ...@@ -10,14 +10,13 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#ifndef __JAVA_CNI_H__ #ifndef __GCJ_CNI_H__
#define __JAVA_CNI_H__ #define __GCJ_CNI_H__
#include <java/lang/Object.h> #include <java/lang/Object.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java-threads.h> #include <gcj/array.h>
#include <java-array.h>
extern inline jobject extern inline jobject
JvAllocObject (jclass cls) JvAllocObject (jclass cls)
...@@ -130,4 +129,4 @@ JvFree (void *ptr) ...@@ -130,4 +129,4 @@ JvFree (void *ptr)
{ {
return _Jv_Free (ptr); return _Jv_Free (ptr);
} }
#endif /* __JAVA_CNI_H__ */ #endif /* __GCJ_CNI_H__ */
libjava/include/java-field.h → libjava/gcj/field.h
// java-field.h - Header file for fieldID instances. -*- c++ -*- // field.h - Header file for fieldID instances. -*- c++ -*-
/* Copyright (C) 1998, 1999 Cygnus Solutions /* Copyright (C) 1998, 1999 Cygnus Solutions
...@@ -8,8 +8,8 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,8 +8,8 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#ifndef __JAVA_FIELD_H__ #ifndef __GCJ_FIELD_H__
#define __JAVA_FIELD_H__ #define __GCJ_FIELD_H__
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/reflect/Field.h> #include <java/lang/reflect/Field.h>
...@@ -138,7 +138,7 @@ _Jv_FromReflectedField (java::lang::reflect::Field *field) ...@@ -138,7 +138,7 @@ _Jv_FromReflectedField (java::lang::reflect::Field *field)
} }
#ifdef __JAVA_CNI_H__ #ifdef __GCJ_CNI_H__
extern inline jfieldID extern inline jfieldID
JvGetFirstInstanceField (jclass klass) JvGetFirstInstanceField (jclass klass)
{ {
...@@ -162,8 +162,8 @@ JvGetObjectField (jobject obj, _Jv_Field* field) ...@@ -162,8 +162,8 @@ JvGetObjectField (jobject obj, _Jv_Field* field)
{ {
return _Jv_GetObjectField (obj, field); return _Jv_GetObjectField (obj, field);
} }
#endif /* defined (__JAVA_CNI_H__) */ #endif /* defined (__GCJ_CNI_H__) */
#endif #endif
#endif /* __JAVA_FIELD_H */ #endif /* __GCJ_FIELD_H */
libjava/include/javaprims.h → libjava/gcj/javaprims.h
...@@ -93,7 +93,7 @@ extern "Java" ...@@ -93,7 +93,7 @@ extern "Java"
class UTFDataFormatException; class UTFDataFormatException;
class UnsupportedEncodingException; class UnsupportedEncodingException;
class Writer; class Writer;
}; }
namespace lang namespace lang
{ {
...@@ -180,8 +180,8 @@ extern "Java" ...@@ -180,8 +180,8 @@ extern "Java"
class Member; class Member;
class Method; class Method;
class Modifier; class Modifier;
}; }
}; }
namespace util namespace util
{ {
...@@ -220,7 +220,7 @@ extern "Java" ...@@ -220,7 +220,7 @@ extern "Java"
class JarEntry; class JarEntry;
class JarFile; class JarFile;
class JarInputStream; class JarInputStream;
}; }
namespace zip namespace zip
{ {
...@@ -243,9 +243,9 @@ extern "Java" ...@@ -243,9 +243,9 @@ extern "Java"
class ZipFile; class ZipFile;
class ZipInputStream; class ZipInputStream;
class ZipOutputStream; class ZipOutputStream;
}; }
}; }
}; }
}; };
typedef struct java::lang::Object* jobject; typedef struct java::lang::Object* jobject;
......
libjava/include/java-method.h → libjava/gcj/method.h
...@@ -8,9 +8,14 @@ This software is copyrighted work licensed under the terms of the ...@@ -8,9 +8,14 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#ifndef __GCJ_METHOD_H__
#define __GCJ_METHOD_H__
extern inline jmethodID extern inline jmethodID
_Jv_FromReflectedMethod(java::lang::reflect::Method *method) _Jv_FromReflectedMethod(java::lang::reflect::Method *method)
{ {
return (jmethodID) return (jmethodID)
((char *) method->declaringClass->methods + method->offset); ((char *) method->declaringClass->methods + method->offset);
} }
#endif /* __GCJ_METHOD_H__ */
libjava/gij.cc
...@@ -9,7 +9,7 @@ details. */ ...@@ -9,7 +9,7 @@ details. */
/* Author: Kresten Krab Thorup <krab@gnu.org> */ /* Author: Kresten Krab Thorup <krab@gnu.org> */
#include <jvm.h> #include <jvm.h>
#include <cni.h> #include <gcj/cni.h>
#include <stdio.h> #include <stdio.h>
#include <java/lang/System.h> #include <java/lang/System.h>
......
libjava/gnu/gcj/convert/natInput_EUCJIS.cc
...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for ...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <gnu/gcj/convert/Input_EUCJIS.h> #include <gnu/gcj/convert/Input_EUCJIS.h>
#define ERROR_CHAR 0xFFFD #define ERROR_CHAR 0xFFFD
......
libjava/gnu/gcj/convert/natInput_SJIS.cc
...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for ...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <gnu/gcj/convert/Input_SJIS.h> #include <gnu/gcj/convert/Input_SJIS.h>
#define ERROR_CHAR 0xFFFD #define ERROR_CHAR 0xFFFD
......
libjava/gnu/gcj/convert/natOutput_EUCJIS.cc
...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for ...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <gnu/gcj/convert/Output_EUCJIS.h> #include <gnu/gcj/convert/Output_EUCJIS.h>
/* A trie structure to map unicode values to JIS codes. /* A trie structure to map unicode values to JIS codes.
......
libjava/gnu/gcj/convert/natOutput_SJIS.cc
...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for ...@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <gnu/gcj/convert/Output_SJIS.h> #include <gnu/gcj/convert/Output_SJIS.h>
extern unsigned short Unicode_to_JIS[]; extern unsigned short Unicode_to_JIS[];
......
libjava/include/Makefile.am 0 → 100644
## Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = foreign no-installinfo
## FIXME: for now we don't install jni.h because we aren't really sure
## where to install it.
## include_HEADERS = jni.h
libjava/include/Makefile.in 0 → 100644
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
AR = @AR@
AS = @AS@
CC = @CC@
COMPPATH = @COMPPATH@
CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@
EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
EXEEXT = @EXEEXT@
GCDEPS = @GCDEPS@
GCINCS = @GCINCS@
GCLIBS = @GCLIBS@
GCOBJS = @GCOBJS@
GCSPEC = @GCSPEC@
LD = @LD@
LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
PACKAGE = @PACKAGE@
PERL = @PERL@
RANLIB = @RANLIB@
SYSTEMSPEC = @SYSTEMSPEC@
THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
ZDEPS = @ZDEPS@
ZINCS = @ZINCS@
ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@
here = @here@
libgcj_basedir = @libgcj_basedir@
AUTOMAKE_OPTIONS = foreign no-installinfo
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
config.h: stamp-h
@if test ! -f $@; then \
rm -f stamp-h; \
$(MAKE) stamp-h; \
else :; fi
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=include/config.h \
$(SHELL) ./config.status
@echo timestamp > stamp-h 2> /dev/null
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/stamp-h.in; \
$(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
mostlyclean-hdr:
clean-hdr:
distclean-hdr:
-rm -f config.h
maintainer-clean-hdr:
tags: TAGS
TAGS:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = include
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign include/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-info-am:
install-info: install-info-am
all-recursive-am: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
install-exec-am:
install-exec: install-exec-am
install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am:
uninstall: uninstall-am
all-am: Makefile config.h
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-hdr mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-hdr clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-hdr distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-hdr maintainer-clean-generic \
distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
tags distdir info-am info dvi-am dvi check check-am installcheck-am \
installcheck install-info-am install-info all-recursive-am \
install-exec-am install-exec install-data-am install-data install-am \
install uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
libjava/include/java-cpool.h
...@@ -11,7 +11,7 @@ details. */ ...@@ -11,7 +11,7 @@ details. */
#ifndef __JAVA_CPOOL_H__ #ifndef __JAVA_CPOOL_H__
#define __JAVA_CPOOL_H__ #define __JAVA_CPOOL_H__
#include <javaprims.h> #include <gcj/javaprims.h>
// we rename these, to avoid polluting the name space // we rename these, to avoid polluting the name space
#define JV_CONSTANT_Undefined (0L) #define JV_CONSTANT_Undefined (0L)
......
libjava/include/java-interp.h
...@@ -11,8 +11,6 @@ details. */ ...@@ -11,8 +11,6 @@ details. */
#ifndef __JAVA_INTERP_H__ #ifndef __JAVA_INTERP_H__
#define __JAVA_INTERP_H__ #define __JAVA_INTERP_H__
#include <config.h>
#include <jvm.h> #include <jvm.h>
#include <java-cpool.h> #include <java-cpool.h>
......
libjava/include/jni.h
...@@ -6,8 +6,8 @@ This software is copyrighted work licensed under the terms of the ...@@ -6,8 +6,8 @@ This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */ details. */
#ifndef __JAVA_JNI_H__ #ifndef __GCJ_JNI_H__
#define __JAVA_JNI_H__ #define __GCJ_JNI_H__
#include <stdarg.h> #include <stdarg.h>
#define _Jv_va_list va_list #define _Jv_va_list va_list
...@@ -15,7 +15,7 @@ details. */ ...@@ -15,7 +15,7 @@ details. */
#ifdef __cplusplus #ifdef __cplusplus
// This is wrong, because it pollutes the name-space too much! // This is wrong, because it pollutes the name-space too much!
#include <javaprims.h> #include <gcj/javaprims.h>
typedef struct _Jv_JNIEnv JNIEnv; typedef struct _Jv_JNIEnv JNIEnv;
#else #else
...@@ -293,4 +293,4 @@ _Jv_JNIEnv::GetStringLength (jstring str) ...@@ -293,4 +293,4 @@ _Jv_JNIEnv::GetStringLength (jstring str)
#endif #endif
#endif /* __JAVA_JNI_H__ */ #endif /* __GCJ_JNI_H__ */
libjava/include/jvm.h
...@@ -11,8 +11,18 @@ details. */ ...@@ -11,8 +11,18 @@ details. */
#ifndef __JAVA_JVM_H__ #ifndef __JAVA_JVM_H__
#define __JAVA_JVM_H__ #define __JAVA_JVM_H__
#include <gcj/javaprims.h>
#include <java-assert.h> #include <java-assert.h>
#include <java-field.h> #include <java-threads.h>
// Must include java-gc.h before Object.h for the implementation.
#include <java-gc.h>
#include <java/lang/Object.h>
// Include cni.h before field.h to enable all definitions. FIXME.
#include <gcj/cni.h>
#include <gcj/field.h>
/* Structure of the virtual table. */ /* Structure of the virtual table. */
struct _Jv_VTable struct _Jv_VTable
......
libjava/interpret.cc
...@@ -14,9 +14,7 @@ details. */ ...@@ -14,9 +14,7 @@ details. */
#pragma implementation "java-interp.h" #pragma implementation "java-interp.h"
#include <cni.h>
#include <jvm.h> #include <jvm.h>
#include <java-field.h>
#include <java-cpool.h> #include <java-cpool.h>
#include <java-interp.h> #include <java-interp.h>
#include <java/lang/fdlibm.h> #include <java/lang/fdlibm.h>
......
libjava/java/awt/natToolkit.cc
...@@ -10,7 +10,7 @@ details. */ ...@@ -10,7 +10,7 @@ details. */
/*#define ENABLE_GTK*/ /*#define ENABLE_GTK*/
#include <cni.h> #include <gcj/cni.h>
#include <java/awt/Toolkit.h> #include <java/awt/Toolkit.h>
#ifdef ENABLE_GTK #ifdef ENABLE_GTK
#include <java/awt/peer/GtkToolkit.h> #include <java/awt/peer/GtkToolkit.h>
......
libjava/java/io/natFile.cc
...@@ -29,7 +29,7 @@ details. */ ...@@ -29,7 +29,7 @@ details. */
#endif #endif
#include <string.h> #include <string.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/io/File.h> #include <java/io/File.h>
#include <java/io/IOException.h> #include <java/io/IOException.h>
......
libjava/java/io/natFileDescriptorEcos.cc
...@@ -16,7 +16,7 @@ details. */ ...@@ -16,7 +16,7 @@ details. */
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/io/FileDescriptor.h> #include <java/io/FileDescriptor.h>
#include <java/io/SyncFailedException.h> #include <java/io/SyncFailedException.h>
......
libjava/java/io/natFileDescriptorPosix.cc
...@@ -34,7 +34,7 @@ details. */ ...@@ -34,7 +34,7 @@ details. */
#include <sys/filio.h> #include <sys/filio.h>
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/io/FileDescriptor.h> #include <java/io/FileDescriptor.h>
#include <java/io/SyncFailedException.h> #include <java/io/SyncFailedException.h>
......
libjava/java/lang/Class.h
...@@ -18,7 +18,7 @@ details. */ ...@@ -18,7 +18,7 @@ details. */
#include <java/lang/String.h> #include <java/lang/String.h>
#include <java/net/URL.h> #include <java/net/URL.h>
// We declare these here to avoid including cni.h. // We declare these here to avoid including gcj/cni.h.
extern "C" void _Jv_InitClass (jclass klass); extern "C" void _Jv_InitClass (jclass klass);
extern "C" void _Jv_RegisterClasses (jclass *classes); extern "C" void _Jv_RegisterClasses (jclass *classes);
......
libjava/java/lang/Object.h
...@@ -13,10 +13,7 @@ details. */ ...@@ -13,10 +13,7 @@ details. */
#pragma interface #pragma interface
#include <javaprims.h> #include <gcj/javaprims.h>
#include <java-assert.h>
#include <java-threads.h>
#include <java-gc.h>
// This class is mainly here as a kludge to get G++ to allocate // This class is mainly here as a kludge to get G++ to allocate
// vtable pointer as the *first* word of each Object, instead of // vtable pointer as the *first* word of each Object, instead of
......
libjava/java/lang/natCharacter.cc
...@@ -10,7 +10,7 @@ details. */ ...@@ -10,7 +10,7 @@ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Character.h> #include <java/lang/Character.h>
......
libjava/java/lang/natClass.cc
...@@ -15,7 +15,7 @@ details. */ ...@@ -15,7 +15,7 @@ details. */
#pragma implementation "Class.h" #pragma implementation "Class.h"
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/ClassLoader.h> #include <java/lang/ClassLoader.h>
......
libjava/java/lang/natClassLoader.cc
...@@ -15,8 +15,12 @@ details. */ ...@@ -15,8 +15,12 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java-threads.h>
#include <java-interp.h>
#include <java/lang/Character.h> #include <java/lang/Character.h>
#include <java/lang/Thread.h> #include <java/lang/Thread.h>
#include <java/lang/ClassLoader.h> #include <java/lang/ClassLoader.h>
...@@ -31,8 +35,6 @@ details. */ ...@@ -31,8 +35,6 @@ details. */
#include <java/lang/IncompatibleClassChangeError.h> #include <java/lang/IncompatibleClassChangeError.h>
#include <java/lang/reflect/Modifier.h> #include <java/lang/reflect/Modifier.h>
#include <java-interp.h>
#define CloneableClass _CL_Q34java4lang9Cloneable #define CloneableClass _CL_Q34java4lang9Cloneable
extern java::lang::Class CloneableClass; extern java::lang::Class CloneableClass;
#define ObjectClass _CL_Q34java4lang6Object #define ObjectClass _CL_Q34java4lang6Object
......
libjava/java/lang/natDouble.cc
...@@ -25,7 +25,7 @@ char *alloca (); ...@@ -25,7 +25,7 @@ char *alloca ();
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <java/lang/String.h> #include <java/lang/String.h>
#include <java/lang/Double.h> #include <java/lang/Double.h>
#include <java/lang/NumberFormatException.h> #include <java/lang/NumberFormatException.h>
......
libjava/java/lang/natEcosProcess.cc
...@@ -14,7 +14,7 @@ details. */ ...@@ -14,7 +14,7 @@ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/ConcreteProcess.h> #include <java/lang/ConcreteProcess.h>
......
libjava/java/lang/natFirstThread.cc
...@@ -12,7 +12,7 @@ details. */ ...@@ -12,7 +12,7 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/FirstThread.h> #include <java/lang/FirstThread.h>
......
libjava/java/lang/natMath.cc
...@@ -23,7 +23,7 @@ details. */ ...@@ -23,7 +23,7 @@ details. */
#include <java/lang/Integer.h> #include <java/lang/Integer.h>
#include <java/lang/Long.h> #include <java/lang/Long.h>
#include <java/lang/Math.h> #include <java/lang/Math.h>
#include <java-array.h> #include <gcj/array.h>
#include "fdlibm.h" #include "fdlibm.h"
......
libjava/java/lang/natObject.cc
...@@ -14,7 +14,7 @@ details. */ ...@@ -14,7 +14,7 @@ details. */
#pragma implementation "Object.h" #pragma implementation "Object.h"
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Object.h> #include <java/lang/Object.h>
#include <java-threads.h> #include <java-threads.h>
......
libjava/java/lang/natPosixProcess.cc
...@@ -22,7 +22,7 @@ details. */ ...@@ -22,7 +22,7 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/ConcreteProcess.h> #include <java/lang/ConcreteProcess.h>
......
libjava/java/lang/natRuntime.cc
...@@ -12,7 +12,7 @@ details. */ ...@@ -12,7 +12,7 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Runtime.h> #include <java/lang/Runtime.h>
#include <java/lang/UnknownError.h> #include <java/lang/UnknownError.h>
......
libjava/java/lang/natString.cc
...@@ -13,7 +13,7 @@ details. */ ...@@ -13,7 +13,7 @@ details. */
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <java/lang/Character.h> #include <java/lang/Character.h>
#include <java/lang/String.h> #include <java/lang/String.h>
#include <java/lang/IndexOutOfBoundsException.h> #include <java/lang/IndexOutOfBoundsException.h>
......
libjava/java/lang/natSystem.cc
...@@ -38,7 +38,7 @@ details. */ ...@@ -38,7 +38,7 @@ details. */
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/System.h> #include <java/lang/System.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
......
libjava/java/lang/natThread.cc
...@@ -12,8 +12,10 @@ details. */ ...@@ -12,8 +12,10 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java-threads.h>
#include <java/lang/Thread.h> #include <java/lang/Thread.h>
#include <java/lang/ThreadGroup.h> #include <java/lang/ThreadGroup.h>
#include <java/lang/IllegalArgumentException.h> #include <java/lang/IllegalArgumentException.h>
......
libjava/java/lang/reflect/natArray.cc
...@@ -13,7 +13,7 @@ details. */ ...@@ -13,7 +13,7 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <jvm.h> #include <jvm.h>
#include <cni.h> #include <gcj/cni.h>
#include <java/lang/reflect/Array.h> #include <java/lang/reflect/Array.h>
#include <java/lang/IllegalArgumentException.h> #include <java/lang/IllegalArgumentException.h>
#include <java/lang/Byte.h> #include <java/lang/Byte.h>
......
libjava/java/lang/reflect/natField.cc
...@@ -12,7 +12,6 @@ details. */ ...@@ -12,7 +12,6 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/reflect/Field.h> #include <java/lang/reflect/Field.h>
#include <java/lang/reflect/Modifier.h> #include <java/lang/reflect/Modifier.h>
...@@ -26,7 +25,6 @@ details. */ ...@@ -26,7 +25,6 @@ details. */
#include <java/lang/Double.h> #include <java/lang/Double.h>
#include <java/lang/Boolean.h> #include <java/lang/Boolean.h>
#include <java/lang/Character.h> #include <java/lang/Character.h>
#include <java-field.h>
jint jint
java::lang::reflect::Field::getModifiers () java::lang::reflect::Field::getModifiers ()
......
libjava/java/lang/reflect/natMethod.cc
...@@ -12,9 +12,8 @@ details. */ ...@@ -12,9 +12,8 @@ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java-array.h>
#include <java/lang/reflect/Method.h> #include <java/lang/reflect/Method.h>
#include <java/lang/reflect/InvocationTargetException.h> #include <java/lang/reflect/InvocationTargetException.h>
...@@ -32,7 +31,7 @@ details. */ ...@@ -32,7 +31,7 @@ details. */
#include <java/lang/IllegalArgumentException.h> #include <java/lang/IllegalArgumentException.h>
#include <java/lang/NullPointerException.h> #include <java/lang/NullPointerException.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java-method.h> #include <gcj/method.h>
#define ClassClass _CL_Q34java4lang5Class #define ClassClass _CL_Q34java4lang5Class
extern java::lang::Class ClassClass; extern java::lang::Class ClassClass;
......
libjava/java/net/natInetAddress.cc
...@@ -35,7 +35,7 @@ details. */ ...@@ -35,7 +35,7 @@ details. */
#include <netdb.h> #include <netdb.h>
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/net/InetAddress.h> #include <java/net/InetAddress.h>
#include <java/net/UnknownHostException.h> #include <java/net/UnknownHostException.h>
......
libjava/java/net/natPlainDatagramSocketImpl.cc
...@@ -33,7 +33,7 @@ details. */ ...@@ -33,7 +33,7 @@ details. */
#include <bstring.h> #include <bstring.h>
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <java/io/IOException.h> #include <java/io/IOException.h>
#include <java/io/FileDescriptor.h> #include <java/io/FileDescriptor.h>
#include <java/io/InterruptedIOException.h> #include <java/io/InterruptedIOException.h>
......
libjava/java/net/natPlainSocketImpl.cc
...@@ -25,8 +25,8 @@ details. */ ...@@ -25,8 +25,8 @@ details. */
#include <bstring.h> #include <bstring.h>
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <javaprims.h> #include <gcj/javaprims.h>
#include <java/io/IOException.h> #include <java/io/IOException.h>
#include <java/io/FileDescriptor.h> #include <java/io/FileDescriptor.h>
#include <java/io/InterruptedIOException.h> #include <java/io/InterruptedIOException.h>
......
libjava/java/text/natCollator.cc
...@@ -12,7 +12,7 @@ details. */ ...@@ -12,7 +12,7 @@ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/text/Collator.h> #include <java/text/Collator.h>
......
libjava/java/util/natDate.cc
...@@ -14,7 +14,7 @@ details. */ ...@@ -14,7 +14,7 @@ details. */
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <java/util/Date.h> #include <java/util/Date.h>
#include <java/lang/String.h> #include <java/lang/String.h>
......
libjava/java/util/natGregorianCalendar.cc
...@@ -22,7 +22,7 @@ details. */ ...@@ -22,7 +22,7 @@ details. */
#include <string.h> #include <string.h>
#endif #endif
#include <cni.h> #include <gcj/cni.h>
#include <java/util/TimeZone.h> #include <java/util/TimeZone.h>
#include <java/util/GregorianCalendar.h> #include <java/util/GregorianCalendar.h>
#include <time.h> #include <time.h>
......
libjava/java/util/zip/natDeflater.cc
...@@ -15,7 +15,7 @@ details. */ ...@@ -15,7 +15,7 @@ details. */
#include <zlib.h> #include <zlib.h>
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/util/zip/Deflater.h> #include <java/util/zip/Deflater.h>
......
libjava/java/util/zip/natInflater.cc
...@@ -15,7 +15,7 @@ details. */ ...@@ -15,7 +15,7 @@ details. */
#include <zlib.h> #include <zlib.h>
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/util/zip/Inflater.h> #include <java/util/zip/Inflater.h>
......
libjava/jni.cc
...@@ -13,7 +13,7 @@ details. */ ...@@ -13,7 +13,7 @@ details. */
#include <stddef.h> #include <stddef.h>
#include <jni.h> #include <jni.h>
#include <java-field.h> #include <gcj/field.h>
static jclass static jclass
_Jv_JNI_GetSuperclass (JNIEnv *, jclass clazz) _Jv_JNI_GetSuperclass (JNIEnv *, jclass clazz)
......
libjava/no-threads.cc
...@@ -10,7 +10,7 @@ details. */ ...@@ -10,7 +10,7 @@ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Thread.h> #include <java/lang/Thread.h>
......
libjava/nogc.cc
...@@ -13,7 +13,7 @@ details. */ ...@@ -13,7 +13,7 @@ details. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
// Total amount of memory allocated. // Total amount of memory allocated.
......
libjava/posix-threads.cc
...@@ -28,7 +28,7 @@ extern "C" ...@@ -28,7 +28,7 @@ extern "C"
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Thread.h> #include <java/lang/Thread.h>
#include <java/lang/System.h> #include <java/lang/System.h>
......
libjava/prims.cc
...@@ -15,11 +15,12 @@ details. */ ...@@ -15,11 +15,12 @@ details. */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#pragma implementation "java-array.h" #pragma implementation "gcj/array.h"
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java-signal.h> #include <java-signal.h>
#include <java-threads.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/Runtime.h> #include <java/lang/Runtime.h>
......
libjava/quick-threads.cc
...@@ -10,7 +10,7 @@ details. */ ...@@ -10,7 +10,7 @@ details. */
#include <config.h> #include <config.h>
#include <cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>
#include <java/lang/Thread.h> #include <java/lang/Thread.h>
......
libjava/resolve.cc
...@@ -10,10 +10,12 @@ details. */ ...@@ -10,10 +10,12 @@ details. */
/* Author: Kresten Krab Thorup <krab@gnu.org> */ /* Author: Kresten Krab Thorup <krab@gnu.org> */
#include <config.h>
#include <java-interp.h> #include <java-interp.h>
#include <cni.h>
#include <jvm.h> #include <jvm.h>
#include <gcj/cni.h>
#include <string.h> #include <string.h>
#include <java-cpool.h> #include <java-cpool.h>
#include <java/lang/Class.h> #include <java/lang/Class.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment