diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index f3b4793827e..4a4003797a2 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Ian Lance Taylor  <iant@google.com>
+
+	* config/t-stack(LIB2ADD_ST): Set instead of LIB2ADD.
+	* config/i386/t-stack-i386 (LIB2ADD_ST): Likewise.
+
 2010-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/45858
@@ -34,7 +39,6 @@
 	* config.host (i[34567]86-*-linux* and friends): Add t-stack and
 	i386/t-stack-i386 to tmake_file.
 
->>>>>>> .r164755
 2010-09-21  Iain Sandoe  <iains@gcc.gnu.org>
 
 	* Makefile.in (libgcc-extra-parts):  Check for static archives and
diff --git a/libgcc/config/i386/t-stack-i386 b/libgcc/config/i386/t-stack-i386
index 6391cd2d46a..9965f9402cc 100644
--- a/libgcc/config/i386/t-stack-i386
+++ b/libgcc/config/i386/t-stack-i386
@@ -1,2 +1,2 @@
 # Makefile fragment to support -fsplit-stack for x86.
-LIB2ADD += $(srcdir)/config/i386/morestack.S
+LIB2ADD_ST += $(srcdir)/config/i386/morestack.S
diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack
index 9ac223d8497..cc0366b4cd8 100644
--- a/libgcc/config/t-stack
+++ b/libgcc/config/t-stack
@@ -1,4 +1,4 @@
 # Makefile fragment to provide generic support for -fsplit-stack.
 # This should be used in config.host for any host which supports
 # -fsplit-stack.
-LIB2ADD += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
+LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c