d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't load libtcc1 on arch where it doesn't exist

Browse source 
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.
This commit is contained in:
Thomas Preud'homme 2010-04-27 20:13:19 +02:00
parent a28b18fa16
commit 2220467fcf
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -49,6 +49,7 @@ endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
NATIVE_DEFINES=-DTCC_TARGET_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 $(wildcard /lib/ld-linux.so.3),-DTCC_ARM_EABI)
NATIVE_DEFINES+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP) NATIVE_DEFINES+=$(if $(shell grep -l "^Features.* \(vfp\|iwmmxt\) " /proc/cpuinfo),-DTCC_ARM_VFP)
endif endif

10
tccelf.c
View file

@ -1232,10 +1232,14 @@ ST_FUNC void tcc_add_runtime(TCCState *s1)
tcc_add_library(s1, "c"); tcc_add_library(s1, "c");
tcc_add_file(s1, CONFIG_SYSROOT "/lib/libgcc_s.so.1"); tcc_add_file(s1, CONFIG_SYSROOT "/lib/libgcc_s.so.1");
#else #else
char buf[1024];
tcc_add_library(s1, "c"); tcc_add_library(s1, "c");
snprintf(buf, sizeof(buf), "%s/%s", s1->tcc_lib_path, "libtcc1.a"); #ifndef WITHOUT_LIBTCC
tcc_add_file(s1, buf); {
char buf[1024];
snprintf(buf, sizeof(buf), "%s/%s", s1->tcc_lib_path, "libtcc1.a");
tcc_add_file(s1, buf);
}
#endif
#endif #endif
} }
/* add crt end if not memory output */ /* add crt end if not memory output */