From 096125d963400951e0f160ced86416ef8c9c98b0 Mon Sep 17 00:00:00 2001 From: grischka Date: Sat, 18 Feb 2017 09:51:23 +0100 Subject: win32: adjust new unicode support - lib/Makefile: add (win)crt1_w.o - crt1.c/_runtmain: return to tcc & only use for UNICODE (because it might be not 100% reliable with for example wildcards (tcc *.c -run ...) - tccrun.c/tccpe.c: load -run startup_code only if called from tcc_run(). Otherwise main may not be defined. See libtcc_test.c - tests2/Makefile: pass extra options in FLAGS to allow overriding TCC Also: - tccpe.c: support weak attribute. (I first tried to solve the problem above by using it but then didn't) --- tests/tests2/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile index bbcb9ab..ef82d2a 100644 --- a/tests/tests2/Makefile +++ b/tests/tests2/Makefile @@ -28,9 +28,6 @@ endif ifeq (,$(filter i386 x86-64,$(ARCH))) SKIP += 85_asm-outside-function.test endif -ifeq ($(TARGETOS),Windows) - SKIP += 76_dollars_in_identifiers.test -endif # Some tests might need arguments ARGS = @@ -42,7 +39,8 @@ NORUN = 42_function_pointer.test : NORUN = true # Some tests might need different flags -76_dollars_in_identifiers.test : TCCFLAGS += -fdollars-in-identifiers +FLAGS = +76_dollars_in_identifiers.test : FLAGS += -fdollars-in-identifiers # Filter source directory in warnings/errors (out-of-tree builds) FILTER = 2>&1 | sed 's,$(SRC)/,,g' @@ -57,9 +55,9 @@ all test: $(filter-out $(SKIP),$(TESTS)) @echo Test: $*... # test -run @if test -z "$(NORUN)"; then \ - $(TCC) -run $< $(ARGS) $(FILTER) >$*.output 2>&1 || true; \ + $(TCC) $(FLAGS) -run $< $(ARGS) $(FILTER) >$*.output 2>&1 || true; \ else \ - $(TCC) $< -o ./$*.exe $(FILTER) >$*.output 2>&1; \ + $(TCC) $(FLAGS) $< -o ./$*.exe $(FILTER) >$*.output 2>&1; \ ./$*.exe $(ARGS) >>$*.output 2>&1 || true; \ fi @diff -Nbu $(SRC)/$*.expect $*.output && rm -f $*.output $*.exe -- cgit v1.3.1