diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ef470ec1123..467629f6184 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,15 +1,21 @@
+2006-02-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libgomp/25852
+	* testsuite/lib/libgomp-dg.exp (blddir): Set it in
+	libgomp_init.
+
 2005-01-25  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR libgomp/25884
-        * Makefile.am (omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Remove.
-        * configure.ac (PERL): Don't set.
-        (gstdint.h, omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Create here.
-        (OMP_LOCK_SIZE, OMP_LOCK_ALIGN, OMP_LOCK_KIND, OMP_NEST_LOCK_SIZE,
-        OMP_NEST_LOCK_ALIGN, OMP_NEST_LOCK_KIND): New substitutions.
-        * omp.h.in: Wrap the new configure substitutions with @ characters.
-        * omp_lib.h.in, omp_lib.f90.in, libgomp_f.h.in: Likewise.
-        * aclocal.m4, configure, Makefile.in: Regenerate.
-        * mkomp_h.pl: Delete.
+	* Makefile.am (omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Remove.
+	* configure.ac (PERL): Don't set.
+	(gstdint.h, omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Create here.
+	(OMP_LOCK_SIZE, OMP_LOCK_ALIGN, OMP_LOCK_KIND, OMP_NEST_LOCK_SIZE,
+	OMP_NEST_LOCK_ALIGN, OMP_NEST_LOCK_KIND): New substitutions.
+	* omp.h.in: Wrap the new configure substitutions with @ characters.
+	* omp_lib.h.in, omp_lib.f90.in, libgomp_f.h.in: Likewise.
+	* aclocal.m4, configure, Makefile.in: Regenerate.
+	* mkomp_h.pl: Delete.
 
 2005-01-24  Paolo Bonzini  <bonzini@gnu.org>
 
diff --git a/libgomp/testsuite/lib/libgomp-dg.exp b/libgomp/testsuite/lib/libgomp-dg.exp
index a0c675a7fe8..f6fed67b209 100644
--- a/libgomp/testsuite/lib/libgomp-dg.exp
+++ b/libgomp/testsuite/lib/libgomp-dg.exp
@@ -40,7 +40,6 @@ if [info exists TOOL_OPTIONS] {
 } else {
     set multilibs [get_multilibs]
 }
-set blddir [lookfor_file $multilibs libgomp]
 
 proc libgomp_init { args } {
     global srcdir blddir objdir tool_root_dir
@@ -58,6 +57,8 @@ proc libgomp_init { args } {
     global lang_library_path
     global lang_link_flags
 
+    set blddir [lookfor_file [get_multilibs] libgomp]
+
     # We set LC_ALL and LANG to C so that we get the same error
     # messages as expected.
     setenv LC_ALL C