diff options
| author | Thomas Preud'homme <thomas.preudhomme@celest.fr> | 2010-04-27 20:13:19 +0200 |
|---|---|---|
| committer | Thomas Preud'homme <thomas.preudhomme@celest.fr> | 2010-05-01 17:20:28 +0200 |
| commit | 2220467fcf27dbdf6b0d6d8cc56eb65bc35a78ab (patch) | |
| tree | da1dd07473f10d07b54c23a77941f9d0ed574311 | |
| parent | a28b18fa16edaeb6bc7d34cf1ddac690b27ba610 (diff) | |
| download | tinycc-2220467fcf27dbdf6b0d6d8cc56eb65bc35a78ab.tar.gz tinycc-2220467fcf27dbdf6b0d6d8cc56eb65bc35a78ab.tar.bz2 | |
Don't load libtcc1 on arch where it doesn't exist
ARM architecture doesn't have any libtcc1 implementation but tcc load
libtcc1.a in all case. This patch add a conditional preprocessor
instruction to load libtcc1.a only when there is an implementation for
the target architecture.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | tccelf.c | 10 |
2 files changed, 8 insertions, 3 deletions
@@ -49,6 +49,7 @@ endif ifeq ($(ARCH),arm) NATIVE_DEFINES=-DTCC_TARGET_ARM +NATIVE_TARGET=-DWITHOUT_LIBTCC NATIVE_DEFINES+=$(if $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI) NATIVE_DEFINES+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP) endif @@ -1232,10 +1232,14 @@ ST_FUNC void tcc_add_runtime(TCCState *s1) tcc_add_library(s1, "c"); tcc_add_file(s1, CONFIG_SYSROOT "/lib/libgcc_s.so.1"); #else - char buf[1024]; tcc_add_library(s1, "c"); - snprintf(buf, sizeof(buf), "%s/%s", s1->tcc_lib_path, "libtcc1.a"); - tcc_add_file(s1, buf); +#ifndef WITHOUT_LIBTCC + { + char buf[1024]; + snprintf(buf, sizeof(buf), "%s/%s", s1->tcc_lib_path, "libtcc1.a"); + tcc_add_file(s1, buf); + } +#endif #endif } /* add crt end if not memory output */ |
