From 0b6652003cba7dbf3b8b2b76564d81cbceacceb0 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Wed, 3 Aug 2011 22:26:39 +0200 Subject: Revert "Add a --multiarch-triplet switch to configure" This reverts commit 76adc5770f4ab5b1aaa2e5dde6104efc06431fe2. --- tccelf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tccelf.c') diff --git a/tccelf.c b/tccelf.c index f58ae83..c0f1c94 100644 --- a/tccelf.c +++ b/tccelf.c @@ -1238,10 +1238,7 @@ ST_FUNC void tcc_add_runtime(TCCState *s1) if (!s1->nostdlib) { #ifdef CONFIG_USE_LIBGCC tcc_add_library(s1, "c"); -#ifdef CONFIG_TCC_MULTIARCH_TRIPLET - if (tcc_add_file_internal(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR "/" CONFIG_TCC_MULTIARCH_TRIPLET "/libgcc_s.so.1", 0)) -#endif - tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR"/libgcc_s.so.1"); + tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR"/libgcc_s.so.1"); #else tcc_add_library(s1, "c"); #ifndef WITHOUT_LIBTCC @@ -1255,10 +1252,7 @@ ST_FUNC void tcc_add_runtime(TCCState *s1) } /* add crt end if not memory output */ if (s1->output_type != TCC_OUTPUT_MEMORY && !s1->nostdlib) { -#ifdef CONFIG_TCC_MULTIARCH_TRIPLET - if (tcc_add_file_internal(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/" CONFIG_TCC_MULTIARCH_TRIPLET "/crtn.o", 0)) -#endif - tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crtn.o"); + tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crtn.o"); } } -- cgit v1.3.1