From 576aeb3aa933af4114cc2ca4e64794e85f528f0e Mon Sep 17 00:00:00 2001 From: seyko Date: Sun, 3 May 2015 14:17:18 +0300 Subject: [PATCH] fix "tcc test.c -Wl,,--oformat,binary" set linker options only when "s->output_type == TCC_OUTPUT_EXE" otherwise tcc will produce a wrong object file --- libtcc.c | 6 +++++- tcc.c | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libtcc.c b/libtcc.c index a14cd5f6..f0dbe75c 100644 --- a/libtcc.c +++ b/libtcc.c @@ -2057,10 +2057,14 @@ PUB_FUNC int tcc_parse_args(TCCState *s, int argc, char **argv) } } + if (s->output_type == 0) + s->output_type = TCC_OUTPUT_EXE; + if (pthread && s->output_type != TCC_OUTPUT_OBJ) tcc_set_options(s, "-lpthread"); - tcc_set_linker(s, (const char *)linker_arg.data); + if (s->output_type == TCC_OUTPUT_EXE) + tcc_set_linker(s, (const char *)linker_arg.data); cstr_free(&linker_arg); return optind; diff --git a/tcc.c b/tcc.c index aacbd42d..a0b1c700 100644 --- a/tcc.c +++ b/tcc.c @@ -264,9 +264,6 @@ int main(int argc, char **argv) return 1; } - if (s->output_type == 0) - s->output_type = TCC_OUTPUT_EXE; - if (s->option_m) exec_other_tcc(s, argv, s->option_m); -- 2.11.4.GIT