X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=8c58faf443805b6dde216e9b15e18a2ed4cbd9fe;hb=7a742aa53d932c986e05ab285410366d414e23a4;hp=b3974b9fbb5eed3df5b2a65fb27a745aaa39945b;hpb=e887abc2dee046809fae669ca63683e30b314328;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index b3974b9f..8c58faf4 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -227,9 +227,6 @@ optionsTable[] = { { 0, OPTION_USE_STDOUT, &options.use_stdout, "send errors to stdout instead of stderr"}, #if !OPT_DISABLE_Z80 || !OPT_DISABLE_GBZ80 { 0, "--no-std-crt0", &options.no_std_crt0, "For the z80/gbz80 do not link default crt0.o"}, -#endif -#if !OPT_DISABLE_PIC16 - { 0, "--gen-banksel", &options.gen_banksel, "enable the generation of banksel assembler directives in PIC16 port"}, #endif /* End of options */ { 0, NULL } @@ -289,12 +286,12 @@ static PORT *_ports[] = #if !OPT_DISABLE_DS390 &ds390_port, #endif -#if !OPT_DISABLE_PIC - &pic_port, -#endif #if !OPT_DISABLE_PIC16 &pic16_port, #endif +#if !OPT_DISABLE_PIC + &pic_port, +#endif #if !OPT_DISABLE_TININative &tininative_port, #endif @@ -650,7 +647,7 @@ _setModel (int model, const char *sz) /** Gets the string argument to this option. If the option is '--opt' then for input of '--optxyz' or '--opt xyz' returns xyz. */ -static char * +char * getStringArg(const char *szStart, char **argv, int *pi, int argc) { if (argv[*pi][strlen(szStart)]) @@ -676,7 +673,7 @@ getStringArg(const char *szStart, char **argv, int *pi, int argc) /** Gets the integer argument to this option using the same rules as getStringArg. */ -static int +int getIntArg(const char *szStart, char **argv, int *pi, int argc) { return (int)floatFromVal(constVal(getStringArg(szStart, argv, pi, argc))); @@ -2122,6 +2119,10 @@ main (int argc, char **argv, char **envp) glue(); } + if (fatalError) { + exit (1); + } + if (!options.c1mode && !noAssemble) { if (options.verbose)