- Build libtcc1 for cross-compiler on arm (arm to X cross compilers) - Install libtcc1 and includes for arm to i386 cross compiler - Add basic check of cross-compilers (compile ex1.c)
Unified · Split
| @@ -135,6 +135,7 @@ else ifeq ($(ARCH),arm) · 134 unmodified lines | ||
| 135 | 135 | NATIVE_FILES=$(ARM_FILES) |
| 136 | 136 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS) |
| 137 | 137 | LIBTCC1=libtcc1.a |
| 138 | +LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a | |
| 138 | 139 | endif |
| 139 | 140 | PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) |
| 140 | 141 | |
| @@ -278,7 +279,7 @@ endif · 137 unmodified lines | ||
| 278 | 279 | ifdef CONFIG_CROSS |
| 279 | 280 | mkdir -p "$(tccdir)/win32/lib/32" |
| 280 | 281 | mkdir -p "$(tccdir)/win32/lib/64" |
| 281 | −ifeq ($(ARCH),x86-64) | |
| 282 | +ifneq ($(ARCH),i386) | |
| 282 | 283 | mkdir -p "$(tccdir)/i386" |
| 283 | 284 | $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386" |
| 284 | 285 | cp -r "$(tccdir)/include" "$(tccdir)/i386" |
| @@ -287,7 +288,7 @@ endif · 2 unmodified lines | ||
| 287 | 288 | $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32" |
| 288 | 289 | $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/win32/lib/64" |
| 289 | 290 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/win32/include" |
| 290 | − cp -r $(top_srcdir)/include/. "$(tccdir)/win32/include" | |
| 291 | + cp -r "$(tccdir)/include" "$(tccdir)/win32" | |
| 291 | 292 | endif |
| 292 | 293 | |
| 293 | 294 | uninstall: |
| @@ -300,7 +301,7 @@ uninstall: · 6 unmodified lines | ||
| 300 | 301 | rm -fv "$(libdir)/libtcc.so*" |
| 301 | 302 | rm -rf "$(tccdir)/win32" |
| 302 | 303 | -rmdir $(tccdir)/include |
| 303 | −ifeq ($(ARCH),x86-64) | |
| 304 | +ifneq ($(ARCH),i386) | |
| 304 | 305 | rm -rf "$(tccdir)/i386" |
| 305 | 306 | endif |
| 306 | 307 | else |
| @@ -346,7 +347,7 @@ tcc-doc.info: tcc-doc.texi · 39 unmodified lines | ||
| 346 | 347 | export LIBTCC1 |
| 347 | 348 | |
| 348 | 349 | %est: |
| 349 | − $(MAKE) -C tests $@ | |
| 350 | + $(MAKE) -C tests $@ "PROGS_CROSS=$(PROGS_CROSS)" | |
| 350 | 351 | |
| 351 | 352 | clean: |
| 352 | 353 | rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test$(EXESUF) |
| @@ -16,6 +16,9 @@ TESTS = \ · 15 unmodified lines | ||
| 16 | 16 | abitest \ |
| 17 | 17 | vla_test-run \ |
| 18 | 18 | moretests |
| 19 | +ifdef CONFIG_CROSS | |
| 20 | +TESTS += hello-cross | |
| 21 | +endif | |
| 19 | 22 | |
| 20 | 23 | # test4 -- problem with -static |
| 21 | 24 | # asmtest -- minor differences with gcc |
| @@ -50,8 +53,9 @@ endif · 28 unmodified lines | ||
| 50 | 53 | # run local version of tcc with local libraries and includes |
| 51 | 54 | TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include |
| 52 | 55 | ifdef CONFIG_WIN32 |
| 53 | − TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -I$(TOP) -L$(TOP) | |
| 56 | + TCCFLAGS = -B$(top_srcdir)/win32 --I$(top_srcdir) -I$(top_srcdir)/include -I$(TOP) -L$(TOP) | |
| 54 | 57 | endif |
| 58 | +XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include | |
| 55 | 59 | |
| 56 | 60 | TCC = $(TOP)/tcc $(TCCFLAGS) |
| 57 | 61 | RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS) |
| @@ -69,6 +73,15 @@ hello-exe: ../examples/ex1.c · 11 unmodified lines | ||
| 69 | 73 | @echo ------------ $@ ------------ |
| 70 | 74 | $(TCC) $< -o hello$(EXESUF) || ($(TOP)/tcc -vv; exit 1) && ./hello$(EXESUF) |
| 71 | 75 | |
| 76 | +hello-cross: ../examples/ex1.c | |
| 77 | + @echo ------------ $@ ------------ | |
| 78 | + for XTCC in $(PROGS_CROSS) ; \ | |
| 79 | + do echo -n "Test of $$XTCC... "; \ | |
| 80 | + out=$$($(TOP)/$$XTCC $(XTCCFLAGS) -c $< 2>&1); \ | |
| 81 | + test $$? -ne 0 && { echo "Failed\n$$out\n" ; $(TOP)/$$XTCC -vv; exit 1; } ; \ | |
| 82 | + echo "Success"; \ | |
| 83 | + done | |
| 84 | + | |
| 72 | 85 | hello-run: ../examples/ex1.c |
| 73 | 86 | @echo ------------ $@ ------------ |
| 74 | 87 | $(TCC) -run $< |