diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c2cf9253e48e44ce2626ab17d8a7f606677e53da..c1ef36c5ba8b4c91ddd53578813f32ae22a0eee1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2008-09-03 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * config/abi/pre/gnu.ver: Also export __once_functor_lock; tighten
+ GLIBCXX_3.4 exports (necessary in case of undef _GLIBCXX_HAVE_TLS).
+
+ * Makefile.in: Regenerate.
+ * src/Makefile.in: Likewise.
+ * doc/Makefile.in: Likewise.
+ * po/Makefile.in: Likewise.
+ * libmath/Makefile.in: Likewise.
+ * include/Makefile.in: Likewise.
+ * libsupc++/Makefile.in: Likewise.
+ * testsuite/Makefile.in: Likewise.
+
2008-09-03 Paolo Carlini <paolo.carlini@oracle.com>
* acinclude.m4 ([GLIBCXX_CHECK_GTHREADS]): Fix typo in last commit,
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index e1013ef9c24eb5eb6beadfc342f9bc0f1fcea6e6..f4e4a414b8848dfeb57e6e0aa66205023039ed40 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -36,7 +36,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
$(srcdir)/../config.sub $(srcdir)/../install-sh \
$(srcdir)/../ltmain.sh $(srcdir)/../missing \
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 7f940121dc86745128420b4f58fc3ffba0b400d8..260340174ea2523ec8127edfc268df76df11c08b 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -131,7 +131,11 @@ GLIBCXX_3.4 {
std::t[a-n]*;
std::tr1::h[^a]*;
std::t[s-z]*;
- std::[A-Zu-z]*;
+# std::[A-Zu-z]*;
+ std::underflow_error*;
+ std::uncaught_exception*;
+ std::unexpected*;
+ std::[A-Zv-z]*;
std::_List_node_base::hook*;
std::_List_node_base::swap*;
std::_List_node_base::unhook*;
@@ -502,7 +506,12 @@ GLIBCXX_3.4 {
_ZTVSt[0-9][A-Za-z]*;
# _ZTVSt[0-9][0-9][A-Za-z]*;
_ZTVSt[0-9][0-9][A-Z]*;
- _ZTVSt[0-9][0-9][a-d]*;
+# _ZTVSt[0-9][0-9][a-d]*;
+ _ZTVSt[0-9][0-9]a*;
+ _ZTVSt10bad_typeid;
+ _ZTVSt13bad_exception;
+ _ZTVSt[0-9][0-9]basic*;
+ _ZTVSt[0-9][0-9][c-d]*;
_ZTVSt[0-9][0-9][f-k]*;
_ZTVSt11logic_error;
_ZTVSt12length_error;
@@ -525,7 +534,12 @@ GLIBCXX_3.4 {
_ZTISt[0-9][A-Za-z]*;
# _ZTISt[0-9][0-9][A-Za-z]*;
_ZTISt[0-9][0-9][A-Z]*;
- _ZTISt[0-9][0-9][a-d]*;
+# _ZTISt[0-9][0-9][a-d]*;
+ _ZTISt[0-9][0-9]a*;
+ _ZTISt10bad_typeid;
+ _ZTISt13bad_exception;
+ _ZTISt[0-9][0-9]basic*;
+ _ZTISt[0-9][0-9][c-d]*;
_ZTISt[0-9][0-9][f-k]*;
_ZTISt11logic_error;
_ZTISt12length_error;
@@ -550,9 +564,14 @@ GLIBCXX_3.4 {
_ZTSNSt6locale5facetE;
_ZTSS[a-z];
_ZTSSt[0-9][A-Za-z]*;
-# _ZTSSt[0-9][0-9][A-Za-z]*;
+# _ZTSSt[0-9][0-9][A-Za-z]*;
_ZTSSt[0-9][0-9][A-Z]*;
- _ZTSSt[0-9][0-9][a-d]*;
+# _ZTSSt[0-9][0-9][a-d]*;
+ _ZTSSt[0-9][0-9]a*;
+ _ZTSSt10bad_typeid;
+ _ZTSSt13bad_exception;
+ _ZTSSt[0-9][0-9]basic*;
+ _ZTSSt[0-9][0-9][c-d]*;
_ZTSSt[0-9][0-9][f-k]*;
_ZTSSt11logic_error;
_ZTSSt12length_error;
@@ -863,6 +882,7 @@ GLIBCXX_3.4.11 {
_ZSt11__once_call;
_ZSt15__once_callable;
_ZSt14__once_functor;
+ _ZSt19__once_functor_lock;
_ZSt11__once_lock;
_ZSt12__once_mutex;
__once_proxy;
diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index ab2a902e766d9359b87f8c573430805dcd0fde1a..17c2e864d3cba9968646ba0b0348089f7d0cb65e 100644
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -36,7 +36,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = doc
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 81d0cc8063381234a3609cc5132f326565f11fac..2c5d744fd4fabe2b39f779a03cafdf3ce42997dc 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -36,7 +36,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = include
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index 18dfbcc55591929978dd37d8d173d166c84e334a..1592897335ec2890386f75d9fa94721a33e4ecc3 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -37,7 +37,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
subdir = libmath
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 5b0a246f820dcaed003016dbacf30e1369aac108..c3d1c6c6b432d8e65bbbea423230affcbd7f8d9d 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -38,7 +38,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/fragment.am
subdir = libsupc++
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index 408562e7fc60766fac304823b07e7d3b2459f2a0..b19c1b4d94b11b8181fd5d8d4dd1aec9f057a4a1 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -36,7 +36,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = po
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 2f4f3ddae7ad8eeb5b281d2e7aba3f77289c22c1..6c2030a845edf4fd511a8a273b92ff8d2ffe828d 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -37,7 +37,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = src
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 9e58dfca798cfc84b05427732df72c35d3772984..4bd6419a506778d9dcb9158c84d7a8982a4c34f8 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -36,7 +36,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-LIBOBJDIR =
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/fragment.am
subdir = testsuite