sigrid/tinycc

Makefile+53−58

@@ -98,16 +98,17 @@ TCC_X = i386 x86_64 i386-win32 x86_64-win32 x86_64-osx arm arm64 arm-wince c67 · 97 unmodified lines
98	LIBTCC1_X = i386 x86_64 i386-win32 x86_64-win32 x86_64-osx arm arm64 arm-wince	98	LIBTCC1_X = i386 x86_64 i386-win32 x86_64-win32 x86_64-osx arm arm64 arm-wince
99		99
100	PROGS_CROSS = $(foreach X,$(TCC_X),$X-tcc$(EXESUF))	100	PROGS_CROSS = $(foreach X,$(TCC_X),$X-tcc$(EXESUF))
101	LIBTCC1_CROSS = $(foreach X,$(LIBTCC1_X),libtcc1-$X.a)	101	LIBTCC1_CROSS = $(foreach X,$(LIBTCC1_X),$X-libtcc1.a)
102		102
103	# build cross compilers & libs	103	# build cross compilers & libs
104	cross: $(LIBTCC1_CROSS) $(PROGS_CROSS)	104	cross: $(LIBTCC1_CROSS) $(PROGS_CROSS)
105		105
106	# build specific cross compiler & lib	106	# build specific cross compiler & lib
107	cross-%: %-tcc$(EXESUF) libtcc1-%.a ;	107	cross-%: %-tcc$(EXESUF) %-libtcc1.a ;
108		108
109	install: install$(CFGWIN)	109	install: ; @$(MAKE) --no-print-directory install$(CFGWIN)
110	uninstall: uninstall$(CFGWIN)	110	install-strip: ; @$(MAKE) --no-print-directory install$(CFGWIN) CONFIG_strip=yes
		111	uninstall: ; @$(MAKE) --no-print-directory uninstall$(CFGWIN)
111		112
112	ifdef CONFIG_cross	113	ifdef CONFIG_cross
113	all : cross	114	all : cross
@@ -143,10 +144,10 @@ DEFINES += $(DEF-$(or $(findstring win,$T),unx)) · 29 unmodified lines
143		144
144	ifneq ($(X),)	145	ifneq ($(X),)
145	ifeq ($(CONFIG_WIN32),yes)	146	ifeq ($(CONFIG_WIN32),yes)
146	DEF-win += -DTCC_LIBTCC1="\"libtcc1-$T.a\""	147	DEF-win += -DTCC_LIBTCC1="\"$(X)libtcc1.a\""
147	DEF-unx += -DTCC_LIBTCC1="\"lib/libtcc1-$T.a\""	148	DEF-unx += -DTCC_LIBTCC1="\"lib/$(X)libtcc1.a\""
148	else	149	else
149	DEF-all += -DTCC_LIBTCC1="\"libtcc1-$T.a\""	150	DEF-all += -DTCC_LIBTCC1="\"$(X)libtcc1.a\""
150	DEF-win += -DCONFIG_TCCDIR="\"$(tccdir)/win32\""	151	DEF-win += -DCONFIG_TCCDIR="\"$(tccdir)/win32\""
151	endif	152	endif
152	endif	153	endif
@@ -217,21 +218,22 @@ libtcc.so: LDFLAGS+=-fPIC · 64 unmodified lines
217	# windows dynamic libtcc library	218	# windows dynamic libtcc library
218	libtcc.dll : $(LIBTCC_OBJ)	219	libtcc.dll : $(LIBTCC_OBJ)
219	$(CC) -shared -o $@ $^ $(LDFLAGS)	220	$(CC) -shared -o $@ $^ $(LDFLAGS)
		221	libtcc.dll : DEFINES += -DLIBTCC_AS_DLL
220		222
		223	# import file for windows libtcc.dll
221	libtcc.def : libtcc.dll tcc$(EXESUF)	224	libtcc.def : libtcc.dll tcc$(EXESUF)
222	./tcc$(EXESUF) -impdef $< -o $@	225	$(XTCC) -impdef $< -o $@
223		226	XTCC ?= ./tcc$(EXESUF)
224	libtcc.dll : DEFINES += -DLIBTCC_AS_DLL
225		227
226	# TinyCC runtime libraries	228	# TinyCC runtime libraries
227	libtcc1.a : tcc$(EXESUF) FORCE	229	libtcc1.a : tcc$(EXESUF) FORCE
228	@$(MAKE) -C lib DEFINES="$(DEF-$T)"	230	@$(MAKE) -C lib DEFINES='$(DEF-$T)'
229		231
230	# Cross libtcc1.a	232	# Cross libtcc1.a
231	libtcc1-%.a : %-tcc$(EXESUF) FORCE	233	%-libtcc1.a : %-tcc$(EXESUF) FORCE
232	@$(MAKE) -C lib DEFINES="$(DEF-$)" CROSS_TARGET=$	234	@$(MAKE) -C lib DEFINES='$(DEF-$)' CROSS_TARGET=$
233		235
234	.PRECIOUS: libtcc1-%.a	236	.PRECIOUS: %-libtcc1.a
235	FORCE:	237	FORCE:
236		238
237	# --------------------------------------------------------------------------	239	# --------------------------------------------------------------------------
@@ -252,35 +254,29 @@ tcc-doc.info: tcc-doc.texi · 14 unmodified lines
252	INSTALL = install -m644	254	INSTALL = install -m644
253	INSTALLBIN = install -m755 $(STRIP_$(CONFIG_strip))	255	INSTALLBIN = install -m755 $(STRIP_$(CONFIG_strip))
254	STRIP_yes = -s	256	STRIP_yes = -s
255	install-strip: install
256	install-strip: CONFIG_strip = yes
257		257
258	TRY-INSTALL = $(if $(wildcard $1),mkdir -p $2 && $(INSTALL) $1 $2)	258	LIBTCC1_W = $(filter %-win32-libtcc1.a %-wince-libtcc1.a,$(LIBTCC1_CROSS))
259	LIBTCC1_W = $(wildcard $(filter %-win32.a %-wince.a,$(LIBTCC1_CROSS)))	259	LIBTCC1_U = $(filter-out $(LIBTCC1_W),$(LIBTCC1_CROSS))
260	LIBTCC1_U = $(wildcard $(filter-out $(LIBTCC1_W),$(LIBTCC1_CROSS)))	260	IB = $(if $1,mkdir -p $2 && $(INSTALLBIN) $1 $2)
261	PROGS_X = $(wildcard $(PROGS_CROSS))	261	IBw = $(call IB,$(wildcard $1),$2)
		262	IF = $(if $1,mkdir -p $2 && $(INSTALL) $1 $2)
		263	IFw = $(call IF,$(wildcard $1),$2)
		264	IR = mkdir -p $2 && cp -r $1/. $2
262		265
263	# install progs & libs	266	# install progs & libs
264	install-unx:	267	install-unx:
265	mkdir -p "$(bindir)"	268	$(call IBw,$(PROGS) $(PROGS_CROSS),"$(bindir)")
266	$(INSTALLBIN) $(PROGS) $(PROGS_X) "$(bindir)"	269	$(call IFw,$(LIBTCC1) $(LIBTCC1_U),"$(tccdir)")
267	mkdir -p "$(tccdir)"	270	$(call IF,$(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h,"$(tccdir)/include")
268	$(INSTALL) $(LIBTCC1) $(LIBTCC1_U) "$(tccdir)"	271	$(call $(if $(findstring .so,$(LIBTCC)),IBw,IFw),$(LIBTCC),"$(libdir)")
269	mkdir -p "$(tccdir)/include"	272	$(call IF,$(TOPSRC)/libtcc.h,"$(includedir)")
270	$(INSTALL) $(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h "$(tccdir)/include"	273	$(call IFw,tcc.1,"$(mandir)/man1")
271	mkdir -p "$(libdir)"	274	$(call IFw,tcc-doc.info,"$(infodir)")
272	$(INSTALL) $(LIBTCC) "$(libdir)"	275	$(call IFw,tcc-doc.html,"$(docdir)")
273	mkdir -p "$(includedir)"	276	ifneq "$(wildcard $(LIBTCC1_W))" ""
274	$(INSTALL) $(TOPSRC)/libtcc.h "$(includedir)"	277	$(call IFw,$(TOPSRC)/win32/lib/*.def $(LIBTCC1_W),"$(tccdir)/win32/lib")
275	$(call TRY-INSTALL,tcc.1,"$(mandir)/man1")	278	$(call IR,$(TOPSRC)/win32/include,"$(tccdir)/win32/include")
276	$(call TRY-INSTALL,tcc-doc.info,"$(infodir)")	279	$(call IF,$(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h,"$(tccdir)/win32/include")
277	$(call TRY-INSTALL,tcc-doc.html,"$(docdir)")
278	ifneq "$(LIBTCC1_W)" ""
279	mkdir -p "$(tccdir)/win32/lib"
280	$(INSTALL) $(TOPSRC)/win32/lib/*.def $(LIBTCC1_W) "$(tccdir)/win32/lib"
281	mkdir -p "$(tccdir)/win32/include"
282	cp -r $(TOPSRC)/win32/include/. "$(tccdir)/win32/include"
283	$(INSTALL) $(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h "$(tccdir)/win32/include"
284	endif	280	endif
285		281
286	# uninstall	282	# uninstall
@@ -293,32 +289,31 @@ uninstall-unx: · 6 unmodified lines
293		289
294	# install progs & libs on windows	290	# install progs & libs on windows
295	install-win:	291	install-win:
296	mkdir -p "$(tccdir)"	292	$(call IBw,$(PROGS) $(PROGS_CROSS) $(subst libtcc.a,,$(LIBTCC)),"$(bindir)")
297	$(INSTALL) $(PROGS) $(subst libtcc.a,,$(LIBTCC)) $(PROGS_X) "$(tccdir)"	293	$(call IF,$(TOPSRC)/win32/lib/*.def,"$(tccdir)/lib")
298	mkdir -p "$(tccdir)/lib"	294	$(call IFw,libtcc1.a $(LIBTCC1_W),"$(tccdir)/lib")
299	$(INSTALL) $(TOPSRC)/win32/lib/*.def "$(tccdir)/lib"	295	$(call IF,$(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h,"$(tccdir)/include")
300	$(INSTALL) libtcc1.a $(LIBTCC1_W) "$(tccdir)/lib"	296	$(call IR,$(TOPSRC)/win32/include,"$(tccdir)/include")
301	mkdir -p "$(tccdir)/include"	297	$(call IR,$(TOPSRC)/win32/examples,"$(tccdir)/examples")
302	cp -r $(TOPSRC)/win32/include/. "$(tccdir)/include"	298	$(call IF,$(TOPSRC)/tests/libtcc_test.c,"$(tccdir)/examples")
303	$(INSTALL) $(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h "$(tccdir)/include"	299	$(call IFw,$(TOPSRC)/libtcc.h $(subst .dll,.def,$(LIBTCC)),"$(libdir)")
304	mkdir -p "$(tccdir)/examples"	300	$(call IFw,$(TOPSRC)/win32/tcc-win32.txt tcc-doc.html,"$(docdir)")
305	cp -r $(TOPSRC)/win32/examples/. "$(tccdir)/examples"	301	ifneq "$(wildcard $(LIBTCC1_U))" ""
306	$(INSTALL) $(TOPSRC)/tests/libtcc_test.c "$(tccdir)/examples"	302	$(call IFw,$(LIBTCC1_U),"$(tccdir)/lib")
307	mkdir -p "$(tccdir)/libtcc"	303	$(call IF,$(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h,"$(tccdir)/lib/include")
308	$(INSTALL) $(TOPSRC)/libtcc.h $(subst .dll,.def,$(LIBTCC)) "$(tccdir)/libtcc"
309	mkdir -p "$(tccdir)/doc"
310	$(INSTALL) $(TOPSRC)/win32/tcc-win32.txt $(wildcard tcc-doc.html) "$(tccdir)/doc"
311	ifneq "$(LIBTCC1_U)" ""
312	$(INSTALL) $(LIBTCC1_U) "$(tccdir)/lib"
313	mkdir -p "$(tccdir)/lib/include";
314	$(INSTALL) $(TOPSRC)/include/*.h $(TOPSRC)/tcclib.h "$(tccdir)/lib/include"
315	endif	304	endif
316		305
317	# the msys-git shell works to configure && make except it does not have install	306	# the msys-git shell works to configure && make except it does not have install
		307	ifeq ($(CONFIG_WIN32)-$(shell which install >/dev/null 2>&1 \|\| echo no),yes-no)
318	install-win : INSTALL = cp	308	install-win : INSTALL = cp
		309	install-win : INSTALLBIN = cp
		310	endif
319		311
320	# uninstall on windows	312	# uninstall on windows
321	uninstall-win:	313	uninstall-win:
		314	@rm -fv $(foreach P,$(PROGS) $(PROGS_CROSS) libtcc.dll,"$(bindir)/$P")
		315	@rm -fv $(foreach F,tcc-doc.html tcc-win32.txt,"$(docdir)/$F")
		316	@rm -fv $(foreach F,libtcc.h libtcc.def libtcc.a,"$(libdir)/$F")
322	rm -r "$(tccdir)"	317	rm -r "$(tccdir)"
323		318
324	# --------------------------------------------------------------------------	319	# --------------------------------------------------------------------------

configure+26−42

     DLLSUF=".dylib"
     ;;
   MINGW*|MSYS*|CYGWIN*)
-    confvars="$confvars WIN32"
     mingw32=yes
     ;;
   DragonFly|OpenBSD|FreeBSD|NetBSD)
   ;;
   --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
   ;;
-  --enable-mingw32) confvars="$confvars WIN32"; mingw32="yes"
-  ;;
   --enable-cross) confvars="$confvars cross"
   ;;
   --disable-static) confvars="$confvars static=no"
   ;;
   --with-selinux) confvars="$confvars selinux"
   ;;
+  --config-mingw32*) mingw32=$(echo "$opt=yes" | cut -d '=' -f 2)
+  ;;
   --config-*) confvars="$confvars ${opt#--config-}"; suggest="no"
   ;;
   --help|-h) show_help="yes"
     if test "$cc" = gcc; then
       test -z "$LDFLAGS" && LDFLAGS="-static"
     fi
-    if test x"$tccdir" = x""; then
+    test -z "$prefix" && prefix="C:/Program Files/tcc"
-      tccdir="tcc"
+    test -z "$tccdir" && tccdir="${prefix}"
-    fi
+    test -z "$bindir" && bindir="${tccdir}"
-    if test -z "$prefix" ; then
+    test -z "$docdir" && docdir="${tccdir}/doc"
-      prefix="C:/Program Files/${tccdir}"
+    test -z "$libdir" && libdir="${tccdir}/libtcc"
-    fi
+    confvars="$confvars WIN32"
-    if test -z "$sharedir" ; then
-      sharedir="${prefix}"
-    fi
-    execprefix="$prefix"
-    bindir="${prefix}"
-    tccdir="${prefix}"
-    libdir="${prefix}/lib"
-    docdir="${sharedir}/doc"
-    mandir="${sharedir}/man"
-    infodir="${sharedir}/info"
     LIBSUF=".lib"
     EXESUF=".exe"
     DLLSUF=".dll"
     if test x"$tccdir" = x""; then
       tccdir="${libdir}/tcc"
     fi
+    if test x"$includedir" = x""; then
+      includedir="${prefix}/include"
+    fi
 fi # mingw32
-if test x"$includedir" = x""; then
-  includedir="${prefix}/include"
-fi
 if test x"$show_help" = "xyes" ; then
 cat << EOF
 Usage: configure [options]
   --enable-static          make libtcc.a instead of libtcc.dll (win32)
   --disable-rpath          disable use of -rpath with the above
   --with-libgcc            use libgcc_s.so.1 instead of libtcc1.a
-  --enable-mingw32         build windows version on linux with mingw32
   --enable-cross           build cross compilers
   --with-selinux           use mmap for executable memory (with tcc -run)
   --sysincludepaths=...    specify system include paths, colon separated
   --crtprefix=...          specify locations of crt?.o, colon separated
   --elfinterp=...          specify elf interpreter
   --triplet=...            specify system library/include directory triplet
-  --config-uClibc,-musl... enable specific configuration for some systems
+  --config-uClibc,-musl,-mingw32... enable system specific configurations
 EOF
 #echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
 ar="${cross_prefix}${ar}"
 strip="${cross_prefix}${strip}"
-CONFTEST=./conftest$EXESUF
-if ! $cc -o $CONFTEST $source_path/conftest.c 2>/dev/null ; then
-  echo "configure: error: '$cc' failed to compile conftest.c."
-else
-  gcc_major="$($CONFTEST version)"
-  gcc_minor="$($CONFTEST minor)"
-fi
 if test -z "$cross_prefix" ; then
+  CONFTEST=./conftest$EXESUF
+  if ! $cc -o $CONFTEST $source_path/conftest.c 2>/dev/null ; then
+    echo "configure: error: '$cc' failed to compile conftest.c."
+  else
+    gcc_major="$($CONFTEST version)"
+    gcc_minor="$($CONFTEST minor)"
+  fi
   bigendian="$($CONFTEST bigendian)"
   if test "$mingw32" = "no" ; then
 fcho() { if test -n "$2"; then echo "$1$2"; fi }
-echo "Binary  directory   $bindir"
+fcho "Binary directory    " "$bindir"
-echo "TinyCC directory    $tccdir"
+fcho "TinyCC directory    " "$tccdir"
-echo "Library directory   $libdir"
+fcho "Library directory   " "$libdir"
-echo "Include directory   $includedir"
+fcho "Include directory   " "$includedir"
-echo "Manual directory    $mandir"
+fcho "Manual directory    " "$mandir"
-echo "Info directory      $infodir"
+fcho "Info directory      " "$infodir"
-echo "Doc directory       $docdir"
+fcho "Doc directory       " "$docdir"
 fcho "Target root prefix  " "$sysroot"
 echo "Source path         $source_path"
 echo "C compiler          $cc ($gcc_major.$gcc_minor)"
 print_mak CONFIG_TRIPLET "$triplet"
 print_mak_int TCC_CPU_VERSION "$cpuver"
-echo "#define GCC_MAJOR $gcc_major" >> $TMPH
-echo "#define GCC_MINOR $gcc_minor" >> $TMPH
 if test "$cpu" = "aarch64" ; then
   echo "ARCH=arm64" >> config.mak
 else

include/stdarg.h+0−5

     char *reg_save_area;
 } __va_list_struct;
-/* Avoid conflicting definition for va_list on musl libc */
-#if !defined __DEFINED_va_list || defined __TCC_NEEDS_va_list
 typedef __va_list_struct va_list[1];
-#undef __DEFINED_va_list
-#define __DEFINED_va_list
-#endif
 void __va_start(__va_list_struct *ap, void *fp);
 void *__va_arg(__va_list_struct *ap, int arg_type, int size, int align);

lib/Makefile+7−7

@@ -7,20 +7,20 @@ include $(TOP)/Makefile · 6 unmodified lines
7	VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib	7	VPATH = $(TOPSRC)/lib $(TOPSRC)/win32/lib
8	T = $(or $(CROSS_TARGET),$(NATIVE_TARGET),unknown)	8	T = $(or $(CROSS_TARGET),$(NATIVE_TARGET),unknown)
9	X = $(if $(CROSS_TARGET),$(CROSS_TARGET)-)	9	X = $(if $(CROSS_TARGET),$(CROSS_TARGET)-)
10	BIN = $(TOP)/libtcc1$(if $(CROSS_TARGET),-$(CROSS_TARGET)).a	10	BIN = $(TOP)/$(X)libtcc1.a
11		11
12	TCC = $(TOP)/$(X)tcc$(EXESUF)	12	XTCC ?= $(TOP)/$(X)tcc$(EXESUF)
13	XCC = $(TCC)	13	XCC = $(XTCC)
14	XAR = $(TCC) -ar	14	XAR = $(XTCC) -ar
15	XFLAGS-unx = -B$(TOPSRC)	15	XFLAGS-unx = -B$(TOPSRC)
16	XFLAGS-win = -B$(TOPSRC)/win32 -I$(TOPSRC)/include	16	XFLAGS-win = -B$(TOPSRC)/win32 -I$(TOPSRC)/include
17	XFLAGS = $(XFLAGS$(XCFG))	17	XFLAGS = $(XFLAGS$(XCFG))
18	XCFG = $(or $(findstring -win,$T),-unx)	18	XCFG = $(or $(findstring -win,$T),-unx)
19		19
20	# in order to use gcc, tyoe: make <target>lib-usegcc=yes	20	# in order to use gcc, tyoe: make <target>-libtcc1-usegcc=yes
21	armlib-usegcc ?= no	21	arm-libtcc1-usegcc ?= no
22		22
23	ifeq "$($(X)$(T)lib-usegcc)" "yes"	23	ifeq "$($(T)-libtcc1-usegcc)" "yes"
24	XCC = $(CC)	24	XCC = $(CC)
25	XAR = $(AR)	25	XAR = $(AR)
26	XFLAGS = $(CFLAGS) -fPIC	26	XFLAGS = $(CFLAGS) -fPIC

libtcc.c+11−28

     char path[1024], *p;
     GetModuleFileNameA(tcc_module, path, sizeof path);
     p = tcc_basename(normalize_slashes(strlwr(path)));
-    if (p - 5 > path && 0 == strncmp(p - 5, "/bin/", 5))
+    if (p > path)
-        p -= 5;
+        --p;
-    else if (p > path)
-        p--;
     *p = 0;
     tcc_set_lib_path(s, path);
 }
         CString str;
         cstr_new(&str);
-        for (p = in; c = *p, c != '\0' && c != PATHSEP; ++p) {
+        for (p = in; c = *p, c != '\0' && c != PATHSEP[0]; ++p) {
             if (c == '{' && p[1] && p[2] == '}') {
                 c = p[1], p += 2;
                 if (c == 'B')
 #endif
 #elif defined(TCC_TARGET_ARM64)
     tcc_define_symbol(s, "__aarch64__", NULL);
+#elif defined TCC_TARGET_C67
+    tcc_define_symbol(s, "__C67__", NULL);
 #endif
 #ifdef TCC_TARGET_PE
 # if defined(__FreeBSD_kernel__)
     tcc_define_symbol(s, "__FreeBSD_kernel__", NULL);
 # endif
-#endif
 # if defined(__NetBSD__)
     tcc_define_symbol(s, "__NetBSD__", "__NetBSD__");
 # endif
 # if defined(__OpenBSD__)
     tcc_define_symbol(s, "__OpenBSD__", "__OpenBSD__");
 # endif
+#endif
     /* TinyCC & gcc defines */
 #if PTR_SIZE == 4
     tcc_define_symbol(s, "__LP64__", NULL);
 #endif
-#if defined(TCC_MUSL)
-    tcc_define_symbol(s, "__TCC_NEEDS_va_list", "");
-    tcc_define_symbol(s, "__builtin_va_list", "va_list");
-    tcc_define_symbol(s, "__DEFINED_va_list", "");
-    tcc_define_symbol(s, "__DEFINED___isoc_va_list", "");
-    tcc_define_symbol(s, "__isoc_va_list", "void *");
-#endif /* TCC_MUSL */
 #ifdef TCC_TARGET_PE
     tcc_define_symbol(s, "__WCHAR_TYPE__", "unsigned short");
     tcc_define_symbol(s, "__WINT_TYPE__", "unsigned short");
     tcc_define_symbol(s, "__REDIRECT_NTH(name, proto, alias)",
         "name proto __asm__ (#alias) __THROW");
 # endif
+# if defined(TCC_MUSL)
+    tcc_define_symbol(s, "__DEFINED_va_list", "");
+    tcc_define_symbol(s, "__DEFINED___isoc_va_list", "");
+    tcc_define_symbol(s, "__isoc_va_list", "void *");
+# endif /* TCC_MUSL */
     /* Some GCC builtins that are simple to express as macros.  */
     tcc_define_symbol(s, "__builtin_extract_return_addr(x)", "x");
 #endif /* ndef TCC_TARGET_PE */
     /* free include paths */
     dynarray_reset(&s1->cached_includes, &s1->nb_cached_includes);
-    dynarray_reset(&s1->tccinclude_paths, &s1->nb_tccinclude_paths);
     dynarray_reset(&s1->include_paths, &s1->nb_include_paths);
     dynarray_reset(&s1->sysinclude_paths, &s1->nb_sysinclude_paths);
     dynarray_reset(&s1->cmd_include_files, &s1->nb_cmd_include_files);
     if (!s->nostdinc) {
         /* default include paths */
         /* -isystem paths have already been handled */
-        tcc_add_tccinclude_path(s, CONFIG_TCC_TCCINCLUDEPATHS);
         tcc_add_sysinclude_path(s, CONFIG_TCC_SYSINCLUDEPATHS);
     }
     return 0;
 }
-LIBTCCAPI int tcc_add_tccinclude_path(TCCState *s, const char *pathname)
-{
-    tcc_split_path(s, &s->tccinclude_paths, &s->nb_tccinclude_paths, pathname);
-    return 0;
-}
 LIBTCCAPI int tcc_add_include_path(TCCState *s, const char *pathname)
 {
     tcc_split_path(s, &s->include_paths, &s->nb_include_paths, pathname);
     { "m", TCC_OPTION_m, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "f", TCC_OPTION_f, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
     { "isystem", TCC_OPTION_isystem, TCC_OPTION_HAS_ARG },
-    { "iwithprefix", TCC_OPTION_iwithprefix, TCC_OPTION_HAS_ARG },
     { "include", TCC_OPTION_include, TCC_OPTION_HAS_ARG },
     { "nostdinc", TCC_OPTION_nostdinc, 0 },
     { "nostdlib", TCC_OPTION_nostdlib, 0 },
     int last_o = -1;
     int x;
     CString linker_arg; /* collect -Wl options */
-    char buf[1024];
     int tool = 0, arg_start = 0, noaction = optind;
     char **argv = *pargv;
     int argc = *pargc;
         case TCC_OPTION_isystem:
             tcc_add_sysinclude_path(s, optarg);
             break;
-        case TCC_OPTION_iwithprefix:
-            snprintf(buf, sizeof buf, "{B}/%s", optarg);
-            tcc_add_tccinclude_path(s, buf);
-            break;
 	case TCC_OPTION_include:
 	    dynarray_add(&s->cmd_include_files,
 			 &s->nb_cmd_include_files, tcc_strdup(optarg));

libtcc.h+0−3

@@ -32,9 +32,6 @@ LIBTCCAPI void tcc_set_options(TCCState s, const char str); · 31 unmodified lines
32	/*****************************/	32	/*****************************/
33	/* preprocessor */	33	/* preprocessor */
34		34
35	/* add in tcc include path, searched before anything else */
36	LIBTCCAPI int tcc_add_tccinclude_path(TCCState s, const char pathname);
37
38	/* add include path */	35	/* add include path */
39	LIBTCCAPI int tcc_add_include_path(TCCState s, const char pathname);	36	LIBTCCAPI int tcc_add_include_path(TCCState s, const char pathname);
40		37

tcc.c+2−3

     "  -Wp,-opt                      same as -opt\n"
     "  -include file                 include 'file' above each input file\n"
     "  -isystem dir                  add 'dir' to system include path\n"
-    "  -iwithprefix dir              set tcc's private include/library subdir\n"
     "  -static                       link to static libraries (not recommended)\n"
     "  -dumpversion                  print version\n"
     "  -print-search-dirs            print search paths\n"
 {
     printf("install: %s\n", s->tcc_lib_path);
     /* print_dirs("programs", NULL, 0); */
-    print_dirs("tcc-include", s->tccinclude_paths, s->nb_tccinclude_paths);
     print_dirs("include", s->sysinclude_paths, s->nb_sysinclude_paths);
     print_dirs("libraries", s->library_paths, s->nb_library_paths);
 #ifndef TCC_TARGET_PE
     path = getenv("C_INCLUDE_PATH");
     if(path != NULL) {
-        tcc_add_include_path(s, path);
+        tcc_add_sysinclude_path(s, path);
     }
     path = getenv("CPATH");
     if(path != NULL) {
             return 0;
         if (opt == OPT_PRINT_DIRS) {
             /* initialize search dirs */
+            set_environment(s);
             tcc_set_output_type(s, TCC_OUTPUT_MEMORY);
             print_search_dirs(s);
             return 0;

tcc.h+8−23

 # define IS_DIRSEP(c) (c == '/' || c == '\\')
 # define IS_ABSPATH(p) (IS_DIRSEP(p[0]) || (p[0] && p[1] == ':' && IS_DIRSEP(p[2])))
 # define PATHCMP stricmp
+# define PATHSEP ";"
 #else
 # define IS_DIRSEP(c) (c == '/')
 # define IS_ABSPATH(p) IS_DIRSEP(p[0])
 # define PATHCMP strcmp
+# define PATHSEP ":"
 #endif
 /* -------------------------------------------- */
 /* Below: {B} is substituted by CONFIG_TCCDIR (rsp. -B option) */
 /* system include paths */
-#ifndef CONFIG_TCC_TCCINCLUDEPATHS
+#ifndef CONFIG_TCC_SYSINCLUDEPATHS
 # ifdef TCC_TARGET_PE
-#  define CONFIG_TCC_TCCINCLUDEPATHS "{B}/include;{B}/include/winapi"
+#  define CONFIG_TCC_SYSINCLUDEPATHS "{B}/include"PATHSEP"{B}/include/winapi"
 # else
-#  define CONFIG_TCC_TCCINCLUDEPATHS "{B}/include"
-# endif
-#endif
-#ifndef CONFIG_TCC_SYSINCLUDEPATHS
-# ifndef TCC_TARGET_PE
 #  define CONFIG_TCC_SYSINCLUDEPATHS \
-    ALSO_TRIPLET(CONFIG_SYSROOT "/usr/local/include") \
+        "{B}/include" \
+    ":" ALSO_TRIPLET(CONFIG_SYSROOT "/usr/local/include") \
     ":" ALSO_TRIPLET(CONFIG_SYSROOT "/usr/include")
-# else
-#  define CONFIG_TCC_SYSINCLUDEPATHS ""
 # endif
 #endif
 #define TCC_LIBGCC USE_TRIPLET(CONFIG_SYSROOT "/" CONFIG_LDDIR) "/libgcc_s.so.1"
 #endif
-#ifdef TCC_TARGET_PE
-#define PATHSEP ';'
-#else
-#define PATHSEP ':'
-#endif
 /* -------------------------------------------- */
 #include "libtcc.h"
     DLLReference **loaded_dlls;
     int nb_loaded_dlls;
-    /* include paths, search order */
+    /* include paths */
-    char **tccinclude_paths;
-    int nb_tccinclude_paths;
     char **include_paths;
     int nb_include_paths;
 ST_FUNC int pe_load_file(struct TCCState *s1, const char *filename, int fd);
 ST_FUNC int pe_output_file(TCCState * s1, const char *filename);
 ST_FUNC int pe_putimport(TCCState *s1, int dllindex, const char *name, addr_t value);
-#ifndef TCC_TARGET_ARM
+#if defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64
 ST_FUNC SValue *pe_getimport(SValue *sv, SValue *v2);
 #endif
 #ifdef TCC_TARGET_X86_64
 # define ST_PE_IMPORT 0x20
 # define ST_PE_STDCALL 0x40
 #endif
 /* ------------ tccrun.c ----------------- */
 #ifdef TCC_IS_NATIVE
 #ifdef CONFIG_TCC_STATIC

tccasm.c+2−0

 	    sym->type.t &= ~VT_EXTERN;
 	    /* Mark that this asm symbol doesn't need to be fed back.  */
 	    sym->a.dllimport = 1;
+	} else {
+	    sym->type.t |= VT_STATIC;
 	}
     }
     return sym;

tccelf.c+94−116

@@ -828,6 +828,12 @@ static int prepare_dynamic_rel(TCCState s1, Section sr) · 827 unmodified lines
828	switch(type) {	828	switch(type) {
829	#if defined(TCC_TARGET_I386)	829	#if defined(TCC_TARGET_I386)
830	case R_386_32:	830	case R_386_32:
		831	if (!get_sym_attr(s1, sym_index, 0)->dyn_index
		832	&& ((ElfW(Sym)*)symtab_section->data + sym_index)->st_shndx == SHN_UNDEF) {
		833	/* don't fixup unresolved (weak) symbols */
		834	rel->r_info = ELFW(R_INFO)(sym_index, R_386_RELATIVE);
		835	break;
		836	}
831	#elif defined(TCC_TARGET_X86_64)	837	#elif defined(TCC_TARGET_X86_64)
832	case R_X86_64_32:	838	case R_X86_64_32:
833	case R_X86_64_32S:	839	case R_X86_64_32S:
@@ -1238,14 +1244,6 @@ static void tcc_output_binary(TCCState s1, FILE f, · 404 unmodified lines
1238	}	1244	}
1239	}	1245	}
1240		1246
1241	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
1242	#define HAVE_PHDR 1
1243	#define EXTRA_RELITEMS 14
1244	#else
1245	#define HAVE_PHDR 1
1246	#define EXTRA_RELITEMS 9
1247	#endif
1248
1249	ST_FUNC void fill_got_entry(TCCState s1, ElfW_Rel rel)	1247	ST_FUNC void fill_got_entry(TCCState s1, ElfW_Rel rel)
1250	{	1248	{
1251	int sym_index = ELFW(R_SYM) (rel->r_info);	1249	int sym_index = ELFW(R_SYM) (rel->r_info);
@@ -1413,13 +1411,12 @@ static void bind_libs_dynsyms(TCCState *s1) · 161 unmodified lines
1413	for_each_elem(s1->dynsymtab_section, 1, esym, ElfW(Sym)) {	1411	for_each_elem(s1->dynsymtab_section, 1, esym, ElfW(Sym)) {
1414	name = (char *) s1->dynsymtab_section->link->data + esym->st_name;	1412	name = (char *) s1->dynsymtab_section->link->data + esym->st_name;
1415	sym_index = find_elf_sym(symtab_section, name);	1413	sym_index = find_elf_sym(symtab_section, name);
1416	/* XXX: avoid adding a symbol if already present because of
1417	-rdynamic ? */
1418	sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];	1414	sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
1419	if (sym_index && sym->st_shndx != SHN_UNDEF)	1415	if (sym_index && sym->st_shndx != SHN_UNDEF
1420	set_elf_sym(s1->dynsym, sym->st_value, sym->st_size, sym->st_info,	1416	&& ELFW(ST_BIND)(sym->st_info) != STB_LOCAL) {
1421	0, sym->st_shndx, name);	1417	set_elf_sym(s1->dynsym, sym->st_value, sym->st_size,
1422	else if (esym->st_shndx == SHN_UNDEF) {	1418	sym->st_info, 0, sym->st_shndx, name);
		1419	} else if (esym->st_shndx == SHN_UNDEF) {
1423	/* weak symbols can stay undefined */	1420	/* weak symbols can stay undefined */
1424	if (ELFW(ST_BIND)(esym->st_info) != STB_WEAK)	1421	if (ELFW(ST_BIND)(esym->st_info) != STB_WEAK)
1425	tcc_warning("undefined dynamic symbol '%s'", name);	1422	tcc_warning("undefined dynamic symbol '%s'", name);
@@ -1451,10 +1448,11 @@ static void export_global_syms(TCCState *s1) · 25 unmodified lines
1451	/* Allocate strings for section names and decide if an unallocated section	1448	/* Allocate strings for section names and decide if an unallocated section
1452	should be output.	1449	should be output.
1453	NOTE: the strsec section comes last, so its size is also correct ! */	1450	NOTE: the strsec section comes last, so its size is also correct ! */
1454	static void alloc_sec_names(TCCState s1, int file_type, Section strsec)	1451	static int alloc_sec_names(TCCState s1, int file_type, Section strsec)
1455	{	1452	{
1456	int i;	1453	int i;
1457	Section *s;	1454	Section *s;
		1455	int textrel = 0;
1458		1456
1459	/* Allocate strings for section names */	1457	/* Allocate strings for section names */
1460	for(i = 1; i < s1->nb_sections; i++) {	1458	for(i = 1; i < s1->nb_sections; i++) {
@@ -1463,12 +1461,11 @@ static void alloc_sec_names(TCCState s1, int file_type, Section strsec) · 2 unmodified lines
1463	patch them */	1461	patch them */
1464	if (file_type == TCC_OUTPUT_DLL &&	1462	if (file_type == TCC_OUTPUT_DLL &&
1465	s->sh_type == SHT_RELX &&	1463	s->sh_type == SHT_RELX &&
1466	!(s->sh_flags & SHF_ALLOC)) {	1464	!(s->sh_flags & SHF_ALLOC) &&
1467	/* gr: avoid bogus relocs for empty (debug) sections */	1465	(s1->sections[s->sh_info]->sh_flags & SHF_ALLOC) &&
1468	if (s1->sections[s->sh_info]->sh_flags & SHF_ALLOC)	1466	prepare_dynamic_rel(s1, s)) {
1469	prepare_dynamic_rel(s1, s);	1467	if (s1->sections[s->sh_info]->sh_flags & SHF_EXECINSTR)
1470	else if (s1->do_debug)	1468	textrel = 1;
1471	s->sh_size = s->data_offset;
1472	} else if (s1->do_debug \|\|	1469	} else if (s1->do_debug \|\|
1473	file_type == TCC_OUTPUT_OBJ \|\|	1470	file_type == TCC_OUTPUT_OBJ \|\|
1474	(s->sh_flags & SHF_ALLOC) \|\|	1471	(s->sh_flags & SHF_ALLOC) \|\|
@@ -1480,13 +1477,14 @@ static void alloc_sec_names(TCCState s1, int file_type, Section strsec) · 5 unmodified lines
1480	s->sh_name = put_elf_str(strsec, s->name);	1477	s->sh_name = put_elf_str(strsec, s->name);
1481	}	1478	}
1482	strsec->sh_size = strsec->data_offset;	1479	strsec->sh_size = strsec->data_offset;
		1480	return textrel;
1483	}	1481	}
1484		1482
1485	/* Info to be copied in dynamic section */	1483	/* Info to be copied in dynamic section */
1486	struct dyn_inf {	1484	struct dyn_inf {
1487	Section *dynamic;	1485	Section *dynamic;
1488	Section *dynstr;	1486	Section *dynstr;
1489	unsigned long dyn_rel_off;	1487	unsigned long data_offset;
1490	addr_t rel_addr;	1488	addr_t rel_addr;
1491	addr_t rel_size;	1489	addr_t rel_size;
1492	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)	1490	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
@@ -1542,7 +1540,7 @@ static int layout_sections(TCCState s1, ElfW(Phdr) phdr, int phnum, · 49 unmodified lines
1542	the program header table itself if needed. These are done later as	1540	the program header table itself if needed. These are done later as
1543	they require section layout to be done first. */	1541	they require section layout to be done first. */
1544	if (interp)	1542	if (interp)
1545	ph += 1 + HAVE_PHDR;	1543	ph += 2;
1546		1544
1547	/* dynamic relocation table information, for .dynamic section */	1545	/* dynamic relocation table information, for .dynamic section */
1548	dyninf->rel_addr = dyninf->rel_size = 0;	1546	dyninf->rel_addr = dyninf->rel_size = 0;
@@ -1684,19 +1682,14 @@ static void fill_unloadable_phdr(ElfW(Phdr) phdr, int phnum, Section interp, · 135 unmodified lines
1684	if (interp) {	1682	if (interp) {
1685	ph = &phdr[0];	1683	ph = &phdr[0];
1686		1684
1687	if (HAVE_PHDR)	1685	ph->p_type = PT_PHDR;
1688	{	1686	ph->p_offset = sizeof(ElfW(Ehdr));
1689	int len = phnum * sizeof(ElfW(Phdr));	1687	ph->p_filesz = ph->p_memsz = phnum * sizeof(ElfW(Phdr));
1690		1688	ph->p_vaddr = interp->sh_addr - ph->p_filesz;
1691	ph->p_type = PT_PHDR;	1689	ph->p_paddr = ph->p_vaddr;
1692	ph->p_offset = sizeof(ElfW(Ehdr));	1690	ph->p_flags = PF_R \| PF_X;
1693	ph->p_vaddr = interp->sh_addr - len;	1691	ph->p_align = 4; /* interp->sh_addralign; */
1694	ph->p_paddr = ph->p_vaddr;	1692	ph++;
1695	ph->p_filesz = ph->p_memsz = len;
1696	ph->p_flags = PF_R \| PF_X;
1697	ph->p_align = 4; /* interp->sh_addralign; */
1698	ph++;
1699	}
1700		1693
1701	ph->p_type = PT_INTERP;	1694	ph->p_type = PT_INTERP;
1702	ph->p_offset = interp->sh_offset;	1695	ph->p_offset = interp->sh_offset;
@@ -1727,12 +1720,9 @@ static void fill_unloadable_phdr(ElfW(Phdr) phdr, int phnum, Section interp, · 24 unmodified lines
1727	sections */	1720	sections */
1728	static void fill_dynamic(TCCState s1, struct dyn_inf dyninf)	1721	static void fill_dynamic(TCCState s1, struct dyn_inf dyninf)
1729	{	1722	{
1730	Section *dynamic;	1723	Section *dynamic = dyninf->dynamic;
1731
1732	dynamic = dyninf->dynamic;
1733		1724
1734	/* put dynamic section entries */	1725	/* put dynamic section entries */
1735	dynamic->data_offset = dyninf->dyn_rel_off;
1736	put_dt(dynamic, DT_HASH, s1->dynsym->hash->sh_addr);	1726	put_dt(dynamic, DT_HASH, s1->dynsym->hash->sh_addr);
1737	put_dt(dynamic, DT_STRTAB, dyninf->dynstr->sh_addr);	1727	put_dt(dynamic, DT_STRTAB, dyninf->dynstr->sh_addr);
1738	put_dt(dynamic, DT_SYMTAB, s1->dynsym->sh_addr);	1728	put_dt(dynamic, DT_SYMTAB, s1->dynsym->sh_addr);
@@ -2009,22 +1999,20 @@ static int elf_output_file(TCCState s1, const char filename) · 270 unmodified lines
2009	ElfW(Phdr) *phdr;	1999	ElfW(Phdr) *phdr;
2010	ElfW(Sym) *sym;	2000	ElfW(Sym) *sym;
2011	Section strsec, interp, dynamic, dynstr;	2001	Section strsec, interp, dynamic, dynstr;
		2002	int textrel;
2012		2003
2013	file_type = s1->output_type;	2004	file_type = s1->output_type;
2014	s1->nb_errors = 0;	2005	s1->nb_errors = 0;
2015		2006	ret = -1;
2016	/* if linking, also link in runtime libraries (libc, libgcc, etc.) */
2017	if (file_type != TCC_OUTPUT_OBJ) {
2018	tcc_add_runtime(s1);
2019	}
2020
2021	phdr = NULL;	2007	phdr = NULL;
2022	sec_order = NULL;	2008	sec_order = NULL;
2023	interp = dynamic = dynstr = NULL; /* avoid warning */	2009	interp = dynamic = dynstr = NULL; /* avoid warning */
		2010	textrel = 0;
2024		2011
2025	if (file_type != TCC_OUTPUT_OBJ) {	2012	if (file_type != TCC_OUTPUT_OBJ) {
		2013	/* if linking, also link in runtime libraries (libc, libgcc, etc.) */
		2014	tcc_add_runtime(s1);
2026	relocate_common_syms();	2015	relocate_common_syms();
2027
2028	tcc_add_linker_symbols(s1);	2016	tcc_add_linker_symbols(s1);
2029		2017
2030	if (!s1->static_link) {	2018	if (!s1->static_link) {
@@ -2057,52 +2045,69 @@ static int elf_output_file(TCCState s1, const char filename) · 26 unmodified lines
2057		2045
2058	if (file_type == TCC_OUTPUT_EXE) {	2046	if (file_type == TCC_OUTPUT_EXE) {
2059	bind_exe_dynsyms(s1);	2047	bind_exe_dynsyms(s1);
2060		2048	if (s1->nb_errors)
2061	if (s1->nb_errors) {
2062	ret = -1;
2063	goto the_end;	2049	goto the_end;
2064	}
2065
2066	bind_libs_dynsyms(s1);	2050	bind_libs_dynsyms(s1);
2067	} else /* shared library case: simply export all global symbols */	2051	} else {
		2052	/* shared library case: simply export all global symbols */
2068	export_global_syms(s1);	2053	export_global_syms(s1);
		2054	}
		2055	}
		2056	build_got_entries(s1);
		2057	}
2069		2058
2070	build_got_entries(s1);	2059	/* we add a section for symbols */
		2060	strsec = new_section(s1, ".shstrtab", SHT_STRTAB, 0);
		2061	put_elf_str(strsec, "");
2071		2062
2072	/* add a list of needed dlls */	2063	/* Allocate strings for section names */
2073	for(i = 0; i < s1->nb_loaded_dlls; i++) {	2064	textrel = alloc_sec_names(s1, file_type, strsec);
2074	DLLReference *dllref = s1->loaded_dlls[i];
2075	if (dllref->level == 0)
2076	put_dt(dynamic, DT_NEEDED, put_elf_str(dynstr, dllref->name));
2077	}
2078		2065
2079	if (s1->rpath)	2066	if (dynamic) {
2080	put_dt(dynamic, s1->enable_new_dtags ? DT_RUNPATH : DT_RPATH,	2067	/* add a list of needed dlls */
2081	put_elf_str(dynstr, s1->rpath));	2068	for(i = 0; i < s1->nb_loaded_dlls; i++) {
		2069	DLLReference *dllref = s1->loaded_dlls[i];
		2070	if (dllref->level == 0)
		2071	put_dt(dynamic, DT_NEEDED, put_elf_str(dynstr, dllref->name));
		2072	}
2082		2073
		2074	if (s1->rpath)
		2075	put_dt(dynamic, s1->enable_new_dtags ? DT_RUNPATH : DT_RPATH,
		2076	put_elf_str(dynstr, s1->rpath));
		2077
		2078	if (file_type == TCC_OUTPUT_DLL) {
		2079	if (s1->soname)
		2080	put_dt(dynamic, DT_SONAME, put_elf_str(dynstr, s1->soname));
2083	/* XXX: currently, since we do not handle PIC code, we	2081	/* XXX: currently, since we do not handle PIC code, we
2084	must relocate the readonly segments */	2082	must relocate the readonly segments */
2085	if (file_type == TCC_OUTPUT_DLL) {	2083	if (textrel)
2086	if (s1->soname)
2087	put_dt(dynamic, DT_SONAME, put_elf_str(dynstr, s1->soname));
2088	put_dt(dynamic, DT_TEXTREL, 0);	2084	put_dt(dynamic, DT_TEXTREL, 0);
2089	}	2085	}
2090		2086
2091	if (s1->symbolic)	2087	if (s1->symbolic)
2092	put_dt(dynamic, DT_SYMBOLIC, 0);	2088	put_dt(dynamic, DT_SYMBOLIC, 0);
2093		2089
2094	/* add necessary space for other entries */	2090	dyninf.dynamic = dynamic;
2095	dyninf.dyn_rel_off = dynamic->data_offset;	2091	dyninf.dynstr = dynstr;
2096	dynamic->data_offset += sizeof(ElfW(Dyn)) * EXTRA_RELITEMS;	2092	/* remember offset and reserve space for 2nd call below */
2097	} else {	2093	dyninf.data_offset = dynamic->data_offset;
2098	/* still need to build got entries in case of static link */	2094	fill_dynamic(s1, &dyninf);
2099	build_got_entries(s1);	2095	dynamic->sh_size = dynamic->data_offset;
2100	}	2096	dynstr->sh_size = dynstr->data_offset;
2101	}	2097	}
2102		2098
2103	/* we add a section for symbols */	2099	/* compute number of program headers */
2104	strsec = new_section(s1, ".shstrtab", SHT_STRTAB, 0);	2100	if (file_type == TCC_OUTPUT_OBJ)
2105	put_elf_str(strsec, "");	2101	phnum = 0;
		2102	else if (file_type == TCC_OUTPUT_DLL)
		2103	phnum = 3;
		2104	else if (s1->static_link)
		2105	phnum = 2;
		2106	else
		2107	phnum = 5;
		2108
		2109	/* allocate program segment headers */
		2110	phdr = tcc_mallocz(phnum * sizeof(ElfW(Phdr)));
2106		2111
2107	/* compute number of sections */	2112	/* compute number of sections */
2108	shnum = s1->nb_sections;	2113	shnum = s1->nb_sections;
@@ -2111,41 +2116,16 @@ static int elf_output_file(TCCState s1, const char filename) · 2 unmodified lines
2111	sec_order = tcc_malloc(sizeof(int) * shnum);	2116	sec_order = tcc_malloc(sizeof(int) * shnum);
2112	sec_order[0] = 0;	2117	sec_order[0] = 0;
2113		2118
2114	/* compute number of program headers */
2115	switch(file_type) {
2116	default:
2117	case TCC_OUTPUT_OBJ:
2118	phnum = 0;
2119	break;
2120	case TCC_OUTPUT_EXE:
2121	if (!s1->static_link)
2122	phnum = 4 + HAVE_PHDR;
2123	else
2124	phnum = 2;
2125	break;
2126	case TCC_OUTPUT_DLL:
2127	phnum = 3;
2128	break;
2129	}
2130
2131	/* Allocate strings for section names */
2132	alloc_sec_names(s1, file_type, strsec);
2133
2134	/* allocate program segment headers */
2135	phdr = tcc_mallocz(phnum * sizeof(ElfW(Phdr)));
2136
2137	/* compute section to program header mapping */	2119	/* compute section to program header mapping */
2138	file_offset = layout_sections(s1, phdr, phnum, interp, strsec, &dyninf,	2120	file_offset = layout_sections(s1, phdr, phnum, interp, strsec, &dyninf,
2139	sec_order);	2121	sec_order);
2140		2122
2141	/* Fill remaining program header and finalize relocation related to dynamic	2123	/* Fill remaining program header and finalize relocation related to dynamic
2142	linking. */	2124	linking. */
2143	if (phnum > 0) {	2125	if (file_type != TCC_OUTPUT_OBJ) {
2144	fill_unloadable_phdr(phdr, phnum, interp, dynamic);	2126	fill_unloadable_phdr(phdr, phnum, interp, dynamic);
2145	if (dynamic) {	2127	if (dynamic) {
2146	dyninf.dynamic = dynamic;	2128	dynamic->data_offset = dyninf.data_offset;
2147	dyninf.dynstr = dynstr;
2148
2149	fill_dynamic(s1, &dyninf);	2129	fill_dynamic(s1, &dyninf);
2150		2130
2151	/* put in GOT the dynamic section address and relocate PLT */	2131	/* put in GOT the dynamic section address and relocate PLT */
@@ -2162,22 +2142,20 @@ static int elf_output_file(TCCState s1, const char filename) · 10 unmodified lines
2162	}	2142	}
2163	}	2143	}
2164	}	2144	}
2165	}
2166		2145
2167	/* if building executable or DLL, then relocate each section	2146	/* if building executable or DLL, then relocate each section
2168	except the GOT which is already relocated */	2147	except the GOT which is already relocated */
2169	if (file_type != TCC_OUTPUT_OBJ) {
2170	ret = final_sections_reloc(s1);	2148	ret = final_sections_reloc(s1);
2171	if (ret)	2149	if (ret)
2172	goto the_end;	2150	goto the_end;
2173	tidy_section_headers(s1, sec_order);	2151	tidy_section_headers(s1, sec_order);
2174	}
2175		2152
2176	/* Perform relocation to GOT or PLT entries */	2153	/* Perform relocation to GOT or PLT entries */
2177	if (file_type == TCC_OUTPUT_EXE && s1->static_link)	2154	if (file_type == TCC_OUTPUT_EXE && s1->static_link)
2178	fill_got(s1);	2155	fill_got(s1);
2179	else if (s1->got)	2156	else if (s1->got)
2180	fill_local_got_entries(s1);	2157	fill_local_got_entries(s1);
		2158	}
2181		2159
2182	/* Create the ELF file with name 'filename' */	2160	/* Create the ELF file with name 'filename' */
2183	ret = tcc_write_elf_file(s1, filename, phnum, phdr, file_offset, sec_order);	2161	ret = tcc_write_elf_file(s1, filename, phnum, phdr, file_offset, sec_order);

tccgen.c+27−11

     return ((unsigned)((p[1] | 0x800fffff) + 1)) >> 31;
 }
+/* compiling intel long double natively */
+#if (defined __i386__ || defined __x86_64__) \
+    && (defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64)
+# define TCC_IS_NATIVE_387
+#endif
 ST_FUNC void test_lvalue(void)
 {
     if (!(vtop->r & VT_LVAL))
     parse_flags = PARSE_FLAG_PREPROCESS | PARSE_FLAG_TOK_NUM | PARSE_FLAG_TOK_STR;
     next();
     decl(VT_CONST);
-    if (tok != TOK_EOF)
-        expect("declaration");
     gen_inline_functions(s1);
     check_vstack();
     /* end of translation unit info */
         df = is_float(dbt);
         c = (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST;
         p = (vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == (VT_CONST | VT_SYM);
+#if !defined TCC_IS_NATIVE && !defined TCC_IS_NATIVE_387
+        c &= dbt != VT_LDOUBLE;
+#endif
         if (c) {
             /* constant case: we can do it now */
             /* XXX: in ISOC, cannot do it if error in convert */
             /* ... and discard */
             vpop();
         }
+    } else if (dbt == VT_VOID) {
+        --vtop;
     } else {
 #ifdef CONFIG_TCC_BCHECK
             /* bound check case */
         if (tok != ';') {
             gexpr();
             gen_assign_cast(&func_vt);
-            gfunc_return(&func_vt);
+            if ((func_vt.t & VT_BTYPE) == VT_VOID)
+                vtop--;
+            else
+                gfunc_return(&func_vt);
         }
         skip(';');
         /* jump unless last stmt in top-level block */
 		*(double *)ptr = vtop->c.d;
 		break;
 	    case VT_LDOUBLE:
-#if (defined __i386__ || defined __x86_64__) && (defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64)
+#if defined TCC_IS_NATIVE_387
                 if (sizeof (long double) >= 10) /* zero pad ten-byte LD */
                     memcpy(ptr, &vtop->c.ld, 10);
 #ifdef __TINYC__
                 next();
                 continue;
             }
-            if (l == VT_CONST &&
+            if (l != VT_CONST)
-                (tok == TOK_ASM1 || tok == TOK_ASM2 || tok == TOK_ASM3)) {
+                break;
+            if (tok == TOK_ASM1 || tok == TOK_ASM2 || tok == TOK_ASM3) {
                 /* global asm block */
                 asm_global_instr();
                 continue;
             }
-            /* special test for old K&R protos without explicit int
+            if (tok >= TOK_UIDENT) {
-               type. Only accepted when defining global data */
+               /* special test for old K&R protos without explicit int
-            if (l != VT_CONST || tok < TOK_UIDENT)
+                  type. Only accepted when defining global data */
+                btype.t = VT_INT;
+            } else {
+                if (tok != TOK_EOF)
+                    expect("declaration");
                 break;
-            btype.t = VT_INT;
+            }
         }
         if (tok == ';') {
 	    if ((btype.t & VT_BTYPE) == VT_STRUCT) {

tccpe.c+15−20

 #ifndef _WIN32
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
+#include <sys/stat.h> /* chmod() */
 #endif
 #ifdef TCC_TARGET_X86_64
 # define ADDR3264 ULONGLONG
+# define PE_IMAGE_REL IMAGE_REL_BASED_DIR64
 # define REL_TYPE_DIRECT R_X86_64_64
 # define R_XXX_THUNKFIX R_X86_64_PC32
 # define R_XXX_RELATIVE R_X86_64_RELATIVE
 #elif defined TCC_TARGET_ARM
 # define ADDR3264 DWORD
+# define PE_IMAGE_REL IMAGE_REL_BASED_HIGHLOW
 # define REL_TYPE_DIRECT R_ARM_ABS32
 # define R_XXX_THUNKFIX R_ARM_ABS32
 # define R_XXX_RELATIVE R_ARM_RELATIVE
 #elif defined TCC_TARGET_I386
 # define ADDR3264 DWORD
+# define PE_IMAGE_REL IMAGE_REL_BASED_HIGHLOW
 # define REL_TYPE_DIRECT R_386_32
 # define R_XXX_THUNKFIX R_386_32
 # define R_XXX_RELATIVE R_386_RELATIVE
 #endif
-#if 0
-#ifdef _WIN32
-void dbg_printf (const char *fmt, ...)
-{
-    char buffer[4000];
-    va_list arg;
-    int x;
-    va_start(arg, fmt);
-    x = vsprintf (buffer, fmt, arg);
-    strcpy(buffer+x, "\n");
-    OutputDebugString(buffer);
-}
-#endif
-#endif
-/* ----------------------------------------------------------- */
 #ifndef IMAGE_NT_SIGNATURE
 /* ----------------------------------------------------------- */
 /* definitions below are from winnt.h */
 #define IMAGE_REL_BASED_MIPS_JMPADDR     5
 #define IMAGE_REL_BASED_SECTION          6
 #define IMAGE_REL_BASED_REL32            7
+#define IMAGE_REL_BASED_DIR64           10
 #pragma pack(pop)
 /* ----------------------------------------------------------- */
 #endif /* ndef IMAGE_NT_SIGNATURE */
 /* ----------------------------------------------------------- */
-#pragma pack(push, 1)
+#ifndef IMAGE_REL_BASED_DIR64
+# define IMAGE_REL_BASED_DIR64 10
+#endif
+#pragma pack(push, 1)
 struct pe_header
 {
     IMAGE_DOS_HEADER doshdr;
     DWORD size;
     WORD type;
 };
 #pragma pack(pop)
 /* ------------------------------------------------------------- */
     fseek(op, offsetof(struct pe_header, opthdr.CheckSum), SEEK_SET);
     pe_fwrite(&pe_header.opthdr.CheckSum, sizeof pe_header.opthdr.CheckSum, op, NULL);
     fclose (op);
+#ifndef _WIN32
+    chmod(pe->filename, 0777);
+#endif
     if (2 == pe->s1->verbose)
         printf("-------------------------------\n");
             }
             if ((addr -= offset)  < (1<<12)) { /* one block spans 4k addresses */
                 WORD *wp = section_ptr_add(pe->reloc, sizeof (WORD));
-                *wp = addr | IMAGE_REL_BASED_HIGHLOW<<12;
+                *wp = addr | PE_IMAGE_REL<<12;
                 ++count;
                 continue;
             }
 /* ------------------------------------------------------------- */
 /* helper function for load/store to insert one more indirection */
-#ifndef TCC_TARGET_ARM
+#if defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64
 ST_FUNC SValue *pe_getimport(SValue *sv, SValue *v2)
 {
     int r2;

tccpp.c+23−28

@@ -591,7 +591,7 @@ ST_FUNC int handle_eob(void) · 590 unmodified lines
591		591
592	/* only tries to read if really end of buffer */	592	/* only tries to read if really end of buffer */
593	if (bf->buf_ptr >= bf->buf_end) {	593	if (bf->buf_ptr >= bf->buf_end) {
594	if (bf->fd != -1) {	594	if (bf->fd >= 0) {
595	#if defined(PARSE_DEBUG)	595	#if defined(PARSE_DEBUG)
596	len = 1;	596	len = 1;
597	#else	597	#else
@@ -1803,8 +1803,7 @@ ST_FUNC void preprocess(int is_bof) · 1205 unmodified lines
1803	/* store current file in stack, but increment stack later below */	1803	/* store current file in stack, but increment stack later below */
1804	*s1->include_stack_ptr = file;	1804	*s1->include_stack_ptr = file;
1805	i = tok == TOK_INCLUDE_NEXT ? file->include_next_index : 0;	1805	i = tok == TOK_INCLUDE_NEXT ? file->include_next_index : 0;
1806	n = 2 + s1->nb_tccinclude_paths + s1->nb_include_paths +	1806	n = 2 + s1->nb_include_paths + s1->nb_sysinclude_paths;
1807	s1->nb_sysinclude_paths;
1808	for (; i < n; ++i) {	1807	for (; i < n; ++i) {
1809	char buf1[sizeof file->filename];	1808	char buf1[sizeof file->filename];
1810	CachedInclude *e;	1809	CachedInclude *e;
@@ -1826,14 +1825,8 @@ ST_FUNC void preprocess(int is_bof) · 15 unmodified lines
1826		1825
1827	} else {	1826	} else {
1828	/* search in all the include paths */	1827	/* search in all the include paths */
1829	int k, j = i - 2;	1828	int j = i - 2, k = j - s1->nb_include_paths;
1830		1829	path = k < 0 ? s1->include_paths[j] : s1->sysinclude_paths[k];
1831	if (j < (k = s1->nb_tccinclude_paths))
1832	path = s1->tccinclude_paths[j];
1833	else if ((j -= k) < s1->nb_include_paths)
1834	path = s1->include_paths[j];
1835	else if ((j -= s1->nb_include_paths) < s1->nb_sysinclude_paths)
1836	path = s1->sysinclude_paths[j];
1837	pstrcpy(buf1, sizeof(buf1), path);	1830	pstrcpy(buf1, sizeof(buf1), path);
1838	pstrcat(buf1, sizeof(buf1), "/");	1831	pstrcat(buf1, sizeof(buf1), "/");
1839	}	1832	}
@@ -2635,6 +2628,8 @@ static inline void next_nomacro1(void) · 795 unmodified lines
2635	tcc_close();	2628	tcc_close();
2636	s1->include_stack_ptr--;	2629	s1->include_stack_ptr--;
2637	p = file->buf_ptr;	2630	p = file->buf_ptr;
		2631	if (p == file->buffer)
		2632	tok_flags = TOK_FLAG_BOF\|TOK_FLAG_BOL;
2638	goto redo_no_start;	2633	goto redo_no_start;
2639	}	2634	}
2640	}	2635	}
@@ -2968,7 +2963,7 @@ maybe_newline: · 327 unmodified lines
2968	keep_tok_flags:	2963	keep_tok_flags:
2969	file->buf_ptr = p;	2964	file->buf_ptr = p;
2970	#if defined(PARSE_DEBUG)	2965	#if defined(PARSE_DEBUG)
2971	printf("token = %s\n", get_tok_str(tok, &tokc));	2966	printf("token = %d %s\n", tok, get_tok_str(tok, &tokc));
2972	#endif	2967	#endif
2973	}	2968	}
2974		2969
@@ -3585,7 +3580,8 @@ ST_INLN void unget_tok(int last_tok) · 610 unmodified lines
3585		3580
3586	ST_FUNC void preprocess_start(TCCState *s1, int is_asm)	3581	ST_FUNC void preprocess_start(TCCState *s1, int is_asm)
3587	{	3582	{
3588	char *buf;	3583	CString cstr;
		3584	int i;
3589		3585
3590	s1->include_stack_ptr = s1->include_stack;	3586	s1->include_stack_ptr = s1->include_stack;
3591	s1->ifdef_stack_ptr = s1->ifdef_stack;	3587	s1->ifdef_stack_ptr = s1->ifdef_stack;
@@ -3601,25 +3597,24 @@ ST_FUNC void preprocess_start(TCCState *s1, int is_asm) · 9 unmodified lines
3601	set_idnum('$', s1->dollars_in_identifiers ? IS_ID : 0);	3597	set_idnum('$', s1->dollars_in_identifiers ? IS_ID : 0);
3602	set_idnum('.', is_asm ? IS_ID : 0);	3598	set_idnum('.', is_asm ? IS_ID : 0);
3603		3599
3604	buf = tcc_malloc(3 + strlen(file->filename));	3600	cstr_new(&cstr);
3605	sprintf(buf, "\"%s\"", file->filename);	3601	cstr_cat(&cstr, "\"", -1);
3606	tcc_define_symbol(s1, "__BASE_FILE__", buf);	3602	cstr_cat(&cstr, file->filename, -1);
3607	tcc_free(buf);	3603	cstr_cat(&cstr, "\"", 0);
3608		3604	tcc_define_symbol(s1, "__BASE_FILE__", cstr.data);
3609	if (s1->nb_cmd_include_files) {	3605
3610	CString cstr;	3606	cstr_reset(&cstr);
3611	int i;	3607	for (i = 0; i < s1->nb_cmd_include_files; i++) {
3612	cstr_new(&cstr);	3608	cstr_cat(&cstr, "#include \"", -1);
3613	for (i = 0; i < s1->nb_cmd_include_files; i++) {	3609	cstr_cat(&cstr, s1->cmd_include_files[i], -1);
3614	cstr_cat(&cstr, "#include \"", -1);	3610	cstr_cat(&cstr, "\"\n", -1);
3615	cstr_cat(&cstr, s1->cmd_include_files[i], -1);	3611	}
3616	cstr_cat(&cstr, "\"\n", -1);	3612	if (cstr.size) {
3617	}
3618	*s1->include_stack_ptr++ = file;	3613	*s1->include_stack_ptr++ = file;
3619	tcc_open_bf(s1, "<command line>", cstr.size);	3614	tcc_open_bf(s1, "<command line>", cstr.size);
3620	memcpy(file->buffer, cstr.data, cstr.size);	3615	memcpy(file->buffer, cstr.data, cstr.size);
3621	cstr_free(&cstr);
3622	}	3616	}
		3617	cstr_free(&cstr);
3623		3618
3624	if (is_asm)	3619	if (is_asm)
3625	tcc_define_symbol(s1, "__ASSEMBLER__", NULL);	3620	tcc_define_symbol(s1, "__ASSEMBLER__", NULL);

tccrun.c+36−17

 #endif
 static void set_pages_executable(void *ptr, unsigned long length);
-static int tcc_relocate_ex(TCCState *s1, void *ptr);
+static int tcc_relocate_ex(TCCState *s1, void *ptr, addr_t ptr_diff);
 #ifdef _WIN64
 static void *win64_add_function_table(TCCState *s1);
 static void win64_del_function_table(void *);
 #endif
-// #define HAVE_SELINUX
 /* ------------------------------------------------------------- */
 /* Do all relocations (needed before using tcc_get_symbol())
    Returns -1 on error. */
 LIBTCCAPI int tcc_relocate(TCCState *s1, void *ptr)
 {
     int size;
+    addr_t ptr_diff = 0;
     if (TCC_RELOCATE_AUTO != ptr)
-        return tcc_relocate_ex(s1, ptr);
+        return tcc_relocate_ex(s1, ptr, 0);
-    size = tcc_relocate_ex(s1, NULL);
+    size = tcc_relocate_ex(s1, NULL, 0);
     if (size < 0)
         return -1;
 #ifdef HAVE_SELINUX
-    /* Use mmap instead of malloc for Selinux. */
+{
-    ptr = mmap (NULL, size, PROT_READ|PROT_WRITE,
+    /* Using mmap instead of malloc */
-        MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    void *prx;
-    if (ptr == MAP_FAILED)
+    char tmpfname[] = "/tmp/.tccrunXXXXXX";
-        tcc_error("tccrun: could not map memory");
+    int fd = mkstemp(tmpfname);
+    unlink(tmpfname);
+    ftruncate(fd, size);
+    ptr = mmap (NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+    prx = mmap (NULL, size, PROT_READ|PROT_EXEC, MAP_SHARED, fd, 0);
+    if (ptr == MAP_FAILED || prx == MAP_FAILED)
+	tcc_error("tccrun: could not map memory");
     dynarray_add(&s1->runtime_mem, &s1->nb_runtime_mem, (void*)(addr_t)size);
+    dynarray_add(&s1->runtime_mem, &s1->nb_runtime_mem, prx);
+    ptr_diff = (char*)prx - (char*)ptr;
+}
 #else
     ptr = tcc_malloc(size);
 #endif
-    tcc_relocate_ex(s1, ptr); /* no more errors expected */
+    tcc_relocate_ex(s1, ptr, ptr_diff); /* no more errors expected */
     dynarray_add(&s1->runtime_mem, &s1->nb_runtime_mem, ptr);
     return 0;
 }
     for (i = 0; i < s1->nb_runtime_mem; ++i) {
 #ifdef HAVE_SELINUX
         unsigned size = (unsigned)(addr_t)s1->runtime_mem[i++];
+        munmap(s1->runtime_mem[i++], size);
         munmap(s1->runtime_mem[i], size);
 #else
 #ifdef _WIN64
 /* relocate code. Return -1 on error, required size if ptr is NULL,
    otherwise copy code into buffer passed by the caller */
-static int tcc_relocate_ex(TCCState *s1, void *ptr)
+static int tcc_relocate_ex(TCCState *s1, void *ptr, addr_t ptr_diff)
 {
     Section *s;
     unsigned offset, length, fill, i, k;
             if (k != !(s->sh_flags & SHF_EXECINSTR))
                 continue;
             offset += fill;
-            s->sh_addr = mem ? mem + offset : 0;
+            if (!mem)
+                s->sh_addr = 0;
+            else if (s->sh_flags & SHF_EXECINSTR)
+                s->sh_addr = mem + offset + ptr_diff;
+            else
+                s->sh_addr = mem + offset;
 #if 0
             if (mem)
                 printf("%-16s +%02lx %p %04x\n",
             continue;
         length = s->data_offset;
         ptr = (void*)s->sh_addr;
+        if (s->sh_flags & SHF_EXECINSTR)
+            ptr = (char*)ptr - ptr_diff;
         if (NULL == s->data || s->sh_type == SHT_NOBITS)
             memset(ptr, 0, length);
         else
             memcpy(ptr, s->data, length);
         /* mark executable sections as executable in memory */
         if (s->sh_flags & SHF_EXECINSTR)
-            set_pages_executable(ptr, length);
+            set_pages_executable((char*)ptr + ptr_diff, length);
     }
     return 0;
 }
     VirtualProtect(ptr, length, PAGE_EXECUTE_READWRITE, &old_protect);
 #else
     void __clear_cache(void *beginning, void *end);
+# ifndef HAVE_SELINUX
     addr_t start, end;
-#ifndef PAGESIZE
+#  ifndef PAGESIZE
-# define PAGESIZE 4096
+#   define PAGESIZE 4096
-#endif
+#  endif
     start = (addr_t)ptr & ~(PAGESIZE - 1);
     end = (addr_t)ptr + length;
     end = (end + PAGESIZE - 1) & ~(PAGESIZE - 1);
     if (mprotect((void *)start, end - start, PROT_READ | PROT_WRITE | PROT_EXEC))
         tcc_error("mprotect failed: did you mean to configure --with-selinux?");
+# endif
 # if defined TCC_TARGET_ARM || defined TCC_TARGET_ARM64
     __clear_cache(ptr, (char *)ptr + length);
 # endif

tcctok.h+7−9

      DEF(TOK_FASTCALL1, "fastcall")
      DEF(TOK_FASTCALL2, "__fastcall")
      DEF(TOK_FASTCALL3, "__fastcall__")
+     DEF(TOK_REGPARM1, "regparm")
+     DEF(TOK_REGPARM2, "__regparm__")
      DEF(TOK_MODE, "__mode__")
      DEF(TOK_MODE_QI, "__QI__")
      DEF(TOK_NORETURN2, "__noreturn__")
      DEF(TOK_VISIBILITY1, "visibility")
      DEF(TOK_VISIBILITY2, "__visibility__")
      DEF(TOK_builtin_types_compatible_p, "__builtin_types_compatible_p")
      DEF(TOK_builtin_choose_expr, "__builtin_choose_expr")
      DEF(TOK_builtin_constant_p, "__builtin_constant_p")
      DEF(TOK_builtin_frame_address, "__builtin_frame_address")
      DEF(TOK_builtin_return_address, "__builtin_return_address")
      DEF(TOK_builtin_expect, "__builtin_expect")
-#ifdef TCC_TARGET_X86_64
+     /*DEF(TOK_builtin_va_list, "__builtin_va_list")*/
-#ifdef TCC_TARGET_PE
+#if defined TCC_TARGET_PE && defined TCC_TARGET_X86_64
      DEF(TOK_builtin_va_start, "__builtin_va_start")
-#else
+#elif defined TCC_TARGET_X86_64
      DEF(TOK_builtin_va_arg_types, "__builtin_va_arg_types")
-#endif
+#elif defined TCC_TARGET_ARM64
-#endif
-     DEF(TOK_REGPARM1, "regparm")
-     DEF(TOK_REGPARM2, "__regparm__")
-#ifdef TCC_TARGET_ARM64
      DEF(TOK___va_start, "__va_start")
      DEF(TOK___va_arg, "__va_arg")
 #endif

tests/Makefile+4−0

 cross-test :
 	@echo ------------ $@ ------------
 	$(TOP)/i386-tcc$(EXESUF) $(TCCFLAGS-unx) -c $(TOPSRC)/examples/ex3.c && echo "ok"
+	$(TOP)/i386-win32-tcc$(EXESUF) $(TCCFLAGS-win) $(TOPSRC)/examples/ex3.c && echo "ok"
 	$(TOP)/x86_64-tcc$(EXESUF) $(TCCFLAGS-unx) -c $(TOPSRC)/examples/ex3.c && echo "ok"
+	$(TOP)/x86_64-win32-tcc$(EXESUF) $(TCCFLAGS-win) $(TOPSRC)/examples/ex3.c && echo "ok"
 	$(TOP)/arm-tcc$(EXESUF) $(TCCFLAGS-unx) -c $(TOPSRC)/examples/ex3.c && echo "ok"
+	$(TOP)/arm-wince-tcc$(EXESUF) $(TCCFLAGS-win) -c $(TOPSRC)/examples/ex3.c && echo "ok"
+	$(TOP)/arm64-tcc$(EXESUF) $(TCCFLAGS-unx) -c $(TOPSRC)/examples/ex3.c && echo "ok"
 	$(TOP)/c67-tcc$(EXESUF) $(TCCFLAGS-unx) -c $(TOPSRC)/examples/ex3.c && echo "ok"
 	$(TOP)/i386-win32-tcc$(EXESUF) $(TCCFLAGS-win) $(TOPSRC)/win32/examples/hello_win.c && echo "ok"
 	$(TOP)/x86_64-win32-tcc$(EXESUF) $(TCCFLAGS-win) $(TOPSRC)/win32/examples/hello_win.c && echo "ok"

tests/pp/13.expect+0−1

@@ -1,3 +1,2 @@
1	# `modelist' label. Each video mode record looks like:
2	.text	1	.text
3	endtext:	2	endtext:

tests/pp/15.c+2−2

@@ -12,7 +12,7 @@ return n(A)n(++)n(+)n(+)n(B); · 11 unmodified lines
12	return n(0x1E)n(-1);	12	return n(0x1E)n(-1);
13		13
14	// unlike gcc but correct	14	// unlike gcc but correct
15	XXX: return n(x)+n(x)-n(1)+n(1)-2;	15	// XXX: return n(x)+n(x)-n(1)+n(1)-2;
16		16
17	// unlike gcc, but cannot appear in valid C	17	// unlike gcc, but cannot appear in valid C
18	XXX: return n(x)n(x)n(1)n(2)n(x);	18	// XXX: return n(x)n(x)n(1)n(2)n(x);

tests/pp/15.expect+0−2

@@ -3,5 +3,3 @@ return A+++B; · 2 unmodified lines
3	return A+ ++B;	3	return A+ ++B;
4	return A+++ +B;	4	return A+++ +B;
5	return 0x1E -1;	5	return 0x1E -1;
6	XXX: return x+x-1 +1 -2;
7	XXX: return x x 1 2 x;

tests/pp/Makefile+2−2

@@ -12,7 +12,7 @@ TESTS = $(call files,c) $(call files,S) · 11 unmodified lines
12		12
13	all test : $(sort $(TESTS))	13	all test : $(sort $(TESTS))
14		14
15	DIFF_OPTS = -Nu -b -B -I "^\#"	15	DIFF_OPTS = -Nu -b -B
16		16
17	# Filter source directory in warnings/errors (out-of-tree builds)	17	# Filter source directory in warnings/errors (out-of-tree builds)
18	FILTER = 2>&1 \| sed 's,$(SRC)/,,g'	18	FILTER = 2>&1 \| sed 's,$(SRC)/,,g'
@@ -40,7 +40,7 @@ clean: · 21 unmodified lines
40	rm -f *.output	40	rm -f *.output
41		41
42	02.test : DIFF_OPTS += -w	42	02.test : DIFF_OPTS += -w
43	15.test : DIFF_OPTS += -I"^XXX:"	43	# 15.test : DIFF_OPTS += -I"^XXX:"
44		44
45	# diff options:	45	# diff options:
46	# -b ighore space changes	46	# -b ighore space changes

tests/tcctest.c+3−4

 }
 #endif
+static
 unsigned int set;
 void fancy_copy (unsigned *in, unsigned *out)
   asm volatile ("mov %0,(%1)" : : "r" (*in), "r" (out) : "memory");
 }
-#ifdef __x86_64__
+#if defined __x86_64__ && !defined _WIN64
 void clobber_r12(void)
 {
     asm volatile("mov $1, %%r12" ::: "r12");
 void test_high_clobbers(void)
 {
-#ifdef __x86_64__
+#if defined __x86_64__ && !defined _WIN64
     register long val asm("r12");
     long val2;
     /* This tests if asm clobbers correctly save/restore callee saved
        correctly capture the data flow, but good enough for us.  */
     asm volatile("mov $0x4542, %%r12" : "=r" (val):: "memory");
     clobber_r12();
-#ifndef _WIN64
     asm volatile("mov %%r12, %0" : "=r" (val2) : "r" (val): "memory");
     printf("asmhc: 0x%x\n", val2);
 #endif
-#endif
 }
 static long cpu_number;

tests/tests2/95_bitfields.c+1−1

@@ -70,7 +70,7 @@ · 69 unmodified lines
70	{	70	{
71	struct M P __s {	71	struct M P __s {
72	int a;	72	int a;
73	char b;	73	signed char b;
74	int x : 12, y : 4, : 0, : 4, z : 3;	74	int x : 12, y : 4, : 0, : 4, z : 3;
75	char d;	75	char d;
76	};	76	};

tests/tests2/96_nodata_wanted.c+1−1

@@ -78,7 +78,7 @@ te1:; · 77 unmodified lines
78	tl += &&te1 - &&ts1;	78	tl += &&te1 - &&ts1;
79	printf("size of data/text:\n %s/%s\n",	79	printf("size of data/text:\n %s/%s\n",
80	dl ? "non-zero":"zero", tl ? "non-zero":"zero");	80	dl ? "non-zero":"zero", tl ? "non-zero":"zero");
81	printf("# %d/%d\n", dl, tl);	81	/printf("# %d/%d\n", dl, tl);/
82	}	82	}
83		83
84	#endif	84	#endif

tests/tests2/96_nodata_wanted.expect+0−2

   333 44 555555 6 7
 size of data/text:
   non-zero/non-zero
-# 111/193
 [test_data_suppression_on]
 size of data/text:
   zero/zero
-# 0/0

tests/tests2/Makefile+1−1

@@ -70,7 +70,7 @@ all test tests2.all: $(filter-out $(SKIP),$(TESTS)) ; · 69 unmodified lines
70	T1 = $(TCC) $(FLAGS) $< -o a.exe && ./a.exe $(ARGS)	70	T1 = $(TCC) $(FLAGS) $< -o a.exe && ./a.exe $(ARGS)
71	T2 = $(TCC) $(FLAGS) -run $< $(ARGS)	71	T2 = $(TCC) $(FLAGS) -run $< $(ARGS)
72	T3 = $(FILTER) >$*.output 2>&1 \|\| true \	72	T3 = $(FILTER) >$*.output 2>&1 \|\| true \
73	&& diff -Nbu -I "^\#" $(filter %.expect,$^) $*.output \	73	&& diff -Nbu $(filter %.expect,$^) $*.output \
74	&& rm -f $.output $(filter $.expect,$(GEN-ALWAYS))	74	&& rm -f $.output $(filter $.expect,$(GEN-ALWAYS))
75		75
76	# run single test and update .expect file, e.g. "make tests2.37+"	76	# run single test and update .expect file, e.g. "make tests2.37+"

win32/Makefile+0−148

@@ -1,148 +0,0 @@
1	#
2	# This Makefile builds native Windows tcc for both 32 and 64 bits generator.
3	# It requires Cygwin 64 and gcc to bootstrap a first tcc version which is used
4	# by a second stage to compile tcc it self.
5	# Generated binaries do not require cygwin to run.
6	# You can launch 'tarball' target to build a tar.gz you can install on any
7	# Windows machines.
8
9	CPU = $(shell if `gcc -v 2>&1 \| grep Target \| grep -q x86_64`; then echo 64; else echo 32; fi)
10	VERSION = $(shell cat ../VERSION)
11	BOOTCC = gcc
12	CFLAGS = -s -static -fno-strict-aliasing -Wno-incompatible-pointer-types -DTCC_TARGET_PE
13	#WINPWD = `cygpath --mixed $(PWD)`
14	#@echo "#define CONFIG_TCCDIR \"$(WINPWD)\""
15
16	ifeq ($(CPU), 64)
17	NATIVE = -m$(CPU) -DTCC_TARGET_X86_64
18	ARCH = x86_64
19	else
20	NATIVE = -m$(CPU) -DTCC_TARGET_I386
21	ARCH = i386
22	endif
23
24	TARGET = $(CPU)
25
26	ifeq ($(TARGET), 64)
27	TFLAGS = -m$(TARGET) -DTCC_TARGET_X86_64
28	TARCH = x86_64
29	else
30	TFLAGS = -m$(TARGET) -DTCC_TARGET_I386
31	TARCH = i386
32	endif
33
34	all: pre bootstrap libs rebuild
35	@chmod 775 *.exe
36	@ls -ls *.exe
37
38	pre:
39	@echo ARCH=$(TARCH) 1> ../config.mak
40	@echo TARGETOS=Windows 1>> ../config.mak
41	@echo CONFIG_WIN32=yes 1>> ../config.mak
42	@echo TOPSRC=$$$TOP$ 1>> ../config.mak
43	@echo "#define TCC_VERSION \"$(VERSION)\"" 1>../config.h
44	@echo "#ifdef TCC_TARGET_X86_64" 1>>../config.h
45	@echo "#define TCC_LIBTCC1 \"libtcc1-64.a\"" 1>>../config.h
46	@echo "#else" 1>>../config.h
47	@echo "#define TCC_LIBTCC1 \"libtcc1-32.a\"" 1>>../config.h
48	@echo "#endif" 1>>../config.h
49	@echo @set VERSION $(VERSION) 1>../config.texi
50	@rm -f tcc.exe tiny_.exe tcc.dll lib/.a
51	@rm -r -f libtcc doc
52	@mkdir libtcc
53	@mkdir doc
54	@cp ../include/*.h include
55	@cp ../tcclib.h include
56	@cp ../libtcc.h include
57	@cp tcc-win32.txt doc
58	@cp ../tests/libtcc_test.c examples
59
60	PHONY += pre
61
62	bootstrap:
63	@echo Bootstrapping 32bits and 64bits tools with $(BOOTCC) -m$(CPU)
64	@$(BOOTCC) $(CFLAGS) -DTCC_TARGET_I386 -o i386-win32-tcc.exe ../tcc.c
65	@$(BOOTCC) $(CFLAGS) -DTCC_TARGET_X86_64 -o x86_64-win32-tcc.exe ../tcc.c
66	@$(BOOTCC) $(CFLAGS) $(NATIVE) -o tcc.exe ../tcc.c
67	@$(BOOTCC) $(CFLAGS) $(NATIVE) -DLIBTCC_AS_DLL -o libtcc.dll -shared ../libtcc.c
68
69	PHONY += bootstrap
70
71	lib/libtcc1-32.a:
72	@echo Building $*.a with tcc -m32
73	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c ../lib/libtcc1.c
74	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c ../lib/alloca86.S
75	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c ../lib/alloca86-bt.S
76	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/crt1.c
77	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/crt1w.c
78	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/wincrt1.c
79	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/wincrt1w.c
80	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/dllcrt1.c
81	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/dllmain.c
82	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -c lib/chkstk.S
83	@./tcc -m32 -ar lib/libtcc1-32.a libtcc1.o alloca86.o alloca86-bt.o crt1.o wincrt1.o crt1w.o wincrt1w.o dllcrt1.o dllmain.o chkstk.o
84	@rm *.o
85
86	lib/libtcc1-64.a:
87	@echo Building $*.a with tcc -m64
88	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c ../lib/libtcc1.c
89	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c ../lib/alloca86_64.S
90	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c ../lib/alloca86_64-bt.S
91	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/crt1.c
92	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/crt1w.c
93	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/wincrt1.c
94	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/wincrt1w.c
95	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/dllcrt1.c
96	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/dllmain.c
97	@./tcc -O2 -B. -m64 -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -c lib/chkstk.S
98	@./tcc -m64 -ar lib/libtcc1-64.a libtcc1.o alloca86_64.o alloca86_64-bt.o crt1.o wincrt1.o crt1w.o wincrt1w.o dllcrt1.o dllmain.o chkstk.o
99	@rm *.o
100
101	libs: lib/libtcc1-32.a lib/libtcc1-64.a
102
103	PHONY += libs
104
105	rebuild:
106	@echo Rebuild using tcc itself - default $(TARGET)bits
107	@./$(TARCH)-win32-tcc -O2 -B. $(TFLAGS) -DTCC_TARGET_PE -o tcc.exe ../tcc.c
108	@./tcc -O2 -B. $(TFLAGS) -DTCC_TARGET_PE -DLIBTCC_AS_DLL -o libtcc.dll -shared ../libtcc.c
109	@./tcc -O2 -B. -m32 -DTCC_TARGET_PE -DTCC_TARGET_I386 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe i386-win32-tcc.exe
110	@./tcc -O2 -B. -m$(TARGET) -DTCC_TARGET_PE -DTCC_TARGET_X86_64 -o tmp-tcc.exe ../tcc.c && mv tmp-tcc.exe x86_64-win32-tcc.exe
111
112	PHONY += rebuild
113
114	test:
115	@(cd ../tests; $(MAKE) -k TCC=$(PWD)/tcc hello-exe hello-run)
116	@(cd ../tests; $(MAKE) -k TCC=$(PWD)/tcc vla_test-run tests2-dir pp-dir)
117	ifeq ($(CPU), 64)
118	@(cd ../tests; $(MAKE) -k TCC=$(PWD)/i386-win32-tcc hello-exe hello-run)
119	@(cd ../tests; $(MAKE) -k TCC=$(PWD)/i386-win32-tcc vla_test-run tests2-dir pp-dir)
120	endif
121
122	PHONY += test
123
124	TARNAME = tcc-$(VERSION)-$(ARCH)-win32
125
126	tarball:
127	@rm -r -f $(TARNAME)
128	@mkdir $(TARNAME)
129	@cp -r doc $(TARNAME)
130	@cp -r examples $(TARNAME)
131	@cp -r include $(TARNAME)
132	@cp -r lib $(TARNAME)
133	@cp -r libtcc $(TARNAME)
134	@cp -r build-tcc.bat $(TARNAME)
135	@cp -r i386-win32-tcc.exe $(TARNAME)
136	@cp -r libtcc.def $(TARNAME)
137	@cp -r libtcc.dll $(TARNAME)
138	@cp -r Makefile $(TARNAME)
139	@cp -r tcc.exe $(TARNAME)
140	@cp -r tcc-win32.txt $(TARNAME)
141	@cp -r x86_64-win32-tcc.exe $(TARNAME)
142	@tar czf $(TARNAME).tar.gz $(TARNAME)
143	@rm -r -f $(TARNAME)
144
145	PHONY += tarball
146
147	clean:
148	rm -f .o .exe .dll lib/.a .pdb .obj .exp .def *.lib

win32/build-tcc.bat+59−48

@@ -4,13 +4,31 @@ · 3 unmodified lines
4		4
5	@echo off	5	@echo off
6	setlocal	6	setlocal
7		7	if (%1)==(-clean) goto :cleanup
8	set CC=gcc -Os -s -static	8	set CC=gcc
9	set /p VERSION= < ..\VERSION	9	set /p VERSION= < ..\VERSION
10	set INST=	10	set INST=
		11	set BIN=
11	set DOC=no	12	set DOC=no
		13	set EXES_ONLY=no
12	goto :a0	14	goto :a0
13		15	:a2
		16	shift
		17	:a3
		18	shift
		19	:a0
		20	if not (%1)==(-c) goto :a1
		21	set CC=%~2
		22	if (%2)==(cl) set CC=@call :cl
		23	goto :a2
		24	:a1
		25	if (%1)==(-t) set T=%2&& goto :a2
		26	if (%1)==(-v) set VERSION=%~2&& goto :a2
		27	if (%1)==(-i) set INST=%2&& goto :a2
		28	if (%1)==(-b) set BIN=%2&& goto :a2
		29	if (%1)==(-d) set DOC=yes&& goto :a3
		30	if (%1)==(-x) set EXES_ONLY=yes&& goto :a3
		31	if (%1)==() goto :p1
14	:usage	32	:usage
15	echo usage: build-tcc.bat [ options ... ]	33	echo usage: build-tcc.bat [ options ... ]
16	echo options:	34	echo options:
@@ -18,10 +36,35 @@ echo -c prog use prog (gcc/tcc/cl) to compile tcc · 1 unmodified line
18	echo -c "prog options" use prog with options to compile tcc	36	echo -c "prog options" use prog with options to compile tcc
19	echo -t 32/64 force 32/64 bit default target	37	echo -t 32/64 force 32/64 bit default target
20	echo -v "version" set tcc version	38	echo -v "version" set tcc version
21	echo -i dir install tcc into dir	39	echo -i tccdir install tcc into tccdir
		40	echo -b bindir optionally install binaries into bindir elsewhere
22	echo -d create tcc-doc.html too (needs makeinfo)	41	echo -d create tcc-doc.html too (needs makeinfo)
		42	echo -x just create the executables
		43	echo -clean delete all previously produced files and directories
23	exit /B 1	44	exit /B 1
24		45
		46	@rem ------------------------------------------------------
		47	@rem sub-routines
		48
		49	:cleanup
		50	set LOG=echo
		51	%LOG% removing files:
		52	for %%f in (tcc.exe libtcc.dll lib\.a) do call :del_file %%f
		53	for %%f in (..\config.h ..\config.texi) do call :del_file %%f
		54	for %%f in (include\*.h) do @if exist ..\%%f call :del_file %%f
		55	for %%f in (include\tcclib.h examples\libtcc_test.c) do call :del_file %%f
		56	for %%f in (.o .obj .def .pdb .lib .exp *.ilk) do call :del_file %%f
		57	%LOG% removing directories:
		58	for %%f in (doc libtcc) do call :del_dir %%f
		59	%LOG% done.
		60	exit /B 0
		61	:del_file
		62	if exist %1 del %1 && %LOG% %1
		63	exit /B 0
		64	:del_dir
		65	if exist %1 rmdir /Q/S %1 && %LOG% %1
		66	exit /B 0
		67
25	:cl	68	:cl
26	@echo off	69	@echo off
27	set CMD=cl	70	set CMD=cl
@@ -37,52 +80,16 @@ echo on · 9 unmodified lines
37	%CMD% -O1 -W2 -Zi -MT -GS- -nologo -link -opt:ref,icf	80	%CMD% -O1 -W2 -Zi -MT -GS- -nologo -link -opt:ref,icf
38	@exit /B %ERRORLEVEL%	81	@exit /B %ERRORLEVEL%
39		82
40	:a2	83	@rem ------------------------------------------------------
41	shift	84	@rem main program
42	:a1
43	shift
44	:a0
45	if not (%1)==(-c) goto :a3
46	set CC=%~2
47	if (%2)==(cl) set CC=@call :cl
48	goto :a2
49	:a3
50	if not (%1)==(-t) goto :a4
51	set T=%2
52	goto :a2
53	:a4
54	if not (%1)==(-v) goto :a5
55	set VERSION=%~2
56	goto :a2
57	:a5
58	if not (%1)==(-i) goto :a6
59	set INST=%2
60	goto :a2
61	:a6
62	if not (%1)==(-d) goto :a7
63	set DOC=yes
64	goto :a1
65	:a7
66	if not (%1)==() goto :usage
67
68	if not "%CC%"=="@call :cl" goto :p1
69	set VSCOMNTOOLS=%VS150COMNTOOLS%
70	if "%VSCOMNTOOLS%"=="" set VSCOMNTOOLS=%VS140COMNTOOLS%
71	if "%VSCOMNTOOLS%"=="" set VSCOMNTOOLS=%VS130COMNTOOLS%
72	if "%VSCOMNTOOLS%"=="" set VSCOMNTOOLS=%VS120COMNTOOLS%
73	if %T%_==32_ set CLVARS="%VSCOMNTOOLS%..\..\VC\bin\vcvars32.bat"
74	if %T%_==64_ set CLVARS="%VSCOMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
75	if %T%_==_ set T=32& if %Platform%_==X64_ set T=64
76	if %CLVARS%_==_ goto :p1
77	if exist %CLVARS% call %CLVARS%
78	:p1
79		85
		86	:p1
80	if not %T%_==_ goto :p2	87	if not %T%_==_ goto :p2
81	set T=32	88	set T=32
82	if %PROCESSOR_ARCHITECTURE%_==AMD64_ set T=64	89	if %PROCESSOR_ARCHITECTURE%_==AMD64_ set T=64
83	if %PROCESSOR_ARCHITEW6432%_==AMD64_ set T=64	90	if %PROCESSOR_ARCHITEW6432%_==AMD64_ set T=64
84	:p2	91	:p2
85		92	if "%CC:~-3%"=="gcc" set CC=%CC% -Os -s -static
86	set D32=-DTCC_TARGET_PE -DTCC_TARGET_I386	93	set D32=-DTCC_TARGET_PE -DTCC_TARGET_I386
87	set D64=-DTCC_TARGET_PE -DTCC_TARGET_X86_64	94	set D64=-DTCC_TARGET_PE -DTCC_TARGET_X86_64
88	set P32=i386-win32	95	set P32=i386-win32
@@ -91,13 +98,14 @@ if %T%==64 goto :t64 · 2 unmodified lines
91	set D=%D32%	98	set D=%D32%
92	set DX=%D64%	99	set DX=%D64%
93	set PX=%P64%	100	set PX=%P64%
94	goto :t96	101	goto :p3
95	:t64	102	:t64
96	set D=%D64%	103	set D=%D64%
97	set DX=%D32%	104	set DX=%D32%
98	set PX=%P32%	105	set PX=%P32%
99	:t96	106	goto :p3
100		107
		108	:p3
101	@echo on	109	@echo on
102		110
103	:config.h	111	:config.h
@@ -116,7 +124,7 @@ for %%f in (tcc.exe tcc.dll) do @del %%f · 12 unmodified lines
116	%CC% -o tcc.exe ..\tcc.c libtcc.dll %D% -DONE_SOURCE"=0"	124	%CC% -o tcc.exe ..\tcc.c libtcc.dll %D% -DONE_SOURCE"=0"
117	%CC% -o %PX%-tcc.exe ..\tcc.c %DX%	125	%CC% -o %PX%-tcc.exe ..\tcc.c %DX%
118		126
119	@if (%TCC_FILES%)==(no) goto :files-done	127	@if (%EXES_ONLY%)==(yes) goto :files-done
120		128
121	if not exist libtcc mkdir libtcc	129	if not exist libtcc mkdir libtcc
122	if not exist doc mkdir doc	130	if not exist doc mkdir doc
@@ -170,8 +178,11 @@ for %%f in (.o .def) do @del %%f · 47 unmodified lines
170	:copy-install	178	:copy-install
171	@if (%INST%)==() goto :the_end	179	@if (%INST%)==() goto :the_end
172	if not exist %INST% mkdir %INST%	180	if not exist %INST% mkdir %INST%
		181	@if (%BIN%)==() set BIN=%INST%
		182	if not exist %BIN% mkdir %BIN%
		183	for %%f in (tcc.exe tcc.dll) do @copy>nul %%f %BIN%\%%f
173	@if not exist %INST%\lib mkdir %INST%\lib	184	@if not exist %INST%\lib mkdir %INST%\lib
174	for %%f in (tcc.exe tcc.dll lib\.a lib\.def) do @copy>nul %%f %INST%\%%f	185	for %%f in (lib\.a lib\.def) do @copy>nul %%f %INST%\%%f
175	for %%f in (include examples libtcc doc) do @xcopy>nul /s/i/q/y %%f %INST%\%%f	186	for %%f in (include examples libtcc doc) do @xcopy>nul /s/i/q/y %%f %INST%\%%f
176		187
177	:the_end	188	:the_end

win32/lib/crt1.c+6−15

@@ -16,11 +16,6 @@ · 15 unmodified lines
16	#define _PC_53 0x00010000 // 53 bits	16	#define _PC_53 0x00010000 // 53 bits
17	#define _PC_64 0x00000000 // 64 bits	17	#define _PC_64 0x00000000 // 64 bits
18		18
19	typedef struct
20	{
21	int newmode;
22	} _startupinfo;
23
24	#ifdef _UNICODE	19	#ifdef _UNICODE
25	#define __tgetmainargs __wgetmainargs	20	#define __tgetmainargs __wgetmainargs
26	#define _tstart _wstart	21	#define _tstart _wstart
@@ -33,6 +28,7 @@ typedef struct · 6 unmodified lines
33	#define _runtmain _runmain	28	#define _runtmain _runmain
34	#endif	29	#endif
35		30
		31	typedef struct { int newmode; } _startupinfo;
36	int __cdecl __tgetmainargs(int pargc, _TCHAR pargv, _TCHAR penv, int globb, _startupinfo);	32	int __cdecl __tgetmainargs(int pargc, _TCHAR pargv, _TCHAR penv, int globb, _startupinfo);
37	void __cdecl __set_app_type(int apptype);	33	void __cdecl __set_app_type(int apptype);
38	unsigned int __cdecl _controlfp(unsigned int new_value, unsigned int mask);	34	unsigned int __cdecl _controlfp(unsigned int new_value, unsigned int mask);
@@ -44,23 +40,19 @@ int _dowildcard; · 5 unmodified lines
44	void _tstart(void)	40	void _tstart(void)
45	{	41	{
46	__TRY__	42	__TRY__
47	int ret;	43	_startupinfo start_info = {0};
48	_startupinfo start_info;
49		44
50	// Sets the current application type	45	// Sets the current application type
51	__set_app_type(_CONSOLE_APP);	46	__set_app_type(_CONSOLE_APP);
52		47
53	// Set default FP precision to 53 bits (8-byte double)	48	// Set default FP precision to 53 bits (8-byte double)
54	// _MCW_PC (Precision control) is not supported on	49	// _MCW_PC (Precision control) is not supported on ARM
55	// the ARM and x64 architectures	50	#if defined __i386__ \|\| defined __x86_64__
56	#ifdef __i386
57	_controlfp(_PC_53, _MCW_PC);	51	_controlfp(_PC_53, _MCW_PC);
58	#endif	52	#endif
59		53
60	start_info.newmode = 0;
61	__tgetmainargs( &__argc, &__targv, &_tenviron, _dowildcard, &start_info);	54	__tgetmainargs( &__argc, &__targv, &_tenviron, _dowildcard, &start_info);
62	ret = _tmain(__argc, __targv, _tenviron);	55	exit(_tmain(__argc, __targv, _tenviron));
63	exit(ret);
64	}	56	}
65		57
66	int _runtmain(int argc, /* as tcc passed in / char *argv)	58	int _runtmain(int argc, /* as tcc passed in / char *argv)
@@ -78,8 +70,7 @@ int _runtmain(int argc, /* as tcc passed in / char *argv) · 11 unmodified lines
78	__argc = argc;	70	__argc = argc;
79	__targv = argv;	71	__targv = argv;
80	#endif	72	#endif
81		73	#if defined __i386__ \|\| defined __x86_64__
82	#ifdef __i386
83	_controlfp(_PC_53, _MCW_PC);	74	_controlfp(_PC_53, _MCW_PC);
84	#endif	75	#endif
85	return _tmain(__argc, __targv, _tenviron);	76	return _tmain(__argc, __targv, _tenviron);

win32/lib/wincrt1.c+29−47

@@ -23,71 +23,53 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); · 22 unmodified lines
23	#define _runtwinmain _runwinmain	23	#define _runtwinmain _runwinmain
24	#endif	24	#endif
25		25
26	typedef struct	26	typedef struct { int newmode; } _startupinfo;
27	{
28	int newmode;
29	} _startupinfo; // CLI Vs GUI
30
31	int __cdecl __tgetmainargs(int pargc, _TCHAR pargv, _TCHAR penv, int globb, _startupinfo);	27	int __cdecl __tgetmainargs(int pargc, _TCHAR pargv, _TCHAR penv, int globb, _startupinfo);
32		28
33	int _twinstart(void)	29	static int go_winmain(TCHAR *arg1)
34	{	30	{
35	__TRY__	31	STARTUPINFO si;
36	_TCHAR szCmd, p;	32	_TCHAR szCmd, p;
37	STARTUPINFO startinfo;
38	_startupinfo start_info_con = {0};
39	int fShow;	33	int fShow;
40	int ret;
41
42	__set_app_type(__GUI_APP);
43	_controlfp(0x10000, 0x30000);
44		34
45	start_info_con.newmode = 0;	35	GetStartupInfo(&si);
46	__tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info_con);	36	if (si.dwFlags & STARTF_USESHOWWINDOW)
		37	fShow = si.wShowWindow;
		38	else
		39	fShow = SW_SHOWDEFAULT;
47		40
48	p = GetCommandLine();	41	szCmd = NULL, p = GetCommandLine();
49	if (__argc > 1)	42	if (arg1)
50	szCmd = _tcsstr(p, __targv[1]);	43	szCmd = _tcsstr(p, arg1);
51	if (NULL == szCmd)	44	if (NULL == szCmd)
52	szCmd = __T("");	45	szCmd = _tcsdup(__T(""));
53	else if (szCmd > p && szCmd[-1] == __T('\"'))	46	else if (szCmd > p && szCmd[-1] == __T('"'))
54	--szCmd;	47	--szCmd;
		48	#if defined __i386__ \|\| defined __x86_64__
		49	_controlfp(0x10000, 0x30000);
		50	#endif
		51	return _tWinMain(GetModuleHandle(NULL), NULL, szCmd, fShow);
		52	}
55		53
56	GetStartupInfo(&startinfo);	54	int _twinstart(void)
57	fShow = startinfo.wShowWindow;	55	{
58	if (0 == (startinfo.dwFlags & STARTF_USESHOWWINDOW))	56	__TRY__
59	fShow = SW_SHOWDEFAULT;	57	_startupinfo start_info_con = {0};
60		58	__set_app_type(__GUI_APP);
61	ret = _tWinMain(GetModuleHandle(NULL), NULL, szCmd, fShow);	59	__tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info_con);
62	exit(ret);	60	exit(go_winmain(__argc > 1 ? __targv[1] : NULL));
63	}	61	}
64		62
65	int _runtwinmain(int argc, /* as tcc passed in / char *argv)	63	int _runtwinmain(int argc, /* as tcc passed in / char *argv)
66	{	64	{
67	_TCHAR szCmd, p;
68
69	#ifdef UNICODE	65	#ifdef UNICODE
70	_startupinfo start_info = {0};	66	_startupinfo start_info = {0};
71
72	__tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info);	67	__tgetmainargs(&__argc, &__targv, &_tenviron, 0, &start_info);
73	/* may be wrong when tcc has received wildcards (.c) /	68	/* may be wrong when tcc has received wildcards (.c) /
74	if (argc < __argc) {	69	if (argc < __argc)
75	__targv += __argc - argc;	70	__targv += __argc - argc, __argc = argc;
76	__argc = argc;
77	}
78	#else	71	#else
79	__argc = argc;	72	__argc = argc, __targv = argv;
80	__targv = argv;
81	#endif	73	#endif
82		74	return go_winmain(__argc > 1 ? __targv[1] : NULL);
83	p = GetCommandLine();
84	szCmd = NULL;
85	if (argc > 1)
86	szCmd = _tcsstr(p, __targv[1]);
87	if (NULL == szCmd)
88	szCmd = __T("");
89	else if (szCmd > p && szCmd[-1] == __T('\"'))
90	--szCmd;
91	_controlfp(0x10000, 0x30000);
92	return _tWinMain(GetModuleHandle(NULL), NULL, szCmd, SW_SHOWDEFAULT);
93	}	75	}

win32/tcc-win32.txt+7−12

     ------------------------
     * You can use the MinGW and MSYS tools available at
         http://www.mingw.org
+        http://www.mingw-w64.org
+        http://www.msys2.org
       Untar the TCC archive and type in the MSYS shell:
         ./configure [--prefix installpath]
       The default install location is c:\Program Files\tcc
+      Cygwin can be used too with its mingw cross-compiler installed:
+        ./configure --cross-prefix=i686-w64-mingw32-
+        (the prefix may vary)
     * Alternatively you can compile TCC with just GCC from MinGW using
         > build-tcc.bat (from the win32 directory)
       Also MSVC can be used with the "VSTools Developer Command Prompt":
         > build-tcc.bat -c cl
-      or with a tcc (needs to be in a different directory)
+      or with an existing tcc (needs to be in a different directory)
         > build-tcc.bat -c some-tcc-dir\tcc.exe
       Also you can copy/install everything into another directory:
         > build-tcc.bat -i <dir>
-    * You can also bootstrap a native tcc Windows toolchain with cygwin.
-       https://www.cygwin.com/
-      Install Base, gcc, make
-      Launch Cygwin Terminal
-        > make
-      or to force 32bit executables (including 64bit backend)
-        > make TARGET=32
-      or to force 64bit executables (including 32bit backend)
-        > make TARGET=64
     Limitations:
     ------------
     - On the object file level, currently TCC supports only the ELF format,

various stuff

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code