From 9266176dcb14764d5d35162db3396c5e80703207 Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 1 Oct 2010 19:31:49 +0000 Subject: [PATCH] * config/t-stack(LIB2ADD_ST): Set instead of LIB2ADD. * 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 --- libgcc/ChangeLog | 6 +++++- libgcc/config/i386/t-stack-i386 | 2 +- libgcc/config/t-stack | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index f3b4793..4a40037 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-01 Ian Lance Taylor + + * config/t-stack(LIB2ADD_ST): Set instead of LIB2ADD. + * config/i386/t-stack-i386 (LIB2ADD_ST): Likewise. + 2010-10-01 H.J. Lu 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 * 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 6391cd2..9965f94 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 9ac223d..cc0366b 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 -- 2.7.4