From 2d3b9559bf569f137cefb7f8386a0dc58e33c81f Mon Sep 17 00:00:00 2001 From: grischka Date: Sat, 18 Feb 2017 09:55:34 +0100 Subject: tcctools.c: integrate tiny_libmaker/_impdef usage: tcc -ar [rcsv] lib files... tcc -impdef lib.dll [-v] [-o lib.def] also: - support more files with -c: tcc -c f1.c f2.c ... - fix a bug which caused tcc f1.c f2.S to produce no asm - allow tcc -ar @listfile too - change prototype: _void_ tcc_set_options(...) - apply -Wl,-whole-archive when a librariy is given as libxxx.a also (not just for -lxxx) --- conftest.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'conftest.c') diff --git a/conftest.c b/conftest.c index fa07a1b..2824cc8 100644 --- a/conftest.c +++ b/conftest.c @@ -1,9 +1,9 @@ #include /* Define architecture */ -#if defined(__i386__) +#if defined(__i386__) || defined _M_IX86 # define TRIPLET_ARCH "i386" -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined _M_AMD64 # define TRIPLET_ARCH "x86_64" #elif defined(__arm__) # define TRIPLET_ARCH "arm" @@ -18,6 +18,8 @@ # define TRIPLET_OS "linux" #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) # define TRIPLET_OS "kfreebsd" +#elif defined _WIN32 +# define TRIPLET_OS "win32" #elif !defined (__GNU__) # define TRIPLET_OS "unknown" #endif @@ -33,7 +35,9 @@ # define TRIPLET_ABI "gnu" #endif -#ifdef __GNU__ +#if defined _WIN32 +# define TRIPLET TRIPLET_ARCH "-" TRIPLET_OS +#elif defined __GNU__ # define TRIPLET TRIPLET_ARCH "-" TRIPLET_ABI #else # define TRIPLET TRIPLET_ARCH "-" TRIPLET_OS "-" TRIPLET_ABI @@ -59,6 +63,13 @@ int main(int argc, char *argv[]) case 'v': printf("%d\n", __GNUC__); break; +#elif defined __TINYC__ + case 'v': + puts("0"); + break; + case 'm': + printf("%d\n", __TINYC__); + break; #else case 'm': case 'v': @@ -68,9 +79,8 @@ int main(int argc, char *argv[]) case 't': puts(TRIPLET); break; - case -1: - /* to test -Wno-unused-result */ - fread(NULL, 1, 1, NULL); + + default: break; } return 0; -- cgit v1.3.1