* testsuite/libjava.jni/jni.exp (gcj_jni_build_header): Use

	-force.
	* testsuite/lib/libjava.exp (find_gcjh): Find 'gjavah' instead.
	* testsuite/libjava.cni/cni.exp (gcj_cni_build_headers): Pass -cni
	and -force to gcjh.
	* Makefile.in: Rebuilt.
	* Makefile.am (MYGCJH): Use gjavah.

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj-eclipse@117914 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 25 insertions, 5 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1dd853df993..4844e9eb126 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-20  Tom Tromey  <tromey@redhat.com>
+
+	* testsuite/libjava.jni/jni.exp (gcj_jni_build_header): Use
+	-force.
+	* testsuite/lib/libjava.exp (find_gcjh): Find 'gjavah' instead.
+	* testsuite/libjava.cni/cni.exp (gcj_cni_build_headers): Pass -cni
+	and -force to gcjh.
+	* Makefile.in: Rebuilt.
+	* Makefile.am (MYGCJH): Use gjavah.
+
 2006-10-18  Tom Tromey  <tromey@redhat.com>
 
 	PR classpath/28203:
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2e746d0e9ef..6d6fb547b98 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -396,7 +396,7 @@ omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
 
 generic_header_files = $(ordinary_header_files) $(xlib_nat_headers)
 
-MYGCJH = gcjh1
+MYGCJH = gjavah
 
 $(generic_header_files): gcjh.stamp
 
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 251a8740161..9bf01520ce3 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7468,7 +7468,7 @@ omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
 	java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h
 
 generic_header_files = $(ordinary_header_files) $(xlib_nat_headers)
-MYGCJH = gcjh1
+MYGCJH = gjavah
 inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
 	java/io/ObjectInputStream$$GetField.h \
 	java/nio/DirectByteBufferImpl$$ReadWrite.h \
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 0faa433ec54..502f3229e6b 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -82,7 +82,7 @@ proc find_jvscan {} {
 
 # Find `gcjh'.
 proc find_gcjh {} {
-    return [libjava_find_program gcjh]
+    return [libjava_find_program gjavah]
 }
 
 proc find_javac {} {
diff --git a/libjava/testsuite/libjava.cni/cni.exp b/libjava/testsuite/libjava.cni/cni.exp
index 22df1462c1d..e20c049b830 100644
--- a/libjava/testsuite/libjava.cni/cni.exp
+++ b/libjava/testsuite/libjava.cni/cni.exp
@@ -28,6 +28,8 @@ proc gcj_cni_compile_cxx_to_o {file {options {}}} {
 
 # Build header files given name of .java file.  Return 0 on failure.
 proc gcj_cni_build_headers {file} {
+  global libgcj_jar
+
   set gcjh [find_gcjh]
   set jvscan [find_jvscan]
 
@@ -40,8 +42,10 @@ proc gcj_cni_build_headers {file} {
   }
 
   foreach file [split $class_out] {
+    set cmd "$gcjh -cni -force -classpath .:$libgcj_jar $file"
+    verbose $cmd
     set x [string trim [libjava_prune_warnings \
-			  [lindex [local_exec "$gcjh $file" "" "" 300] 1]]]
+			  [lindex [local_exec $cmd "" "" 300] 1]]]
     if {$x != ""} {
       verbose "local_exec failed: $x" 2
       fail "$file header generation"
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 6cd677d77aa..5d20ea458ff 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -60,10 +60,16 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
 
 # Build a header file from a .class file.  Return 0 on failure.
 proc gcj_jni_build_header {file} {
+  global libgcj_jar
+
   set gcjh [find_gcjh]
   set file [file rootname $file]
+
+  set cmd "$gcjh -jni -force -classpath .:$libgcj_jar $file"
+  verbose $cmd
+
   set x [string trim [libjava_prune_warnings \
-			[lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]]
+			[lindex [local_exec $cmd "" "" 300] 1]]]
   if {$x != ""} {
     verbose "local_exec failed: $x" 2
     fail "$file header generation"