1 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ceb5d48..ac75547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2012-09-06   Diego Novillo  <dnovillo@google.com>
+2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
+
+	PR target/38607
+	Merge upstream change.
+	* libtool.m4 (_LT_COMPILER_PIC): Add -fPIC to GCC and GXX for AIX.
+
+	* configure.ac: Add target-libquadmath to noconfigdirs for AIX.
+	Add libgomp*.o to compare_exclusions for AIX.
+	* configure: Regenerate.
+
+2012-09-06  Diego Novillo  <dnovillo@google.com>
 
 	* configure.ac: Bump minimum GMP version to 4.2.3.
 	* configure: Re-generate.