aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2010-10-01 19:31:49 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2010-10-01 19:31:49 +0000
commitcdb388c24a3f806575c3124c3c47b8515a6678bf (patch)
tree6eb370f8e6bec0a144ba7d04a65681d62b260494 /libgcc
parentbf718682e1a6ce70dcd778b3c90223789c740e8d (diff)
downloadgcc-cdb388c24a3f806575c3124c3c47b8515a6678bf.zip
gcc-cdb388c24a3f806575c3124c3c47b8515a6678bf.tar.gz
gcc-cdb388c24a3f806575c3124c3c47b8515a6678bf.tar.bz2
t-stack (LIB2ADD_ST): Set instead of LIB2ADD.
* config/t-stack(LIB2ADD_ST): Set instead of LIB2ADD. * config/i386/t-stack-i386 (LIB2ADD_ST): Likewise. From-SVN: r164893
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/config/i386/t-stack-i3862
-rw-r--r--libgcc/config/t-stack2
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 <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 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