Diff

Differences From Artifact [ff4d7758ed]:

To Artifact [8fc05b07c4]:


   177    177   +      ;;
   178    178   +  esac
   179    179    fi
   180    180    if test "$cygwin" = "yes" ; then
   181    181      echo "#ifndef _WIN32" >> $TMPH
   182    182   diff -uNr tcc-0.9.26.orig/lib/Makefile tcc-0.9.26-1crosscompilefixes/lib/Makefile
   183    183   --- tcc-0.9.26.orig/lib/Makefile	2013-02-15 08:24:00.000000000 -0600
   184         -+++ tcc-0.9.26-1crosscompilefixes/lib/Makefile	2014-05-16 23:59:18.019016999 -0500
          184  ++++ tcc-0.9.26-1crosscompilefixes/lib/Makefile	2014-06-21 00:26:03.490011999 -0500
   185    185   @@ -25,6 +25,12 @@
   186    186       XCC = $(CC)
   187    187      endif
   188    188     endif
   189    189   + ifeq ($(ARCH),arm)
   190    190   +  TARGET = arm
   191    191   +  ifneq ($(TARGETOS),Darwin)
   192    192   +   XCC = $(CC)
   193    193   +  endif
   194    194   + endif
   195    195     endif
   196    196     endif
   197    197     endif
   198         -@@ -41,36 +47,41 @@
          198  +@@ -41,20 +47,19 @@
   199    199    
   200    200    I386_O = libtcc1.o alloca86.o alloca86-bt.o $(BCHECK_O)
   201    201    X86_64_O = libtcc1.o alloca86_64.o
   202    202   +ARM_O = dummy.o
   203    203    WIN32_O = $(I386_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
   204    204    WIN64_O = $(X86_64_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
   205    205    
................................................................................
   215    215     TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE
   216    216   - XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include
   217    217   - XAR = $(DIR)/tiny_libmaker$(EXESUF)
   218    218   + XCC = $(CC) -I$(top_srcdir)/win32 -I$(top_srcdir)/include
   219    219    else
   220    220    ifeq "$(TARGET)" "i386"
   221    221     OBJ = $(addprefix $(DIR)/,$(I386_O))
   222         -  TGT = -DTCC_TARGET_I386
   223         -- XCC ?= $(TCC) -B$(TOP)
   224         -+ XCC ?= $(CC) -I$(TOP)
   225         - else
   226         - ifeq "$(TARGET)" "x86_64"
   227         -  OBJ = $(addprefix $(DIR)/,$(X86_64_O))
          222  +@@ -66,11 +71,17 @@
   228    223     TGT = -DTCC_TARGET_X86_64
   229         -- XCC ?= $(TCC) -B$(TOP)
   230         -+ XCC ?= $(CC) -I$(TOP)
   231         -+else
          224  +  XCC ?= $(TCC) -B$(TOP)
          225  + else
   232    226   +ifeq "$(TARGET)" "arm"
   233    227   + OBJ = $(addprefix $(DIR)/,$(ARM_O))
   234    228   + TGT = -DTCC_TARGET_ARM
   235    229   + XCC ?= $(CC) -I$(TOP)
   236         - else
          230  ++else
   237    231     $(error libtcc1.a not supported on target '$(TARGET)')
   238    232    endif
   239    233    endif
   240    234    endif
   241    235    endif
   242    236   +endif
   243    237