aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2014-03-25 21:18:57 +0800
committerThomas Preud'homme <robotux@celest.fr>2014-03-25 21:18:57 +0800
commit078ba241d9c24b15f734b4959f877519d7098140 (patch)
treee4a785b5f89e69e746e5f13fab17b3ada01d35e5
parentf1f45a47ef1c58e52a9599026ef666affc991b44 (diff)
downloadtinycc-078ba241d9c24b15f734b4959f877519d7098140.tar.gz
tinycc-078ba241d9c24b15f734b4959f877519d7098140.tar.bz2
Always link libtcc1.a in (useful for va_* on x86)
On x86 tcc call to function in libtcc1.a to implement va_* functions.
-rw-r--r--Makefile4
-rw-r--r--tccelf.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d116f07..4f18567 100644
--- a/Makefile
+++ b/Makefile
@@ -143,10 +143,6 @@ ifeq ($(TARGETOS),Darwin)
PROGS+=tiny_libmaker$(EXESUF)
endif
-ifdef CONFIG_USE_LIBGCC
-LIBTCC1=
-endif
-
TCCLIBS = $(LIBTCC1) $(LIBTCC) $(LIBTCC_EXTRA)
TCCDOCS = tcc.1 tcc-doc.html tcc-doc.info
diff --git a/tccelf.c b/tccelf.c
index ee00b03..5072aca 100644
--- a/tccelf.c
+++ b/tccelf.c
@@ -1377,9 +1377,10 @@ ST_FUNC void tcc_add_runtime(TCCState *s1)
if (!s1->nostdlib) {
tcc_add_library(s1, "c");
#ifdef CONFIG_USE_LIBGCC
- if (!s1->static_link)
+ if (!s1->static_link) {
tcc_add_file(s1, TCC_LIBGCC);
- else
+ tcc_add_support(s1, "libtcc1.a");
+ } else
tcc_add_support(s1, "libtcc1.a");
#else
tcc_add_support(s1, "libtcc1.a");