@@ -179,11 +179,11 @@ fi if test "$cygwin" = "yes" ; then echo "#ifndef _WIN32" >> $TMPH diff -uNr tcc-0.9.26.orig/lib/Makefile tcc-0.9.26-1crosscompilefixes/lib/Makefile --- tcc-0.9.26.orig/lib/Makefile 2013-02-15 08:24:00.000000000 -0600 -+++ tcc-0.9.26-1crosscompilefixes/lib/Makefile 2014-05-16 23:59:18.019016999 -0500 ++++ tcc-0.9.26-1crosscompilefixes/lib/Makefile 2014-06-21 00:26:03.490011999 -0500 @@ -25,6 +25,12 @@ XCC = $(CC) endif endif + ifeq ($(ARCH),arm) @@ -193,11 +193,11 @@ + endif + endif endif endif endif -@@ -41,36 +47,41 @@ +@@ -41,20 +47,19 @@ I386_O = libtcc1.o alloca86.o alloca86-bt.o $(BCHECK_O) X86_64_O = libtcc1.o alloca86_64.o +ARM_O = dummy.o WIN32_O = $(I386_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o @@ -217,25 +217,19 @@ - XAR = $(DIR)/tiny_libmaker$(EXESUF) + XCC = $(CC) -I$(top_srcdir)/win32 -I$(top_srcdir)/include else ifeq "$(TARGET)" "i386" OBJ = $(addprefix $(DIR)/,$(I386_O)) - TGT = -DTCC_TARGET_I386 -- XCC ?= $(TCC) -B$(TOP) -+ XCC ?= $(CC) -I$(TOP) - else - ifeq "$(TARGET)" "x86_64" - OBJ = $(addprefix $(DIR)/,$(X86_64_O)) +@@ -66,11 +71,17 @@ TGT = -DTCC_TARGET_X86_64 -- XCC ?= $(TCC) -B$(TOP) -+ XCC ?= $(CC) -I$(TOP) -+else + XCC ?= $(TCC) -B$(TOP) + else +ifeq "$(TARGET)" "arm" + OBJ = $(addprefix $(DIR)/,$(ARM_O)) + TGT = -DTCC_TARGET_ARM + XCC ?= $(CC) -I$(TOP) - else ++else $(error libtcc1.a not supported on target '$(TARGET)') endif endif endif endif