1999-08-08 15:27:18 +02:00
|
|
|
## Process this with automake to create Makefile.in
|
|
|
|
|
|
2004-11-23 05:11:31 +01:00
|
|
|
AUTOMAKE_OPTIONS = foreign subdir-objects
|
2007-01-17 20:48:52 +01:00
|
|
|
ACLOCAL_AMFLAGS = -I .. -I ../config
|
1999-08-08 15:27:18 +02:00
|
|
|
|
2003-09-04 16:47:05 +02:00
|
|
|
SUBDIRS = include testsuite
|
|
|
|
|
|
2007-04-13 09:21:04 +02:00
|
|
|
EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
|
[multiple changes]
2003-10-21 Andreas Tobler <a.tobler@schweiz.ch>
* configure.in: AC_LINK_FILES(ffitarget.h).
* configure: Regenerate.
* Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* fficonfig.h.in: Likewise.
2003-10-21 Paolo Bonzini <bonzini@gnu.org>
Richard Henderson <rth@redhat.com>
Avoid that ffi.h includes fficonfig.h.
* Makefile.am (EXTRA_DIST): Include ffitarget.h files
(TARGET_SRC_MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX.
(TARGET_SRC_MIPS_SGI): Removed.
(MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX.
(MIPS_SGI): Removed.
(CLEANFILES): Removed.
(mostlyclean-am, clean-am, mostlyclean-sub, clean-sub): New
targets.
* acconfig.h: Removed.
* configure.in: Compute sizeofs only for double and long double.
Use them to define and subst HAVE_LONG_DOUBLE. Include comments
into AC_DEFINE instead of using acconfig.h. Create
include/ffitarget.h instead of include/fficonfig.h. Rename
MIPS_GCC to MIPS_IRIX, drop MIPS_SGI since we are in gcc's tree.
AC_DEFINE EH_FRAME_FLAGS.
* include/Makefile.am (DISTCLEANFILES): New automake macro.
(hack_DATA): Add ffitarget.h.
* include/ffi.h.in: Remove all system specific definitions.
Declare raw API even if it is not installed, why bother?
Use limits.h instead of SIZEOF_* to define ffi_type_*. Do
not define EH_FRAME_FLAGS, it is in fficonfig.h now. Include
ffitarget.h instead of fficonfig.h. Remove ALIGN macro.
(UINT_ARG, INT_ARG): Removed, use ffi_arg and ffi_sarg instead.
* include/ffi_common.h (bool): Do not define.
(ffi_assert): Accept failed assertion.
(ffi_type_test): Return void and accept file/line.
(FFI_ASSERT): Pass stringized failed assertion.
(FFI_ASSERT_AT): New macro.
(FFI_ASSERT_VALID_TYPE): New macro.
(UINT8, SINT8, UINT16, SINT16, UINT32, SINT32,
UINT64, SINT64): Define here with gcc's __attribute__ macro
instead of in ffi.h
(FLOAT32, ALIGN): Define here instead of in ffi.h
* include/ffi-mips.h: Removed. Its content moved to
src/mips/ffitarget.h after separating assembly and C sections.
* src/alpha/ffi.c, src/alpha/ffi.c, src/java_raw_api.c
src/prep_cif.c, src/raw_api.c, src/ia64/ffi.c,
src/mips/ffi.c, src/mips/n32.S, src/mips/o32.S,
src/mips/ffitarget.h, src/sparc/ffi.c, src/x86/ffi64.c:
SIZEOF_ARG -> FFI_SIZEOF_ARG.
* src/ia64/ffi.c: Include stdbool.h (provided by GCC 2.95+).
* src/debug.c (ffi_assert): Accept stringized failed assertion.
(ffi_type_test): Rewritten.
* src/prep-cif.c (initialize_aggregate, ffi_prep_cif): Call
FFI_ASSERT_VALID_TYPE.
* src/alpha/ffitarget.h, src/arm/ffitarget.h,
src/ia64/ffitarget.h, src/m68k/ffitarget.h,
src/mips/ffitarget.h, src/powerpc/ffitarget.h,
src/s390/ffitarget.h, src/sh/ffitarget.h,
src/sh64/ffitarget.h, src/sparc/ffitarget.h,
src/x86/ffitarget.h: New files.
* src/alpha/osf.S, src/arm/sysv.S, src/ia64/unix.S,
src/m68k/sysv.S, src/mips/n32.S, src/mips/o32.S,
src/powerpc/aix.S, src/powerpc/darwin.S,
src/powerpc/ffi_darwin.c, src/powerpc/linux64.S,
src/powerpc/linux64_closure.S, src/powerpc/ppc_closure.S,
src/powerpc/sysv.S, src/s390/sysv.S, src/sh/sysv.S,
src/sh64/sysv.S, src/sparc/v8.S, src/sparc/v9.S,
src/x86/sysv.S, src/x86/unix64.S, src/x86/win32.S:
include fficonfig.h
From-SVN: r72766
2003-10-21 21:01:58 +02:00
|
|
|
src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
|
|
|
|
|
src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
|
2005-04-18 19:08:58 +02:00
|
|
|
src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
|
2007-04-13 09:21:04 +02:00
|
|
|
src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
|
|
|
|
|
src/ia64/unix.S \
|
[multiple changes]
2003-10-21 Andreas Tobler <a.tobler@schweiz.ch>
* configure.in: AC_LINK_FILES(ffitarget.h).
* configure: Regenerate.
* Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* fficonfig.h.in: Likewise.
2003-10-21 Paolo Bonzini <bonzini@gnu.org>
Richard Henderson <rth@redhat.com>
Avoid that ffi.h includes fficonfig.h.
* Makefile.am (EXTRA_DIST): Include ffitarget.h files
(TARGET_SRC_MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX.
(TARGET_SRC_MIPS_SGI): Removed.
(MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX.
(MIPS_SGI): Removed.
(CLEANFILES): Removed.
(mostlyclean-am, clean-am, mostlyclean-sub, clean-sub): New
targets.
* acconfig.h: Removed.
* configure.in: Compute sizeofs only for double and long double.
Use them to define and subst HAVE_LONG_DOUBLE. Include comments
into AC_DEFINE instead of using acconfig.h. Create
include/ffitarget.h instead of include/fficonfig.h. Rename
MIPS_GCC to MIPS_IRIX, drop MIPS_SGI since we are in gcc's tree.
AC_DEFINE EH_FRAME_FLAGS.
* include/Makefile.am (DISTCLEANFILES): New automake macro.
(hack_DATA): Add ffitarget.h.
* include/ffi.h.in: Remove all system specific definitions.
Declare raw API even if it is not installed, why bother?
Use limits.h instead of SIZEOF_* to define ffi_type_*. Do
not define EH_FRAME_FLAGS, it is in fficonfig.h now. Include
ffitarget.h instead of fficonfig.h. Remove ALIGN macro.
(UINT_ARG, INT_ARG): Removed, use ffi_arg and ffi_sarg instead.
* include/ffi_common.h (bool): Do not define.
(ffi_assert): Accept failed assertion.
(ffi_type_test): Return void and accept file/line.
(FFI_ASSERT): Pass stringized failed assertion.
(FFI_ASSERT_AT): New macro.
(FFI_ASSERT_VALID_TYPE): New macro.
(UINT8, SINT8, UINT16, SINT16, UINT32, SINT32,
UINT64, SINT64): Define here with gcc's __attribute__ macro
instead of in ffi.h
(FLOAT32, ALIGN): Define here instead of in ffi.h
* include/ffi-mips.h: Removed. Its content moved to
src/mips/ffitarget.h after separating assembly and C sections.
* src/alpha/ffi.c, src/alpha/ffi.c, src/java_raw_api.c
src/prep_cif.c, src/raw_api.c, src/ia64/ffi.c,
src/mips/ffi.c, src/mips/n32.S, src/mips/o32.S,
src/mips/ffitarget.h, src/sparc/ffi.c, src/x86/ffi64.c:
SIZEOF_ARG -> FFI_SIZEOF_ARG.
* src/ia64/ffi.c: Include stdbool.h (provided by GCC 2.95+).
* src/debug.c (ffi_assert): Accept stringized failed assertion.
(ffi_type_test): Rewritten.
* src/prep-cif.c (initialize_aggregate, ffi_prep_cif): Call
FFI_ASSERT_VALID_TYPE.
* src/alpha/ffitarget.h, src/arm/ffitarget.h,
src/ia64/ffitarget.h, src/m68k/ffitarget.h,
src/mips/ffitarget.h, src/powerpc/ffitarget.h,
src/s390/ffitarget.h, src/sh/ffitarget.h,
src/sh64/ffitarget.h, src/sparc/ffitarget.h,
src/x86/ffitarget.h: New files.
* src/alpha/osf.S, src/arm/sysv.S, src/ia64/unix.S,
src/m68k/sysv.S, src/mips/n32.S, src/mips/o32.S,
src/powerpc/aix.S, src/powerpc/darwin.S,
src/powerpc/ffi_darwin.c, src/powerpc/linux64.S,
src/powerpc/linux64_closure.S, src/powerpc/ppc_closure.S,
src/powerpc/sysv.S, src/s390/sysv.S, src/sh/sysv.S,
src/sh64/sysv.S, src/sparc/v8.S, src/sparc/v9.S,
src/x86/sysv.S, src/x86/unix64.S, src/x86/win32.S:
include fficonfig.h
From-SVN: r72766
2003-10-21 21:01:58 +02:00
|
|
|
src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
|
|
|
|
|
src/mips/ffitarget.h \
|
2004-10-13 19:20:24 +02:00
|
|
|
src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
|
[multiple changes]
2003-10-21 Andreas Tobler <a.tobler@schweiz.ch>
* configure.in: AC_LINK_FILES(ffitarget.h).
* configure: Regenerate.
* Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* fficonfig.h.in: Likewise.
2003-10-21 Paolo Bonzini <bonzini@gnu.org>
Richard Henderson <rth@redhat.com>
Avoid that ffi.h includes fficonfig.h.
* Makefile.am (EXTRA_DIST): Include ffitarget.h files
(TARGET_SRC_MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX.
(TARGET_SRC_MIPS_SGI): Removed.
(MIPS_GCC): Renamed to TARGET_SRC_MIPS_IRIX.
(MIPS_SGI): Removed.
(CLEANFILES): Removed.
(mostlyclean-am, clean-am, mostlyclean-sub, clean-sub): New
targets.
* acconfig.h: Removed.
* configure.in: Compute sizeofs only for double and long double.
Use them to define and subst HAVE_LONG_DOUBLE. Include comments
into AC_DEFINE instead of using acconfig.h. Create
include/ffitarget.h instead of include/fficonfig.h. Rename
MIPS_GCC to MIPS_IRIX, drop MIPS_SGI since we are in gcc's tree.
AC_DEFINE EH_FRAME_FLAGS.
* include/Makefile.am (DISTCLEANFILES): New automake macro.
(hack_DATA): Add ffitarget.h.
* include/ffi.h.in: Remove all system specific definitions.
Declare raw API even if it is not installed, why bother?
Use limits.h instead of SIZEOF_* to define ffi_type_*. Do
not define EH_FRAME_FLAGS, it is in fficonfig.h now. Include
ffitarget.h instead of fficonfig.h. Remove ALIGN macro.
(UINT_ARG, INT_ARG): Removed, use ffi_arg and ffi_sarg instead.
* include/ffi_common.h (bool): Do not define.
(ffi_assert): Accept failed assertion.
(ffi_type_test): Return void and accept file/line.
(FFI_ASSERT): Pass stringized failed assertion.
(FFI_ASSERT_AT): New macro.
(FFI_ASSERT_VALID_TYPE): New macro.
(UINT8, SINT8, UINT16, SINT16, UINT32, SINT32,
UINT64, SINT64): Define here with gcc's __attribute__ macro
instead of in ffi.h
(FLOAT32, ALIGN): Define here instead of in ffi.h
* include/ffi-mips.h: Removed. Its content moved to
src/mips/ffitarget.h after separating assembly and C sections.
* src/alpha/ffi.c, src/alpha/ffi.c, src/java_raw_api.c
src/prep_cif.c, src/raw_api.c, src/ia64/ffi.c,
src/mips/ffi.c, src/mips/n32.S, src/mips/o32.S,
src/mips/ffitarget.h, src/sparc/ffi.c, src/x86/ffi64.c:
SIZEOF_ARG -> FFI_SIZEOF_ARG.
* src/ia64/ffi.c: Include stdbool.h (provided by GCC 2.95+).
* src/debug.c (ffi_assert): Accept stringized failed assertion.
(ffi_type_test): Rewritten.
* src/prep-cif.c (initialize_aggregate, ffi_prep_cif): Call
FFI_ASSERT_VALID_TYPE.
* src/alpha/ffitarget.h, src/arm/ffitarget.h,
src/ia64/ffitarget.h, src/m68k/ffitarget.h,
src/mips/ffitarget.h, src/powerpc/ffitarget.h,
src/s390/ffitarget.h, src/sh/ffitarget.h,
src/sh64/ffitarget.h, src/sparc/ffitarget.h,
src/x86/ffitarget.h: New files.
* src/alpha/osf.S, src/arm/sysv.S, src/ia64/unix.S,
src/m68k/sysv.S, src/mips/n32.S, src/mips/o32.S,
src/powerpc/aix.S, src/powerpc/darwin.S,
src/powerpc/ffi_darwin.c, src/powerpc/linux64.S,
src/powerpc/linux64_closure.S, src/powerpc/ppc_closure.S,
src/powerpc/sysv.S, src/s390/sysv.S, src/sh/sysv.S,
src/sh64/sysv.S, src/sparc/v8.S, src/sparc/v9.S,
src/x86/sysv.S, src/x86/unix64.S, src/x86/win32.S:
include fficonfig.h
From-SVN: r72766
2003-10-21 21:01:58 +02:00
|
|
|
src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
|
|
|
|
|
src/powerpc/ffi.c src/powerpc/sysv.S \
|
|
|
|
|
src/powerpc/linux64.S src/powerpc/linux64_closure.S \
|
|
|
|
|
src/powerpc/ppc_closure.S src/powerpc/asm.h \
|
|
|
|
|
src/powerpc/aix.S src/powerpc/darwin.S \
|
|
|
|
|
src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
|
|
|
|
|
src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h \
|
|
|
|
|
src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h \
|
|
|
|
|
src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h \
|
|
|
|
|
src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \
|
|
|
|
|
src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \
|
|
|
|
|
src/sparc/ffi.c \
|
2006-10-10 16:21:05 +02:00
|
|
|
src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \
|
2004-03-19 23:34:17 +01:00
|
|
|
src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
|
2007-04-13 09:21:04 +02:00
|
|
|
src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
|
|
|
|
|
src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h
|
2000-05-01 23:35:35 +02:00
|
|
|
|
|
|
|
|
## ################################################################
|
|
|
|
|
|
|
|
|
|
##
|
|
|
|
|
## This section is for make and multilib madness.
|
|
|
|
|
##
|
|
|
|
|
|
|
|
|
|
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
|
|
|
|
# values defined in terms of make variables, as is the case for CC and
|
|
|
|
|
# friends when we are called from the top level Makefile.
|
|
|
|
|
AM_MAKEFLAGS = \
|
|
|
|
|
"AR_FLAGS=$(AR_FLAGS)" \
|
|
|
|
|
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
|
|
|
|
"CFLAGS=$(CFLAGS)" \
|
|
|
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
|
|
|
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
|
|
|
|
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
|
|
|
|
"INSTALL=$(INSTALL)" \
|
|
|
|
|
"INSTALL_DATA=$(INSTALL_DATA)" \
|
|
|
|
|
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
|
|
|
|
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
|
|
|
|
"JC1FLAGS=$(JC1FLAGS)" \
|
|
|
|
|
"LDFLAGS=$(LDFLAGS)" \
|
|
|
|
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
|
|
|
|
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
|
|
|
|
"MAKE=$(MAKE)" \
|
|
|
|
|
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
|
|
|
|
"PICFLAG=$(PICFLAG)" \
|
|
|
|
|
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
2003-09-04 16:47:05 +02:00
|
|
|
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
2000-05-01 23:35:35 +02:00
|
|
|
"SHELL=$(SHELL)" \
|
|
|
|
|
"exec_prefix=$(exec_prefix)" \
|
|
|
|
|
"infodir=$(infodir)" \
|
|
|
|
|
"libdir=$(libdir)" \
|
|
|
|
|
"prefix=$(prefix)" \
|
|
|
|
|
"AR=$(AR)" \
|
|
|
|
|
"AS=$(AS)" \
|
|
|
|
|
"CC=$(CC)" \
|
|
|
|
|
"CXX=$(CXX)" \
|
|
|
|
|
"LD=$(LD)" \
|
|
|
|
|
"NM=$(NM)" \
|
|
|
|
|
"RANLIB=$(RANLIB)" \
|
|
|
|
|
"DESTDIR=$(DESTDIR)"
|
|
|
|
|
|
|
|
|
|
MAKEOVERRIDES=
|
|
|
|
|
|
1999-08-08 15:27:18 +02:00
|
|
|
toolexeclib_LTLIBRARIES = libffi.la
|
2002-03-17 01:35:21 +01:00
|
|
|
noinst_LTLIBRARIES = libffi_convenience.la
|
1999-08-08 15:27:18 +02:00
|
|
|
|
2004-03-11 20:59:49 +01:00
|
|
|
libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c \
|
ffi.h.in (ffi_closure_alloc, [...]): New.
libffi/ChangeLog:
* include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New.
(ffi_prep_closure_loc): New.
(ffi_prep_raw_closure_loc): New.
(ffi_prep_java_raw_closure_loc): New.
* src/closures.c: New file.
* src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment):
Replace sflags with exec_offset.
[FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset,
sub_segment_exec_offset): New macros.
(get_segment_flags, set_segment_flags, check_segment_merge): New
macros.
(is_mmapped_segment, is_extern_segment): Use get_segment_flags.
(add_segment, sys_alloc, create_mspace, create_mspace_with_base,
destroy_mspace): Use new macros.
(sys_alloc): Silence warning.
* Makefile.am (libffi_la_SOURCES): Add src/closures.c.
* Makefile.in: Rebuilt.
* src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in
terms of ffi_prep_closure_loc.
* src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted
from...
(ffi_prep_raw_closure): ... this. Re-implement in terms of the
renamed version.
* src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and
adjusted from...
(ffi_prep_java_raw_closure): ... this. Re-implement in terms of
the renamed version.
* src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
* src/pa/ffi.c: Likewise.
* src/cris/ffi.c: Likewise. Adjust.
* src/frv/ffi.c: Likewise.
* src/ia64/ffi.c: Likewise.
* src/mips/ffi.c: Likewise.
* src/powerpc/ffi_darwin.c: Likewise.
* src/s390/ffi.c: Likewise.
* src/sh/ffi.c: Likewise.
* src/sh64/ffi.c: Likewise.
* src/sparc/ffi.c: Likewise.
* src/x86/ffi64.c: Likewise.
* src/x86/ffi.c: Likewise.
(FFI_INIT_TRAMPOLINE): Adjust.
(ffi_prep_raw_closure_loc): Renamed and adjusted from...
(ffi_prep_raw_closure): ... this.
* src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
(flush_icache): Adjust.
boehm-gc/ChangeLog:
* include/gc.h (GC_REGISTER_FINALIZER_UNREACHABLE): New.
(GC_register_finalizer_unreachable): Declare.
(GC_debug_register_finalizer_unreachable): Declare.
* finalize.c (GC_unreachable_finalize_mark_proc): New.
(GC_register_finalizer_unreachable): New.
(GC_finalize): Handle it.
* dbg_mlc.c (GC_debug_register_finalizer_unreachable): New.
(GC_debug_register_finalizer_no_order): Fix whitespace.
libjava/ChangeLog:
* include/jvm.h (_Jv_ClosureListFinalizer): New.
(_Jv_Linker::create_error_method): Adjust.
* boehm.cc (_Jv_ClosureListFinalizer): New.
* nogc.cc (_Jv_ClosureListFinalizer): New.
* java/lang/Class.h (class _Jv_ClosureList): New.
(class java::lang::Class): Declare it as friend.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures): New.
(_Jv_ClosureList::registerClousure): New.
* include/execution.h (_Jv_ExecutionEngine): Add get_closure_list.
(_Jv_CompiledEngine::do_get_closure_list): New.
(_Jv_CompiledEngine::_Jv_CompiledEngine): Use it.
(_Jv_IndirectCompiledClass): Add closures.
(_Jv_IndirectCompiledEngine::get_aux_info): New.
(_Jv_IndirectCompiledEngine::do_allocate_field_initializers): Use
it.
(_Jv_IndirectCompiledEngine::do_get_closure_list): New.
(_Jv_IndirectCompiledEngine::_Jv_IndirectCompiledEngine): Use it.
(_Jv_InterpreterEngine::do_get_closure_list): Declare.
(_Jv_InterpreterEngine::_Jv_InterpreterEngine): Use it.
* interpret.cc (FFI_PREP_RAW_CLOSURE): Use _loc variants.
(node_closure): Add closure list.
(_Jv_InterpMethod::ncode): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_JNIMethod::ncode): Likewise.
(_Jv_InterpreterEngine::do_create_ncode): Pass klass to ncode.
(_Jv_InterpreterEngine::do_get_closure_list): New.
* include/java-interp.h (_Jv_InterpMethod::ncode): Adjust.
(_Jv_InterpClass): Add closures field.
(_Jv_JNIMethod::ncode): Adjust.
* defineclass.cc (_Jv_ClassReader::handleCodeAttribute): Adjust.
(_Jv_ClassReader::handleMethodsEnd): Likewise.
* link.cc (struct method_closure): Add closure list.
(_Jv_Linker::create_error_method): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_Linker::link_symbol_table): Remove outdated comment about
sharing of otable and atable. Adjust.
* java/lang/reflect/natVMProxy.cc (ncode_closure): Add closure
list.
(ncode): Add jclass argument. Use ffi_closure_alloc and the
separate code pointer. Register the closure for finalization.
(java::lang::reflect::VMProxy::generateProxyClass): Adjust.
* testsuite/libjava.jar/TestClosureGC.java: New.
* testsuite/libjava.jar/TestClosureGC.out: New.
* testsuite/libjava.jar/TestClosureGC.xfail: New.
* testsuite/libjava.jar/TestClosureGC.jar: New.
From-SVN: r122652
2007-03-07 08:27:25 +01:00
|
|
|
src/raw_api.c src/java_raw_api.c src/closures.c
|
1999-08-08 15:27:18 +02:00
|
|
|
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES =
|
1999-08-08 15:27:18 +02:00
|
|
|
|
2007-09-03 20:08:54 +02:00
|
|
|
if MIPS
|
re PR libffi/28313 (libffi has not been ported to mips64-linux-gnu)
PR libffi/28313
* configure.ac: Don't treat mips64 as a special case.
* Makefile.am (nodist_libffi_la_SOURCES): Add n32.S.
* configure: Regenerate
* Makefile.in: Ditto.
* fficonfig.h.in: Ditto.
* src/mips/ffitarget.h (REG_L, REG_S, SUBU, ADDU, SRL, LI): Indent.
(LA, EH_FRAME_ALIGN, FDE_ADDR_BYTES): New preprocessor macros.
(FFI_DEFAULT_ABI): Set for n64 case.
(FFI_CLOSURES, FFI_TRAMPOLINE_SIZE): Define for n32 and n64 cases.
* src/mips/n32.S (ffi_call_N32): Add debug macros and labels for FDE.
(ffi_closure_N32): New function.
(.eh_frame): New section
* src/mips/o32.S: Clean up comments.
(ffi_closure_O32): Pass ffi_closure parameter in $12.
* src/mips/ffi.c: Use FFI_MIPS_N32 instead of
_MIPS_SIM == _ABIN32 throughout.
(FFI_MIPS_STOP_HERE): New, use in place of
ffi_stop_here.
(ffi_prep_args): Use unsigned long to hold pointer values. Rewrite
to support n32/n64 ABIs.
(calc_n32_struct_flags): Rewrite.
(calc_n32_return_struct_flags): Remove unused variable. Reverse
position of flag bits.
(ffi_prep_cif_machdep): Rewrite n32 portion.
(ffi_call): Enable for n64. Add special handling for small structure
return values.
(ffi_prep_closure_loc): Add n32 and n64 support.
(ffi_closure_mips_inner_O32): Add cast to silence warning.
(copy_struct_N32, ffi_closure_mips_inner_N32): New functions.
From-SVN: r127336
2007-08-10 17:35:55 +02:00
|
|
|
nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
|
2002-07-18 19:55:28 +02:00
|
|
|
endif
|
1999-08-08 15:27:18 +02:00
|
|
|
if X86
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
|
1999-08-08 15:27:18 +02:00
|
|
|
endif
|
2001-03-27 04:39:16 +02:00
|
|
|
if X86_WIN32
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win32.S
|
2001-03-27 04:39:16 +02:00
|
|
|
endif
|
2006-10-10 16:21:05 +02:00
|
|
|
if X86_DARWIN
|
2006-12-14 08:34:45 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
|
2006-10-10 16:21:05 +02:00
|
|
|
endif
|
1999-08-08 15:27:18 +02:00
|
|
|
if SPARC
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
|
1999-08-08 15:27:18 +02:00
|
|
|
endif
|
|
|
|
|
if ALPHA
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/alpha/ffi.c src/alpha/osf.S
|
1999-08-08 15:27:18 +02:00
|
|
|
endif
|
2000-02-25 20:13:44 +01:00
|
|
|
if IA64
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/ia64/ffi.c src/ia64/unix.S
|
2000-02-25 20:13:44 +01:00
|
|
|
endif
|
2004-10-13 19:20:24 +02:00
|
|
|
if M32R
|
|
|
|
|
nodist_libffi_la_SOURCES += src/m32r/sysv.S src/m32r/ffi.c
|
|
|
|
|
endif
|
1999-08-08 15:27:18 +02:00
|
|
|
if M68K
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
|
1999-08-08 15:27:18 +02:00
|
|
|
endif
|
|
|
|
|
if POWERPC
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
|
1999-08-08 15:27:18 +02:00
|
|
|
endif
|
2002-01-17 17:04:21 +01:00
|
|
|
if POWERPC_AIX
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
|
2002-01-17 17:04:21 +01:00
|
|
|
endif
|
2001-10-09 07:32:16 +02:00
|
|
|
if POWERPC_DARWIN
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
|
2001-10-09 07:32:16 +02:00
|
|
|
endif
|
2005-07-19 23:15:36 +02:00
|
|
|
if POWERPC_FREEBSD
|
|
|
|
|
nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
|
|
|
|
|
endif
|
1999-08-08 15:27:18 +02:00
|
|
|
if ARM
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
|
1999-08-08 15:27:18 +02:00
|
|
|
endif
|
2005-04-18 19:08:58 +02:00
|
|
|
if LIBFFI_CRIS
|
|
|
|
|
nodist_libffi_la_SOURCES += src/cris/sysv.S src/cris/ffi.c
|
|
|
|
|
endif
|
2004-08-30 17:43:03 +02:00
|
|
|
if FRV
|
|
|
|
|
nodist_libffi_la_SOURCES += src/frv/eabi.S src/frv/ffi.c
|
|
|
|
|
endif
|
2002-04-29 06:14:44 +02:00
|
|
|
if S390
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/s390/sysv.S src/s390/ffi.c
|
2002-04-29 06:14:44 +02:00
|
|
|
endif
|
2002-07-19 01:08:31 +02:00
|
|
|
if X86_64
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
|
2002-07-19 01:08:31 +02:00
|
|
|
endif
|
2002-07-19 03:08:43 +02:00
|
|
|
if SH
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/sh/sysv.S src/sh/ffi.c
|
2003-06-13 04:23:26 +02:00
|
|
|
endif
|
|
|
|
|
if SH64
|
2004-03-11 20:59:49 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/sh64/sysv.S src/sh64/ffi.c
|
2002-07-19 03:08:43 +02:00
|
|
|
endif
|
2006-04-05 23:26:34 +02:00
|
|
|
if PA_LINUX
|
2004-03-19 23:34:17 +01:00
|
|
|
nodist_libffi_la_SOURCES += src/pa/linux.S src/pa/ffi.c
|
|
|
|
|
endif
|
2006-04-05 23:26:34 +02:00
|
|
|
if PA_HPUX
|
|
|
|
|
nodist_libffi_la_SOURCES += src/pa/hpux32.S src/pa/ffi.c
|
|
|
|
|
endif
|
1999-08-08 15:27:18 +02:00
|
|
|
|
2004-03-11 20:59:49 +01:00
|
|
|
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
|
|
|
|
|
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
|
|
|
|
|
|
2003-09-04 16:47:05 +02:00
|
|
|
AM_CFLAGS = -Wall -g -fexceptions
|
1999-08-09 00:58:30 +02:00
|
|
|
|
2008-05-09 12:10:53 +02:00
|
|
|
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
|
|
|
|
|
|
|
|
|
|
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS)
|
1999-08-08 15:27:18 +02:00
|
|
|
|
2004-06-15 16:47:55 +02:00
|
|
|
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
|
|
|
|
|
AM_CCASFLAGS = $(AM_CPPFLAGS)
|
2006-05-24 03:45:57 +02:00
|
|
|
|
2007-03-02 00:51:37 +01:00
|
|
|
# No install-html or install-pdf support in automake yet
|
|
|
|
|
.PHONY: install-html install-pdf
|
2006-05-24 03:45:57 +02:00
|
|
|
install-html:
|
2007-03-02 00:51:37 +01:00
|
|
|
install-pdf:
|
2006-05-24 03:45:57 +02:00
|
|
|
|
2007-01-18 08:17:57 +01:00
|
|
|
# Multilib support. Automake should provide these on its own.
|
|
|
|
|
all-recursive: all-multi
|
|
|
|
|
install-recursive: install-multi
|
|
|
|
|
mostlyclean-recursive: mostlyclean-multi
|
|
|
|
|
clean-recursive: clean-multi
|
|
|
|
|
distclean-recursive: distclean-multi
|
|
|
|
|
maintainer-clean-recursive: maintainer-clean-multi
|