Check-in [e89c02337a]
Overview
Comment:Win64 build fixes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e89c02337af6eb9d834ebd44191db5bf4b5cf108
User & Date: rkeene on 2014-05-18 21:05:34
Other Links: manifest | tags
Context
2014-05-18
21:05
tcc4tcl 0.11 check-in: d685bad77a user: rkeene tags: trunk, 0.11
21:05
Win64 build fixes check-in: e89c02337a user: rkeene tags: trunk
20:46
Updated to pass compiler information to TCC and support basic multilib (-m32/-m64) compilers check-in: 8112d63e73 user: rkeene tags: trunk
Changes

Modified build/tcc-patches/0.9.26/tcc-0.9.26-crosscompilefixes.diff from [b603edb09a] to [ff4d7758ed].

     1      1   diff -uNr tcc-0.9.26.orig/configure tcc-0.9.26-1crosscompilefixes/configure
     2      2   --- tcc-0.9.26.orig/configure	2013-02-15 08:24:00.000000000 -0600
     3         -+++ tcc-0.9.26-1crosscompilefixes/configure	2014-05-18 15:45:41.137516999 -0500
            3  ++++ tcc-0.9.26-1crosscompilefixes/configure	2014-05-18 16:05:09.907516999 -0500
     4      4   @@ -46,16 +46,8 @@
     5      5    tcc_lddir=
     6      6    confvars=
     7      7    
     8      8   -cpu=`uname -m`
     9      9   -
    10     10   -# OS specific
................................................................................
   156    156    exit 1
   157    157    fi
   158    158    
   159    159   -cc="${cross_prefix}${cc}"
   160    160    ar="${cross_prefix}${ar}"
   161    161    strip="${cross_prefix}${strip}"
   162    162    
          163  +@@ -446,8 +460,16 @@
          164  +   echo "CONFIG_NOLDL=yes" >> config.mak
          165  + fi
          166  + if test "$mingw32" = "yes" ; then
          167  +-  echo "CONFIG_WIN32=yes" >> config.mak
          168  +-  echo "#define CONFIG_WIN32 1" >> $TMPH
          169  ++  case "$cpu" in
          170  ++    x86-64)
          171  ++      echo "CONFIG_WIN64=yes" >> config.mak
          172  ++      echo "#define CONFIG_WIN64 1" >> $TMPH
          173  ++      ;;
          174  ++    *)
          175  ++      echo "CONFIG_WIN32=yes" >> config.mak
          176  ++      echo "#define CONFIG_WIN32 1" >> $TMPH
          177  ++      ;;
          178  ++  esac
          179  + fi
          180  + if test "$cygwin" = "yes" ; then
          181  +   echo "#ifndef _WIN32" >> $TMPH
   163    182   diff -uNr tcc-0.9.26.orig/lib/Makefile tcc-0.9.26-1crosscompilefixes/lib/Makefile
   164    183   --- tcc-0.9.26.orig/lib/Makefile	2013-02-15 08:24:00.000000000 -0600
   165    184   +++ tcc-0.9.26-1crosscompilefixes/lib/Makefile	2014-05-16 23:59:18.019016999 -0500
   166    185   @@ -25,6 +25,12 @@
   167    186       XCC = $(CC)
   168    187      endif
   169    188     endif