Revert "Add a --multiarch-triplet switch to configure"

This reverts commit 76adc5770f.
This commit is contained in:
Thomas Preud'homme
2011-08-03 22:26:39 +02:00
parent 76adc5770f
commit 0b6652003c
4 changed files with 74 additions and 153 deletions

View File

@ -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");
}
}