-std=gmqcc now implies -Werror-missing-return-values; another hardcoded error removed

diff --git a/main.c b/main.c
index 8abb1937edf3bcfa42e579da53426dd4df014975..6d8bc933c0ae267260eefc24af54f28353aea84e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -164,6 +164,7 @@ static bool options_parse(int argc, char **argv) {
                     opts_set(opts.flags, TRUE_EMPTY_STRINGS,            true);
                     opts_set(opts.flags, LOOP_LABELS,                   true);
                     opts_set(opts.werror, WARN_INVALID_PARAMETER_COUNT, true);
+                    opts_set(opts.werror, WARN_MISSING_RETURN_VALUES,   true);
                     opts.standard = COMPILER_GMQCC;
 
                 } else if (!strcmp(argarg, "qcc")) {

diff --git a/parser.c b/parser.c
index 97a4dffc5c40fbd071d7f0bc9c4903ffde0527b0..5bb7652627f9a4ff248accc82aab60cc86379550 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -2534,10 +2534,7 @@ static bool parse_return(parser_t *parser, ast_block *block, ast_expression **ou
         if (!parser_next(parser))
             parseerror(parser, "parse error");
         if (expected->expression.next->expression.vtype != TYPE_VOID) {
-            if (opts.standard != COMPILER_GMQCC)
-                (void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
-            else
-                parseerror(parser, "return without value");
+            (void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
         }
         ret = ast_return_new(ctx, NULL);
     }