Commit Graph

31 Commits

Author SHA1 Message Date
Tom Tromey
262fa8a4b5 re PR java/29812 (env->klass value is not updated during the native calls)
PR java/29812:
	* testsuite/libjava.jni/pr29812.java: New file.
	* testsuite/libjava.jni/pr29812_injar.java: New file.
	* testsuite/libjava.jni/pr29812_injar.jar: New file.
	* testsuite/libjava.jni/pr29812.out: New file.
	* testsuite/libjava.jni/pr29812_injar.c: New file.
	* testsuite/libjava.jni/pr29812_injar.h: New file.
	* testsuite/libjava.jni/pr29812.jar: New file.
	* testsuite/libjava.jni/pr29812.c: New file.
	* testsuite/libjava.jni/pr29812.h: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
	New proc.
	(gcj_jni_invocation_test_one): Use it.
	(gcj_jni_pr29812): New proc.
	(gcj_jni_run): Use it.
	* java/lang/natRuntime.cc (_load): Push a new system frame before
	calling JNI_OnLoad.
	* include/jvm.h (_Jv_JNI_PopSystemFrame): Declare.
	(_Jv_GetJNIEnvNewFrameWithLoader): Likewise.
	* jni.cc (struct _Jv_JNI_LocalFrame) <marker>: Now unsigned char.
	<allocated_p>: Now bool.
	<loader>: New field.
	(_Jv_JNI_EnsureLocalCapacity): Updated.
	(_Jv_JNI_NewLocalRef): Likewise.
	(_Jv_JNI_NewLocalRef): Likewise.
	(_Jv_JNI_PopLocalFrame): Likewise.
	(_Jv_JNI_FindClass): Likewise.
	(_Jv_GetJNIEnvNewFrame): Likewise.
	(_Jv_JNI_AttachCurrentThread): Likewise.
	(_Jv_GetJNIEnvNewFrameWithLoader): New function.
	(_Jv_GetJNIEnvNewFrame): Use it.
	* include/jni_md.h (_CLASSPATH_JNIENV_CONTENTS): Removed 'klass'.

From-SVN: r121064
2007-01-22 23:04:16 +00:00
Tom Tromey
97b8365caf Merged gcj-eclipse branch to trunk.
From-SVN: r120621
2007-01-09 19:58:05 +00:00
Geoffrey Keating
cd709ec369 jni.exp (gcj_jni_invocation_test_one): Pass -lgcj to linker for C++ files on Darwin.
* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
	Pass -lgcj to linker for C++ files on Darwin.

From-SVN: r116639
2006-09-01 19:52:10 +00:00
Thomas Fitzsimmons
f23d4dca7e jni.exp (gcj_jni_invocation_test_one): Link against -ljvm, not -lgcj.
2006-06-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
	Link against -ljvm, not -lgcj.

From-SVN: r114902
2006-06-22 19:22:42 +00:00
Andreas Tobler
b3638b64c3 jni.exp (gcj_jni_compile_c_to_so): Add check for HP-UX and add appropriate extension for shared libraries, sl.
2006-05-06  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Add check for
	HP-UX and add appropriate extension for shared libraries, sl.
	(gcj_jni_test_one): Likewise.
	
	* testsuite/lib/libjava.exp (libjava_find_lib): Add sl to the shared
	library extensions.

From-SVN: r113587
2006-05-06 22:57:18 +02:00
Andrew Pinski
cc86dcfb99 jni.exp (gcj_jni_test_one): For darwin, use -shared-libgcc not -lgcc_s, and explain why.
2005-10-02  Andrew Pinski  <pinskia@physics.uc.edu>

        * testsuite/lib/jni.exp (gcj_jni_test_one): For
        darwin, use -shared-libgcc not -lgcc_s, and explain why.
        (gcj_jni_invocation_test_one): Likewise.

From-SVN: r104878
2005-10-02 14:40:55 -07:00
H.J. Lu
3fb90446b4 jni.exp (gcj_jni_invocation_test_one): Use libjava_find_lib to find the proper libgcj.
2005-09-17  H.J. Lu  <hongjiu.lu@intel.com>

	* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
	Use libjava_find_lib to find the proper libgcj.

From-SVN: r104370
2005-09-17 11:12:43 -07:00
Tom Tromey
b0fa81eea9 Major merge with Classpath.
Removed many duplicate files.
	* HACKING: Updated.x
	* classpath: Imported new directory.
	* standard.omit: New file.
	* Makefile.in, aclocal.m4, configure: Rebuilt.
	* sources.am: New file.
	* configure.ac: Run Classpath configure script.  Moved code around
	to support.  Disable xlib AWT peers (temporarily).
	* Makefile.am (SUBDIRS): Added 'classpath'
	(JAVAC): Removed.
	(AM_CPPFLAGS): Added more -I options.
	(BOOTCLASSPATH): Simplified.
	Completely redid how sources are built.
	Include sources.am.
	* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
	* include/jni.h: Removed (in Classpath).
	* scripts/classes.pl: Updated to look at built classes.
	* scripts/makemake.tcl: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
	-I options.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.

From-SVN: r102082
2005-07-16 01:27:14 +00:00
Andreas Tobler
423ceeadf1 jawt.c: Remove malloc.h, covered by stdlib.h.
2005-06-03  Andreas Tobler  <a.tobler@schweiz.ch>

	* jawt.c: Remove malloc.h, covered by stdlib.h.

	* testsuite/libjava.jni/jni.exp
	(gcj_jni_invocation_compile_c_to_binary): Add -bind_at_load to silence
	the build process.

From-SVN: r100504
2005-06-02 20:12:47 +02:00
Eric Botcazou
93f15e1e74 jni.exp (gcj_jni_invocation_test_one): Add libsocket to the libraries to link for Solaris.
* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add
	libsocket to the libraries to link for Solaris.

From-SVN: r97130
2005-03-28 12:08:28 +00:00
Andreas Tobler
930c1fc2a0 jni.exp (gcj_jni_invocation_test_one): Add lgcc_s to the libraries to link for Darwin.
2005-03-16  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add
	lgcc_s to the libraries to link for Darwin.

From-SVN: r96579
2005-03-16 22:16:00 +01:00
Andreas Tobler
a96cf7633a libjava.exp (libjava_init): Use the same target check for Darwin.
2005-03-11  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_init): Use the same target
	check for Darwin.
	(libjava_arguments): Likewise.

	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Likewise.
	(gcj_jni_test_one): Likewise.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.
	Add flags to keep the Darwin linker quiet.
	(gcj_jni_invocation_test_one): Use the same target check for Darwin.
	Add -liconv for Darwin.

From-SVN: r96311
2005-03-11 22:33:56 +01:00
Thomas Fitzsimmons
4300c4212e re PR libgcj/20292 (new test case PR16923 fails)
2005-03-03  Thomas Fitzsimmons  <fitzsim@redhat.com>

	PR libgcj/20292
	* testsuite/libjava.jni/jni.exp
	(gcj_jni_invocation_compile_c_to_binary): Add -I. -I.. to compile
	flags.
	(gcj_jni_invocation_test_one): Add -L../.libs to cxx flags.

From-SVN: r95848
2005-03-03 22:17:26 +00:00
Thomas Fitzsimmons
bc71e4a22b re PR libgcj/16923 (-D* Options passed to JNI_CreateJavaVM are ignored)
2005-02-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	PR libgcj/16923
	* gcj.texi (Invocation): Add descriptions of JvVMInitArgs and
	JvVMOption.

2005-02-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	PR libgcj/16923
	* jni.cc (JNI_CreateJavaVM): Check JNI version.  Cast args to
	JvVMInitArgs.  Pass args to _Jv_CreateJavaVM and check return
	value.  Move argument parsing code to prims.cc.
	* prims.cc (no_properties): Remove.
	(_Jv_Compiler_Properties): Initialize to NULL.
	(_Jv_Properties_Count): Initialize to 0.
	(parse_verbose_args): New function.
	(parse_init_args): New function.
	(_Jv_CreateJavaVM): Call parse_init_args.
	(_Jv_RunMain): Check return value of _Jv_CreateJavaVM.
	* gcj/cni.h (JvVMOption): New struct.
	(JvVMInitArgs): Likewise.
	(JvCreateJavaVM): Declare vm_args as JvVMInitArgs* rather than
	void*.
	* libjava/gcj/javaprims.h (_Jv_VMOption): New struct.
	(_Jv_VMInitArgs): Likewise.
	* include/java-props.h (_Jv_Properties_Count): Declare.
	* java/lang/natRuntime.cc (insertSystemProperties): Use
	_Jv_Properties_Count in for loop exit condition.
	* testsuite/libjava.jni/jni.exp
	(gcj_invocation_compile_c_to_binary): New procedure.
	(gcj_invocation_test_one): Likewise.
	(gcj_jni_run): Run JNI invocation API tests.
	* testsuite/libjava.jni/invocation/PR16923.c,
	testsuite/libjava.jni/invocation/PR16923.java,
	testsuite/libjava.jni/invocation/PR16923.out: New test.

From-SVN: r95459
2005-02-23 17:36:26 +00:00
Tom Tromey
d2b55bc559 jar.exp (gcj_jar_interpret): Updated.
* testsuite/libjava.jar/jar.exp (gcj_jar_interpret): Updated.
	* testsuite/libjava.verify/verify.exp (gcj_verify_run): Updated.
	* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Updated.
	* testsuite/lib/libjava.exp (libjava_find_spec): Don't use
	get_multilibs.
	(libjava_find_gij): Likewise.  Changed return result if gij not
	found.
	(test_libjava_from_javac): Updated.

From-SVN: r92446
2004-12-21 01:01:08 +00:00
Andreas Tobler
cfc74dce2a jni.exp (gcj_jni_test_one): Add lgcc_s for darwin.
2004-06-18  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Add lgcc_s for
	darwin.

From-SVN: r83360
2004-06-18 22:56:56 +02:00
Andreas Tobler
3f68457e24 libjava.exp (libjava_invoke): Add new argument ld_library_additions.
2004-05-10  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_invoke): Add new argument
	ld_library_additions. Adjust all calls to libjava_invoke to match
	the new argument.

	* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Pass stdc++
	path to cxxflagslist.
	Pass path of libstdc++ to libjava_invoke.

	* testsuite/libjava.jar/jar.exp (gcj_jar_inerpret): Adjust
	libjava_invoke arguments.

From-SVN: r81679
2004-05-10 22:44:13 +02:00
Ranjit Mathew
8e31e1284d jni.exp (gcj_jni_test_one): Don't link the main binary against the JNI shared library.
2004-05-07  Ranjit Mathew  <rmathew@gmail.com>

	* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Don't link the
	main binary against the JNI shared library.

From-SVN: r81622
2004-05-07 15:59:43 +01:00
Bryce McKinlay
579f964023 Run the jni tests using the interpreter.
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Append
	options_cxx to shared lib compile command.
	(gcj_jni_test_one): Pass cxxflags to gcj_jni_compile_c_to_so, so
	they are used to link the shared lib, not the main binary.
	Use libjava_invoke to run gij.

From-SVN: r81574
2004-05-06 18:54:30 +01:00
Ranjit Mathew
55ce9c52a2 re PR java/15133 (gcjh generates wrong method signatures)
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Use
	additional option "-Wmissing-prototypes" for compiling C sources.
	Print actual filename for pass/fail rather than $name.c.
	* testsuite/libjava.jni/PR15133.java: New testcase file.
	* testsuite/libjava.jni/PR15133.c: Likewise.
	* testsuite/libjava.jni/PR15133.out: Likewise.

Co-Authored-By: Tom Tromey <tromey@redhat.com>

From-SVN: r81358
2004-04-30 18:19:37 +00:00
Andreas Tobler
fb80b07d22 jni.exp: Add compilation/link fix dor darwin dylibs.
2003-03-22  Andreas Tobler <a.tobler@schweiz.ch>

        * libjava.jni/jni.exp: Add compilation/link fix dor darwin dylibs.

From-SVN: r64704
2003-03-22 11:45:04 +01:00
Tom Tromey
6932a1994e libjava.exp (gcj_invoke): Moved...
* lib/libjava.exp (gcj_invoke): Moved...
	* libjava.jni/jni.exp: ...from here.

	* libjava.cni/shortfield.out: New file.
	* libjava.cni/shortfield.java: New file.
	* libjava.cni/natshortfield.cc: New file.
	* libjava.cni/natlongfield.cc: New file.
	* libjava.cni/longfield.out: New file.
	* libjava.cni/longfield.java: New file.

	* libjava.cni/cni.exp: New file.

From-SVN: r64702
2003-03-22 07:14:53 +00:00
Tom Tromey
19eaa5a38b loader.exp (gcj_loader_test_one): Use libjava_prune_warnings.
* libjava.loader/loader.exp (gcj_loader_test_one): Use
	libjava_prune_warnings.
	(gcj_loader_run): Likewise.
	* libjava.mauve/mauve.exp (test_mauve): Use
	libjava_prune_warnings.
	(test_mauve_sim): Likewise.
	* libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Use
	libjava_prune_warnings.
	(gcj_jni_build_header): Likewise.
	* lib/libjava.exp (libjava_prune_warnings): New proc.
	(gcj_link): Use it.
	(test_libjava_from_source): Likewise.
	(test_libjava_from_javac): Likewise.

From-SVN: r60089
2002-12-13 05:00:15 +00:00
Rainer Orth
c1740ae3c1 compile.exp: Sort sources.
* libjava.compile/compile.exp: Sort sources.
	* libjava.jni/jni.exp (gcj_jni_run): Likewise.
	* libjava.lang/lang.exp: Likewise.

From-SVN: r55558
2002-07-18 17:42:31 +00:00
Anthony Green
fe4dabf80c jni.exp (gcj_jni_run): Fix cross build test.
2002-03-27  Anthony Green  <green@redhat.com>

	* libjava.jni/jni.exp (gcj_jni_run): Fix cross build test.

From-SVN: r51453
2002-03-27 16:29:04 +00:00
Tom Tromey
6a4ed6c8a9 jni.exp (gcj_jni_test_one): Find libstdc++ in build tree.
* libjava.jni/jni.exp (gcj_jni_test_one): Find libstdc++ in build
	tree.
	(gcj_invoke): Added ld_library_additions argument.

From-SVN: r51006
2002-03-18 21:39:09 +00:00
Tom Tromey
6e1a435df0 re PR other/5874 (gcc-3.1 20020304 (prerelease) FAILs in libjava testsuite with RUNTESTFLAGS="--target_board 'unix{-fPIC,-fpic,}'")
* libjava.jni/jni.exp (gcj_jni_build_header): Use local_exec, not
	target_compile.  Fixes PR other/5874.

From-SVN: r50923
2002-03-17 20:34:36 +00:00
H.J. Lu
ec6d4fa60c jni.exp: Add -I..
2002-01-05  H.J. Lu <hjl@gnu.org>

	* libjava.jni/jni.exp: Add -I.. for generated header.

From-SVN: r48571
2002-01-05 14:26:58 -08:00
Tom Tromey
1808372b58 For PR libgcj/5103:
* libjava.jni/cxxtest.out: New file.
	* libjava.jni/cxxtest.cc: New file.
	* libjava.jni/cxxtest.java: New file.
	* libjava.jni/jni.exp (gcj_jni_test_one): If there is no .c file,
	assume there is a .cc file.

From-SVN: r48012
2001-12-14 21:56:29 +00:00
Andreas Jaeger
20f8e4c7cc jni.exp (gcj_jni_compile_c_to_so): Fix path for jni.h.
* libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Fix path for
	jni.h.

From-SVN: r43549
2001-06-25 06:48:55 +02:00
Tom Tromey
d19da8d1b4 jni.exp: New file.
* libjava.jni/jni.exp: New file.
	* lib/libjava.exp (gcj_link): New proc.

From-SVN: r43375
2001-06-14 17:46:53 +00:00