Mercurial > hg > tinycc

changeset 464:c95688b105f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fabrice clarified that -r means "output a .o file", so revert conditional and update help text.
author Rob Landley <rob@landley.net>
date Fri, 31 Aug 2007 13:41:59 -0500
parents 3903f30f1241
children 826695d99686
files tcc.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tcc.c	Thu Aug 30 19:04:52 2007 -0500
+++ b/tcc.c	Fri Aug 31 13:41:59 2007 -0500
@@ -9374,7 +9374,7 @@
            "  -shared     generate a shared library\n"
            "  -static     static linking\n"
            "  -rdynamic   export all global symbols to dynamic linker\n"
-           "  -r          relocatable output\n"
+           "  -r          output relocatable .o file\n"
            "Debugger options:\n"
            "  -g          generate runtime debug info\n"
 #ifdef CONFIG_TCC_BCHECK
@@ -9625,7 +9625,7 @@
             case TCC_OPTION_r:
                 /* generate a .o merging several output files */
                 reloc_output = 1;
-                if (!output_type) output_type = TCC_OUTPUT_OBJ;
+                output_type = TCC_OUTPUT_OBJ;
                 break;
             case TCC_OPTION_nostdinc:
                 s->nostdinc = 1;