From e63011377173062d688a08e8a98abbdada453302 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Sat, 1 Oct 2016 20:04:33 +0200
Subject: [PATCH] Revert "ability to compile multiple *.c files with -c switch"

copy & paste coding, twisted control flow
This reverts commit a13f183e4c2c4b4d1d40e142b57a4298672dfd2c.

Also, set linker args for DLLs also.
---
 libtcc.c | 21 +++++----------------
 tcc.c    | 51 +++++++++++++++++++--------------------------------
 2 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/libtcc.c b/libtcc.c
index dbbc01fe..54672988 100644
--- a/libtcc.c
+++ b/libtcc.c
@@ -1061,7 +1061,7 @@ LIBTCCAPI TCCState *tcc_new(void)
 #else
     tcc_set_lib_path(s, CONFIG_TCCDIR);
 #endif
-    s->output_type = 0;
+
     preprocess_new();
     s->include_stack_ptr = s->include_stack;
 
@@ -1229,10 +1229,6 @@ LIBTCCAPI void tcc_delete(TCCState *s1)
 
     tcc_cleanup();
 
-    /* close a preprocessor output */
-    if (s1->ppfp && s1->ppfp != stdout)
-        fclose(s1->ppfp);
-
     /* free all sections */
     for(i = 1; i < s1->nb_sections; i++)
         free_section(s1->sections[i]);
@@ -1609,16 +1605,6 @@ LIBTCCAPI int tcc_set_output_type(TCCState *s, int output_type)
 {
     s->output_type = output_type;
 
-    if (s->output_type == TCC_OUTPUT_PREPROCESS) {
-        if (!s->outfile) {
-            s->ppfp = stdout;
-        } else {
-            s->ppfp = fopen(s->outfile, "w");
-            if (!s->ppfp)
-                tcc_error("could not write '%s'", s->outfile);
-        }
-    }
-
     if (!s->nostdinc) {
         /* default include paths */
         /* -isystem paths have already been handled */
@@ -2289,6 +2275,9 @@ ST_FUNC int tcc_parse_args1(TCCState *s, int argc, char **argv)
             s->print_search_dirs = 1;
             break;
         case TCC_OPTION_run:
+#ifndef TCC_IS_NATIVE
+            tcc_error("-run is not available in a cross compiler");
+#endif
     	    if (s->output_type)
                 tcc_warning("-run: some compiler action already specified (%d)", s->output_type);
             s->output_type = TCC_OUTPUT_MEMORY;
@@ -2397,7 +2386,7 @@ PUB_FUNC int tcc_parse_args(TCCState *s, int argc, char **argv)
       s->nb_libraries++;
     }
 
-    if (s->output_type == TCC_OUTPUT_EXE)
+    if (s->output_type == TCC_OUTPUT_EXE || s->output_type == TCC_OUTPUT_DLL)
         tcc_set_linker(s, (const char *)pas->linker_arg.data);
 
     if (is_allocated) {
diff --git a/tcc.c b/tcc.c
index b340d9bd..cf08614e 100644
--- a/tcc.c
+++ b/tcc.c
@@ -223,9 +223,7 @@ static char *default_outputfile(TCCState *s, const char *first_file)
         strcpy(ext, ".exe");
     else
 #endif
-    if (( (s->output_type == TCC_OUTPUT_OBJ && !s->option_r) ||
-          (s->output_type == TCC_OUTPUT_PREPROCESS) )
-        && *ext)
+    if (s->output_type == TCC_OUTPUT_OBJ && !s->option_r && *ext)
         strcpy(ext, ".o");
     else
         strcpy(buf, "a.out");
@@ -252,6 +250,7 @@ int main(int argc, char **argv)
     TCCState *s;
     int ret, optind, i;
     int64_t start_time = 0;
+    const char *first_file = NULL;
 
     s = tcc_new();
 
@@ -290,13 +289,22 @@ int main(int argc, char **argv)
         if (s->nb_libraries != 0)
             tcc_error("cannot specify libraries with -c");
         /* accepts only a single input file */
-        if ((s->nb_files != 1) && s->outfile) {
-            tcc_error("cannot specify multiple files with -c and -o");
-        }
+        if (s->nb_files != 1)
+            tcc_error("cannot specify multiple files with -c");
     }
 
     tcc_set_output_type(s, s->output_type);
 
+    if (s->output_type == TCC_OUTPUT_PREPROCESS) {
+	if (!s->outfile) {
+	    s->ppfp = stdout;
+	} else {
+	    s->ppfp = fopen(s->outfile, "w");
+	    if (!s->ppfp)
+		tcc_error("could not write '%s'", s->outfile);
+	}
+    }
+
     /* compile or add each files or library */
     for(i = ret = 0; i < s->nb_files && ret == 0; i++) {
         int filetype = *(unsigned char *)s->files[i];
@@ -312,27 +320,10 @@ int main(int argc, char **argv)
         } else {
             if (1 == s->verbose)
                 printf("-> %s\n", filename);
-            if (!s->outfile)
-                s->outfile = default_outputfile(s, filename);
             if (tcc_add_file(s, filename, filetype) < 0)
                 ret = 1;
-            else
-            if (s->output_type == TCC_OUTPUT_OBJ) {
-                ret = !!tcc_output_file(s, s->outfile);
-                if (s->gen_deps && !ret)
-                    gen_makedeps(s, s->outfile, s->deps_outfile);
-                if (!ret) {
-                    if ((i+1) < s->nb_files) {
-                        tcc_delete(s);
-                        s = tcc_new();
-                        tcc_parse_args(s, argc - 1, argv + 1);
-                        tcc_set_environment(s);
-                        if (s->output_type != TCC_OUTPUT_OBJ)
-                            tcc_error("internal error");
-                        tcc_set_output_type(s, s->output_type);
-                    }
-                }
-            }
+            if (!first_file)
+                first_file = filename;
         }
     }
 
@@ -340,14 +331,10 @@ int main(int argc, char **argv)
         if (s->output_type == TCC_OUTPUT_MEMORY) {
 #ifdef TCC_IS_NATIVE
             ret = tcc_run(s, argc - 1 - optind, argv + 1 + optind);
-#else
-            tcc_error_noabort("-run is not available in a cross compiler");
-            ret = 1;
 #endif
-        } else
-        if (s->output_type == TCC_OUTPUT_EXE ||
-            s->output_type == TCC_OUTPUT_DLL)
-        {
+        } else {
+            if (!s->outfile)
+                s->outfile = default_outputfile(s, first_file);
             ret = !!tcc_output_file(s, s->outfile);
             if (s->gen_deps && !ret)
                 gen_makedeps(s, s->outfile, s->deps_outfile);
-- 
2.11.4.GIT