* config/i386/t-stack-i386 (LIB2ADD_ST): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164893
138bc75d-0d04-0410-961f-
82ee72b054a4
+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
* 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
# Makefile fragment to support -fsplit-stack for x86.
-LIB2ADD += $(srcdir)/config/i386/morestack.S
+LIB2ADD_ST += $(srcdir)/config/i386/morestack.S
# 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