Merge commit 'origin/master' into dwarf

Conflicts:
	ChangeLog
	libdw/ChangeLog
	src/ChangeLog

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e3e425a..fcd9119b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 	* configure.ac: Add AC_PROG_CXX.
 
+2009-01-10  Ulrich Drepper  <[email protected]>
+
+	* configure.ac: Require gcc with TLS support.
+	Rename USE_TLS to USE_LOCKS.  The option is renamed to
+	--enable-thread-safety.
+
 2009-01-08  Roland McGrath  <[email protected]>
 
 	* configure.ac (eu_ZIPLIB): Moved to m4/zip.am.