From 76accfb8d5b16664207fa8ae43d02b015bc8e019 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Mon, 7 Apr 2014 11:13:19 +0200
Subject: [PATCH] win32: libtcc1.a needs to be built with tcc

gcc/mingw produces msvc compatible pecoff objects, tcc only
knows ELF.
---
 lib/Makefile          | 7 +++++--
 tests/tests2/Makefile | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index cf3cd710..e9e12f1b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ TOP = ..
 include $(TOP)/Makefile
 VPATH = $(top_srcdir)/lib $(top_srcdir)/win32/lib
 
-ifndef TARGET
+ifndef TARGET # native library
  ifdef CONFIG_WIN64
   TARGET = x86_64-win32
  else
@@ -27,6 +27,7 @@ ifndef TARGET
  else
  ifeq ($(ARCH),arm)
   TARGET = arm
+  XCC = $(CC)
  endif
  endif
  endif
@@ -58,12 +59,14 @@ ifeq "$(TARGET)" "i386-win32"
  TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE
  XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include
  XAR = $(DIR)/tiny_libmaker$(EXESUF)
+ PICFLAGS =
 else
 ifeq "$(TARGET)" "x86_64-win32"
  OBJ = $(addprefix $(DIR)/,$(WIN64_O))
  TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE
  XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include
  XAR = $(DIR)/tiny_libmaker$(EXESUF)
+ PICFLAGS =
 else
 ifeq "$(TARGET)" "i386"
  OBJ = $(addprefix $(DIR)/,$(I386_O))
@@ -104,7 +107,7 @@ $(DIR)/libtcc1.a ../libtcc1.a : $(OBJ) $(XAR)
 $(DIR)/%.o : %.c
 	$(XCC) -c $< -o $@ $(XFLAGS)
 $(DIR)/%.o : %.S
-	$(CC) -c $< -o $@ $(XFLAGS)
+	$(XCC) -c $< -o $@ $(XFLAGS)
 $(DIR)/%$(EXESUF) : $(TOP)/win32/tools/%.c
 	$(CC) -o $@ $< $(XFLAGS) $(LDFLAGS)
 
diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile
index d523b773..e5790c75 100644
--- a/tests/tests2/Makefile
+++ b/tests/tests2/Makefile
@@ -1,10 +1,10 @@
 TOP = ../..
 include $(TOP)/Makefile
-VPATH = $(top_srcdir)/tests/tests2
 
-TCCFLAGS = -B$(TOP) -I$(top_srcdir)/include
 ifdef CONFIG_WIN32
  TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir)/include -L$(TOP)
+else
+ TCCFLAGS = -B$(TOP) -I$(top_srcdir)/include -lm
 endif
 
 ifeq ($(TARGETOS),Darwin)
@@ -94,7 +94,7 @@ endif
 	@if [ "x`echo $* | grep args`" != "x" ]; \
 	then $(TCC) $< -norunsrc -run $(notdir $<) - arg1 arg2 arg3 arg4 >$*.output 2>&1; \
 	else $(TCC) -run $< >$*.output 2>&1; \
-	  ($(TCC) -o $*.exe $< -lm && ./$*.exe) >$*.output2 2>&1; \
+	  ($(TCC) -o $*.exe $< && ./$*.exe) >$*.output2 2>&1; \
 	fi || true
 	@if diff -bu $(<:.c=.expect) $*.output ; \
 	then rm -f $*.output; \
-- 
2.11.4.GIT