* testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.

From-SVN: r116892

libjava/ChangeLog

+2006-09-12  Tom Tromey  <tromey@redhat.com>
+
+	* testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.
+
 2006-09-07  Matthias Klose  <doko@debian.org>
 
 	* Makefile.am (AM_CXXFLAGS): Remove duplicate define.
@@ -68,6 +72,7 @@
 	* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
 	Pass millis to _Jv_CondWait.
 
+>>>>>>> .r116849
 2006-08-31  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/28698:

libjava/testsuite/libjava.jacks/jacks.exp

 # Run the Jacks test suite.
 # See http://www-124.ibm.com/developerworks/oss/cvs/jikes/~checkout~/jacks/jacks.html
 
-proc load_gcc_lib { filename } {
-    global srcdir
-    load_file $srcdir/../../gcc/testsuite/lib/$filename
-}
-
 load_gcc_lib target-libpath.exp
 
 proc gcj_jacks_setup_xfail {ary} {