diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 560c5327ac41d3b322fafe01628729243b22ef85..a262ee388ca1b4f4b90c1da2b8737c8e12198966 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libstdc++/17469
+	* testsuite/lib/libstdc++.exp: Don't use global ld_library_path.
+
 2004-09-24  Paolo Carlini  <pcarlini@suse.de>
 
 	* src/localename.cc (locale::locale(const char*)): Minor tweaks:
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 0b3b82b887e6ae445bf2231e81dff0e7b2034b40..2e8db1f4f5af9e8cf71750125ffa0183c68a3ca3 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -82,7 +82,7 @@ proc libstdc++_init { testfile } {
     global cxx cxxflags
     global includes
     global gluefile wrap_flags
-    global ld_library_path original_ld_library_path
+    global original_ld_library_path
     global target_triplet
 
     set blddir [lookfor_file [get_multilibs] libstdc++-v3]