fix ya.make

5 files changed, 0 insertions, 2755 deletions

diff --git a/contrib/tools/yasm/frontends/tasm/tasm-options.c b/contrib/tools/yasm/frontends/tasm/tasm-options.c
deleted file mode 100644
index 57c3bdfd15..0000000000
--- a/contrib/tools/yasm/frontends/tasm/tasm-options.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Generic Options Support Header File
- *
- * Copyright (c) 2001  Stanislav Karchebny <berk@madfire.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of other contributors
- *    may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <util.h>
-#include <ctype.h>
-
-#include "tasm-options.h"
-
-
-#ifdef __DEBUG__
-#define DEBUG(x) fprintf ## x ;
-#else
-#define DEBUG(x)
-#endif
-
-
-/* Options Parser */
-int
-parse_cmdline(int argc, char **argv, opt_option *options, size_t nopts,
-              void (*print_error) (const char *fmt, ...))
-{
-    int errors = 0, warnings = 0;
-    size_t i;
-    int got_it;
-
-    DEBUG((stderr, "parse_cmdline: entered\n"));
-
-  fail:
-    while (--argc) {
-        argv++;
-
-        if (argv[0][0] == '/' && argv[0][1]) {        /* opt */
-            got_it = 0;
-            for (i = 0; i < nopts; i++) {
-                char *cmd = &argv[0][1];
-                size_t len = strlen(options[i].opt);
-                if (yasm__strncasecmp(cmd, options[i].opt, len) == 0) {
-                    char *param;
-
-                    param = &argv[0][1+len];
-                    if (options[i].takes_param) {
-                        if (param[0] == '\0') {
-                            print_error(
-                                _("option `-%c' needs an argument!"),
-                                options[i].opt);
-                            errors++;
-                            goto fail;
-                        } else {
-                            argc--;
-                            argv++;
-                        }
-                    } else
-                        param = NULL;
-
-                    if (!options[i].handler(cmd, param, options[i].extra))
-                        got_it = 1;
-                    break;
-                }
-            }
-            if (!got_it) {
-                print_error(_("warning: unrecognized option `%s'"),
-                            argv[0]);
-                warnings++;
-            }
-        } else {    /* not an option, then it should be a file or something */
-
-            if (not_an_option_handler(argv[0]))
-                errors++;
-        }
-    }
-
-    DEBUG((stderr, "parse_cmdline: finished\n"));
-    return errors;
-}
-
-void
-help_msg(const char *msg, const char *tail, opt_option *options, size_t nopts)
-{
-    char optbuf[100];
-    size_t i;
-
-    printf("%s", gettext(msg));
-
-    for (i = 0; i < nopts; i++) {
-        optbuf[0] = 0;
-
-        if (options[i].takes_param) {
-            if (options[i].opt)
-                sprintf(optbuf, "/%s <%s>", options[i].opt,
-                        options[i].param_desc ? options[i].
-                        param_desc : _("param"));
-        } else {
-            if (options[i].opt)
-                sprintf(optbuf, "/%s", options[i].opt);
-        }
-
-        printf("    %-22s  %s\n", optbuf, gettext(options[i].description));
-    }
-
-    printf("%s", gettext(tail));
-}
diff --git a/contrib/tools/yasm/frontends/tasm/tasm-options.h b/contrib/tools/yasm/frontends/tasm/tasm-options.h
deleted file mode 100644
index 082409fc24..0000000000
--- a/contrib/tools/yasm/frontends/tasm/tasm-options.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Generic Options Support Header File
- *
- * Copyright (c) 2001  Stanislav Karchebny <berk@madfire.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef TASM_OPTIONS_H
-#define TASM_OPTIONS_H
-
-/* an option structure
- * operate on either -sopt, --lopt, -sopt <val> or --lopt=<val>
- */
-typedef struct opt_option_s
-{
-    /* option */
-    const char *opt;
-
-    /* !=0 if option requires parameter, 0 if not */
-    int takes_param;
-
-    int (*handler) (char *cmd, /*@null@*/ char *param, int extra);
-    int extra;                 /* extra value for handler */
-
-    /* description to use in help_msg() */
-    /*@observer@*/ const char *description;
-
-    /* optional description for the param taken (NULL if not present) */
-    /*  (short - will be printed after option sopt/lopt) */
-    /*@observer@*/ /*@null@*/ const char *param_desc;
-} opt_option;
-
-/* handle everything that is not an option */
-int not_an_option_handler(char *param);
-
-/* parse command line calling handlers when appropriate
- * argc, argv - pass directly from main(argc,argv)
- * options - array of options
- * nopts - options count
- */
-int parse_cmdline(int argc, char **argv, opt_option *options, size_t nopts,
-                  void (*print_error) (const char *fmt, ...));
-
-/* display help message msg followed by list of options in options and followed
- * by tail
- */
-void help_msg(const char *msg, const char *tail, opt_option *options,
-              size_t nopts);
-
-#endif
diff --git a/contrib/tools/yasm/frontends/tasm/tasm.c b/contrib/tools/yasm/frontends/tasm/tasm.c
deleted file mode 100644
index 58954b6457..0000000000
--- a/contrib/tools/yasm/frontends/tasm/tasm.c
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*
- * Program entry point, command line parsing
- *
- *  Copyright (C) 2001-2008  Peter Johnson
- *  Copyright (C) 2007-2008  Samuel Thibault
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <util.h>
-
-#include <ctype.h>
-#include <libyasm/compat-queue.h>
-#include <libyasm/bitvect.h>
-#include <libyasm.h>
-
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
-
-#include "tasm-options.h"
-
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-#include "yasm-plugin.h"
-#endif
-
-#include "license.c"
-
-#define DEFAULT_OBJFMT_MODULE   "bin"
-
-#if defined(CMAKE_BUILD) && !defined(BUILD_SHARED_LIBS)
-void yasm_init_plugin(void);
-#endif
-
-/*@null@*/ /*@only@*/ static char *obj_filename = NULL, *in_filename = NULL;
-/*@null@*/ /*@only@*/ static char *list_filename = NULL, *xref_filename = NULL;
-/*@null@*/ /*@only@*/ static char *machine_name = NULL;
-static int special_options = 0;
-static int segment_ordering = 0;
-static int cross_reference = 0;
-static int floating_point = 0;
-static int listing = 0;
-static int expanded_listing = 0;
-static int case_sensitivity = 0;
-static int valid_length = -1;
-/*@null@*/ /*@dependent@*/ static yasm_arch *cur_arch = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_arch_module *
-    cur_arch_module = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_parser_module *
-    cur_parser_module = NULL;
-/*@null@*/ /*@dependent@*/ static yasm_preproc *cur_preproc = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_preproc_module *
-    cur_preproc_module = NULL;
-/*@null@*/ static char *objfmt_keyword = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_objfmt_module *
-    cur_objfmt_module = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_dbgfmt_module *
-    cur_dbgfmt_module = NULL;
-/*@null@*/ /*@dependent@*/ static yasm_listfmt *cur_listfmt = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_listfmt_module *
-    cur_listfmt_module = NULL;
-static int warning_error = 0;   /* warnings being treated as errors */
-static FILE *errfile;
-/*@null@*/ /*@only@*/ static char *error_filename = NULL;
-
-/*@null@*/ /*@dependent@*/ static FILE *open_file(const char *filename,
-                                                  const char *mode);
-static void check_errors(/*@only@*/ yasm_errwarns *errwarns,
-                         /*@only@*/ yasm_object *object,
-                         /*@only@*/ yasm_linemap *linemap);
-static void cleanup(/*@null@*/ /*@only@*/ yasm_object *object);
-
-/* Forward declarations: cmd line parser handlers */
-static int opt_special_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_segment_ordering_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_cross_reference_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_floating_point_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_ignore(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_listing_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_case_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_valid_length_handler(char *cmd, /*@null@*/ char *param, int extra);
-
-static int opt_warning_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_preproc_option(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_exe_handler(char *cmd, /*@null@*/ char *param, int extra);
-
-static /*@only@*/ char *replace_extension(const char *orig, /*@null@*/
-                                          const char *ext, const char *def);
-static void print_error(const char *fmt, ...);
-
-static /*@exits@*/ void handle_yasm_int_error(const char *file,
-                                              unsigned int line,
-                                              const char *message);
-static /*@exits@*/ void handle_yasm_fatal(const char *message, va_list va);
-static const char *handle_yasm_gettext(const char *msgid);
-static void print_yasm_error(const char *filename, unsigned long line,
-                             const char *msg, /*@null@*/ const char *xref_fn,
-                             unsigned long xref_line,
-                             /*@null@*/ const char *xref_msg);
-static void print_yasm_warning(const char *filename, unsigned long line,
-                               const char *msg);
-
-static void apply_preproc_builtins(void);
-static void apply_preproc_standard_macros(const yasm_stdmac *stdmacs);
-static void apply_preproc_saved_options(void);
-static void print_list_keyword_desc(const char *name, const char *keyword);
-
-/* values for special_options */
-#define SPECIAL_SHOW_HELP 0x01
-#define SPECIAL_SHOW_VERSION 0x02
-#define SPECIAL_SHOW_LICENSE 0x04
-
-#define SEGMENT_ORDERING_ALPHABETIC 0x01
-#define SEGMENT_ORDERING_SOURCE 0x02
-
-#define FP_EMULATED 0x01
-#define FP_REAL 0x02
-
-#define CASE_ALL 0x01
-#define CASE_GLOBALS 0x02
-#define CASE_NONE 0x04
-
-#define DEBUG_FULL 0x01
-#define DEBUG_LINES 0x02
-#define DEBUG_NONE 0x04
-
-/* command line options */
-static opt_option options[] =
-{
-    { "version", 0, opt_special_handler, SPECIAL_SHOW_VERSION,
-      N_("show version text"), NULL },
-    { "license", 0, opt_special_handler, SPECIAL_SHOW_LICENSE,
-      N_("show license text"), NULL },
-    { "a", 0, opt_segment_ordering_handler, SEGMENT_ORDERING_ALPHABETIC,
-      N_("Alphabetic segment ordering"), NULL },
-    { "s", 0, opt_segment_ordering_handler, SEGMENT_ORDERING_SOURCE,
-      N_("Source segment ordering"), NULL },
-
-    { "c", 0, opt_cross_reference_handler, 0,
-      N_("Generate cross-reference in listing"), NULL },
-
-    { "d", 1, opt_preproc_option, 2,
-      N_("pre-define a macro, optionally to value"), N_("macro[=value]") },
-
-    { "e", 0, opt_floating_point_handler, FP_EMULATED,
-      N_("Emulated floating-point instructions (not supported)"), NULL },
-    { "r", 0, opt_floating_point_handler, FP_REAL,
-      N_("Real floating-point instructions"), NULL },
-
-    { "h", 0, opt_special_handler, SPECIAL_SHOW_HELP,
-      N_("show help text"), NULL },
-    { "?", 0, opt_special_handler, SPECIAL_SHOW_HELP,
-      N_("show help text"), NULL },
-
-    { "i", 1, opt_preproc_option, 0,
-      N_("add include path"), N_("path") },
-
-    { "j", 1, opt_ignore, 0,
-      N_("Jam in an assemble directive CMD (eg. /jIDEAL) (not supported)"), NULL },
-
-    { "k", 1, opt_ignore, 0,
-      N_("Hash table capacity (ignored)"), N_("# symbols") },
-
-    { "l", 0, opt_listing_handler, 0,
-      N_("Generate listing"), N_("l=normal listing, la=expanded listing") },
-
-    { "ml", 0, opt_case_handler, CASE_ALL,
-      N_("Case sensitivity on all symbols"), NULL },
-    { "mx", 0, opt_case_handler, CASE_GLOBALS,
-      N_("Case sensitivity on global symbols"), NULL },
-    { "mu", 0, opt_case_handler, CASE_NONE,
-      N_("No case sensitivity on symbols"), NULL },
-    { "mv", 0, opt_valid_length_handler, 0,
-      N_("Set maximum valid length for symbols"), N_("length") },
-
-    { "m", 1, opt_ignore, 0,
-      N_("Allow multiple passes to resolve forward reference (ignored)"), N_("number of passes") },
-
-    { "n", 0, opt_ignore, 0,
-      N_("Suppress symbol tables in listing"), NULL },
-
-    { "o", 0, opt_ignore, 0,
-      N_("Object code"), N_("os: standard, o: standard w/overlays, op: Phar Lap, oi: IBM") },
-
-    { "p", 0, opt_ignore, 0,
-      N_("Check for code segment overrides in protected mode"), NULL },
-    { "q", 0, opt_ignore, 0,
-      N_("Suppress OBJ records not needed for linking (ignored)"), NULL },
-    { "t", 0, opt_ignore, 0,
-      N_("Suppress messages if successful assembly"), NULL },
-    { "u", 0, opt_ignore, 0,
-      N_("Set version emulation"), N_("Version") },
-    { "w", 1, opt_warning_handler, 0,
-      N_("Set warning level"), N_("w0=none, w1=w2=warnings on, w-xxx/w+xxx=disable/enable warning xxx") },
-    { "x", 0, opt_ignore, 0,
-      N_("Include false conditionals in listing"), NULL },
-    { "zi", 0, opt_ignore, DEBUG_FULL,
-      N_("Full debug info"), NULL },
-    { "zd", 0, opt_ignore, DEBUG_LINES,
-      N_("Line numbers debug info"), NULL },
-    { "zn", 0, opt_ignore, DEBUG_NONE,
-      N_("No debug info"), NULL },
-    { "z", 0, opt_ignore, 0,
-      N_("Display source line with error message (ignored)"), NULL },
-
-    { "b", 0, opt_exe_handler, 0,
-      N_("Build a (very) basic .exe file"), NULL },
-};
-
-/* version message */
-/*@observer@*/ static const char *version_msg[] = {
-    PACKAGE_STRING,
-    "Compiled on " __DATE__ ".",
-    "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
-    "Run yasm --license for licensing overview and summary."
-};
-
-/* help messages */
-/*@observer@*/ static const char *help_head = N_(
-    "usage: tasm [option]* source [,object] [,listing] [,xref] \n"
-    "Options:\n");
-/*@observer@*/ static const char *help_tail = N_(
-    "\n"
-    "source is asm source to be assembled.\n"
-    "\n"
-    "Sample invocation:\n"
-    "   tasm /zi source.asm\n"
-    "\n"
-    "Report bugs to bug-yasm@tortall.net\n");
-
-/* parsed command line storage until appropriate modules have been loaded */
-typedef STAILQ_HEAD(constcharparam_head, constcharparam) constcharparam_head;
-
-typedef struct constcharparam {
-    STAILQ_ENTRY(constcharparam) link;
-    const char *param;
-    int id;
-} constcharparam;
-
-static constcharparam_head preproc_options;
-
-static int
-do_assemble(void)
-{
-    yasm_object *object;
-    const char *base_filename;
-    /*@null@*/ FILE *obj = NULL;
-    yasm_arch_create_error arch_error;
-    yasm_linemap *linemap;
-    yasm_errwarns *errwarns = yasm_errwarns_create();
-    int i, matched;
-
-    /* Initialize line map */
-    linemap = yasm_linemap_create();
-    yasm_linemap_set(linemap, in_filename, 0, 1, 1);
-
-    /* determine the object filename if not specified */
-    if (!obj_filename) {
-        if (in_filename == NULL)
-            /* Default to yasm.out if no obj filename specified */
-            obj_filename = yasm__xstrdup("yasm.out");
-        else {
-            /* replace (or add) extension to base filename */
-            yasm__splitpath(in_filename, &base_filename);
-            if (base_filename[0] == '\0')
-                obj_filename = yasm__xstrdup("yasm.out");
-            else
-                obj_filename = replace_extension(base_filename,
-                                                 "obj",
-                                                 "yasm.out");
-        }
-    }
-
-    cur_arch = yasm_arch_create(cur_arch_module, machine_name,
-                                cur_parser_module->keyword, &arch_error);
-    if (!cur_arch) {
-        switch (arch_error) {
-            case YASM_ARCH_CREATE_BAD_MACHINE:
-                print_error(_("%s: `%s' is not a valid %s for %s `%s'"),
-                            _("FATAL"), machine_name, _("machine"),
-                            _("architecture"), cur_arch_module->keyword);
-                break;
-            case YASM_ARCH_CREATE_BAD_PARSER:
-                print_error(_("%s: `%s' is not a valid %s for %s `%s'"),
-                            _("FATAL"), cur_parser_module->keyword,
-                            _("parser"), _("architecture"),
-                            cur_arch_module->keyword);
-                break;
-            default:
-                print_error(_("%s: unknown architecture error"), _("FATAL"));
-        }
-
-        return EXIT_FAILURE;
-    }
-
-    /* Create object */
-    object = yasm_object_create(in_filename, obj_filename, cur_arch,
-                                cur_objfmt_module, cur_dbgfmt_module);
-    if (!object) {
-        yasm_error_class eclass;
-        unsigned long xrefline;
-        /*@only@*/ /*@null@*/ char *estr, *xrefstr;
-
-        yasm_error_fetch(&eclass, &estr, &xrefline, &xrefstr);
-        print_error("%s: %s", _("FATAL"), estr);
-        yasm_xfree(estr);
-        yasm_xfree(xrefstr);
-
-        cleanup(object);
-        return EXIT_FAILURE;
-    }
-
-    /* Get a fresh copy of objfmt_module as it may have changed. */
-    cur_objfmt_module = ((yasm_objfmt_base *)object->objfmt)->module;
-
-    /* Check to see if the requested preprocessor is in the allowed list
-     * for the active parser.
-     */
-    matched = 0;
-    for (i=0; cur_parser_module->preproc_keywords[i]; i++)
-        if (yasm__strcasecmp(cur_parser_module->preproc_keywords[i],
-                             cur_preproc_module->keyword) == 0)
-            matched = 1;
-    if (!matched) {
-        print_error(_("%s: `%s' is not a valid %s for %s `%s'"), _("FATAL"),
-                    cur_preproc_module->keyword, _("preprocessor"),
-                    _("parser"), cur_parser_module->keyword);
-        cleanup(object);
-        return EXIT_FAILURE;
-    }
-
-    cur_preproc = yasm_preproc_create(cur_preproc_module, in_filename,
-                                      object->symtab, linemap, errwarns);
-
-    apply_preproc_builtins();
-    apply_preproc_standard_macros(cur_parser_module->stdmacs);
-    apply_preproc_standard_macros(cur_objfmt_module->stdmacs);
-    apply_preproc_saved_options();
-
-    /* Get initial x86 BITS setting from object format */
-    if (strcmp(cur_arch_module->keyword, "x86") == 0) {
-        yasm_arch_set_var(cur_arch, "mode_bits",
-                          cur_objfmt_module->default_x86_mode_bits);
-    }
-
-    /* Parse! */
-    cur_parser_module->do_parse(object, cur_preproc, list_filename != NULL,
-                                linemap, errwarns);
-
-    check_errors(errwarns, object, linemap);
-
-    /* Finalize parse */
-    yasm_object_finalize(object, errwarns);
-    check_errors(errwarns, object, linemap);
-
-    /* Optimize */
-    yasm_object_optimize(object, errwarns);
-    check_errors(errwarns, object, linemap);
-
-    /* generate any debugging information */
-    yasm_dbgfmt_generate(object, linemap, errwarns);
-    check_errors(errwarns, object, linemap);
-
-    /* open the object file for output (if not already opened by dbg objfmt) */
-    if (!obj && strcmp(cur_objfmt_module->keyword, "dbg") != 0) {
-        obj = open_file(obj_filename, "wb");
-        if (!obj) {
-            cleanup(object);
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* Write the object file */
-    yasm_objfmt_output(object, obj?obj:stderr,
-                       strcmp(cur_dbgfmt_module->keyword, "null"), errwarns);
-
-    /* Close object file */
-    if (obj)
-        fclose(obj);
-
-    /* If we had an error at this point, we also need to delete the output
-     * object file (to make sure it's not left newer than the source).
-     */
-    if (yasm_errwarns_num_errors(errwarns, warning_error) > 0)
-        remove(obj_filename);
-    check_errors(errwarns, object, linemap);
-
-    /* Open and write the list file */
-    if (list_filename) {
-        FILE *list = open_file(list_filename, "wt");
-        if (!list) {
-            cleanup(object);
-            return EXIT_FAILURE;
-        }
-        /* Initialize the list format */
-        cur_listfmt = yasm_listfmt_create(cur_listfmt_module, in_filename,
-                                          obj_filename);
-        yasm_listfmt_output(cur_listfmt, list, linemap, cur_arch);
-        fclose(list);
-    }
-
-    yasm_errwarns_output_all(errwarns, linemap, warning_error,
-                             print_yasm_error, print_yasm_warning);
-
-    yasm_linemap_destroy(linemap);
-    yasm_errwarns_destroy(errwarns);
-    cleanup(object);
-    return EXIT_SUCCESS;
-}
-
-/* main function */
-/*@-globstate -unrecog@*/
-int
-main(int argc, char *argv[])
-{
-    size_t i;
-
-    errfile = stderr;
-
-#if defined(HAVE_SETLOCALE) && defined(HAVE_LC_MESSAGES)
-    setlocale(LC_MESSAGES, "");
-#endif
-#if defined(LOCALEDIR)
-    bindtextdomain(PACKAGE, LOCALEDIR);
-#endif
-    textdomain(PACKAGE);
-
-    /* Initialize errwarn handling */
-    yasm_internal_error_ = handle_yasm_int_error;
-    yasm_fatal = handle_yasm_fatal;
-    yasm_gettext_hook = handle_yasm_gettext;
-    yasm_errwarn_initialize();
-
-    /* Initialize BitVector (needed for intnum/floatnum). */
-    if (BitVector_Boot() != ErrCode_Ok) {
-        print_error(_("%s: could not initialize BitVector"), _("FATAL"));
-        return EXIT_FAILURE;
-    }
-
-    /* Initialize intnum and floatnum */
-    yasm_intnum_initialize();
-    yasm_floatnum_initialize();
-
-#ifdef CMAKE_BUILD
-    /* Load standard modules */
-#ifdef BUILD_SHARED_LIBS
-    if (!load_plugin("yasmstd")) {
-        print_error(_("%s: could not load standard modules"), _("FATAL"));
-        return EXIT_FAILURE;
-    }
-#else
-    yasm_init_plugin();
-#endif
-#endif
-
-    /* Initialize parameter storage */
-    STAILQ_INIT(&preproc_options);
-
-    if (parse_cmdline(argc, argv, options, NELEMS(options), print_error))
-        return EXIT_FAILURE;
-
-    switch (special_options) {
-        case SPECIAL_SHOW_HELP:
-            /* Does gettext calls internally */
-            help_msg(help_head, help_tail, options, NELEMS(options));
-            return EXIT_SUCCESS;
-        case SPECIAL_SHOW_VERSION:
-            for (i=0; i<NELEMS(version_msg); i++)
-                printf("%s\n", version_msg[i]);
-            return EXIT_SUCCESS;
-        case SPECIAL_SHOW_LICENSE:
-            for (i=0; i<NELEMS(license_msg); i++)
-                printf("%s\n", license_msg[i]);
-            return EXIT_SUCCESS;
-    }
-
-    /* Open error file if specified. */
-    if (error_filename) {
-        errfile = open_file(error_filename, "wt");
-        if (!errfile)
-            return EXIT_FAILURE;
-    }
-
-    /* If not already specified, default to bin as the object format. */
-    if (!cur_objfmt_module) {
-        if (!objfmt_keyword)
-            objfmt_keyword = yasm__xstrdup(DEFAULT_OBJFMT_MODULE);
-        cur_objfmt_module = yasm_load_objfmt(objfmt_keyword);
-        if (!cur_objfmt_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("object format"));
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* TASM's architecture is x86 */
-    cur_arch_module = yasm_load_arch("x86");
-    if (!cur_arch_module) {
-        print_error(_("%s: could not load %s"), _("FATAL"),
-                    _("architecture"));
-        return EXIT_FAILURE;
-    }
-    machine_name =
-        yasm__xstrdup(cur_arch_module->default_machine_keyword);
-
-    /* Check for arch help */
-    if (machine_name && strcmp(machine_name, "help") == 0) {
-        const yasm_arch_machine *m = cur_arch_module->machines;
-        printf(_("Available %s for %s `%s':\n"), _("machines"),
-               _("architecture"), cur_arch_module->keyword);
-        while (m->keyword && m->name) {
-            print_list_keyword_desc(m->name, m->keyword);
-            m++;
-        }
-        return EXIT_SUCCESS;
-    }
-
-    cur_parser_module = yasm_load_parser("tasm");
-    if (!cur_parser_module) {
-        print_error(_("%s: could not load %s"), _("FATAL"),
-                    _("parser"));
-        cleanup(NULL);
-        return EXIT_FAILURE;
-    }
-
-    /* If not already specified, default to the parser's default preproc. */
-    if (!cur_preproc_module) {
-        cur_preproc_module =
-            yasm_load_preproc(cur_parser_module->default_preproc_keyword);
-        if (!cur_preproc_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("preprocessor"));
-            cleanup(NULL);
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* Determine input filename and open input file. */
-    if (!in_filename) {
-        print_error(_("No input files specified"));
-        return EXIT_FAILURE;
-    }
-
-    /* If list file enabled, make sure we have a list format loaded. */
-    if (list_filename) {
-        /* use nasm as the list format. */
-        cur_listfmt_module = yasm_load_listfmt("nasm");
-    }
-
-    /* If not already specified, default to null as the debug format. */
-    if (!cur_dbgfmt_module) {
-        cur_dbgfmt_module = yasm_load_dbgfmt("null");
-        if (!cur_dbgfmt_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("debug format"));
-            return EXIT_FAILURE;
-        }
-    }
-
-    return do_assemble();
-}
-/*@=globstate =unrecog@*/
-
-/* Open the object file.  Returns 0 on failure. */
-static FILE *
-open_file(const char *filename, const char *mode)
-{
-    FILE *f;
-
-    f = fopen(filename, mode);
-    if (!f)
-        print_error(_("could not open file `%s'"), filename);
-    return f;
-}
-
-static void
-check_errors(yasm_errwarns *errwarns, yasm_object *object,
-             yasm_linemap *linemap)
-{
-    if (yasm_errwarns_num_errors(errwarns, warning_error) > 0) {
-        yasm_errwarns_output_all(errwarns, linemap, warning_error,
-                                 print_yasm_error, print_yasm_warning);
-        yasm_linemap_destroy(linemap);
-        yasm_errwarns_destroy(errwarns);
-        cleanup(object);
-        exit(EXIT_FAILURE);
-    }
-}
-
-/* Define DO_FREE to 1 to enable deallocation of all data structures.
- * Useful for detecting memory leaks, but slows down execution unnecessarily
- * (as the OS will free everything we miss here).
- */
-#define DO_FREE 1
-
-/* Cleans up all allocated structures. */
-static void
-cleanup(yasm_object *object)
-{
-    if (DO_FREE) {
-        if (cur_listfmt)
-            yasm_listfmt_destroy(cur_listfmt);
-        if (cur_preproc)
-            yasm_preproc_destroy(cur_preproc);
-        if (object)
-            yasm_object_destroy(object);
-
-        yasm_floatnum_cleanup();
-        yasm_intnum_cleanup();
-
-        yasm_errwarn_cleanup();
-
-        BitVector_Shutdown();
-    }
-
-    if (DO_FREE) {
-        if (in_filename)
-            yasm_xfree(in_filename);
-        if (obj_filename)
-            yasm_xfree(obj_filename);
-        if (list_filename)
-            yasm_xfree(list_filename);
-        if (xref_filename)
-            yasm_xfree(xref_filename);
-        if (machine_name)
-            yasm_xfree(machine_name);
-        if (objfmt_keyword)
-            yasm_xfree(objfmt_keyword);
-    }
-
-    if (errfile != stderr && errfile != stdout)
-        fclose(errfile);
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-    unload_plugins();
-#endif
-}
-
-/*
- *  Command line options handlers
- */
-static char ** const filenames[] = {
-    &in_filename, &obj_filename, &list_filename, &xref_filename, NULL
-}, ** const * cur_filename = &filenames[0];
-
-static int filename_handler(char *param) {
-    if (!*cur_filename) {
-        print_error(_("error: too many files on command line."));
-        return 1;
-    }
-
-    if (*param)
-            **cur_filename = yasm__xstrdup(param);
-
-    return 0;
-}
-int
-not_an_option_handler(char *param) {
-    char *c, *d = param;
-
-    while ((c = strchr(d, ','))) {
-        *c = '\0';
-        if (filename_handler(d))
-            return 1;
-        d = c + 1;
-        cur_filename++;
-    }
-    filename_handler(d);
-    return 0;
-}
-
-static int
-opt_special_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    if (special_options == 0)
-        special_options = extra;
-    return 0;
-}
-
-static int
-opt_segment_ordering_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    segment_ordering = extra;
-    return 0;
-}
-
-static int
-opt_cross_reference_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    cross_reference = 1;
-    return 0;
-}
-
-static int
-opt_floating_point_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    floating_point = extra;
-    return 0;
-}
-
-static int
-opt_ignore(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    return 0;
-}
-
-static int
-opt_listing_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    if (param && param[0]) {
-        if (param[0] != 'a')
-            return 1;
-        expanded_listing = 1;
-    }
-    listing = 1;
-    return 0;
-}
-
-static int
-opt_case_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    case_sensitivity = extra;
-    return 0;
-}
-
-static int
-opt_valid_length_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    valid_length = atoi(param);
-    return 0;
-}
-
-static int
-opt_warning_handler(char *cmd, /*@unused@*/ char *param, int extra)
-{
-    /* is it disabling the warning instead of enabling? */
-    void (*action)(yasm_warn_class wclass) = NULL;
-
-    if (cmd[0] == '0') {
-        /* /w0, disable warnings */
-        yasm_warn_disable_all();
-        return 0;
-    }
-
-    if (cmd[0] == '1' || cmd[0] == '2') {
-        /* /w[12], enable warnings */
-        yasm_warn_enable(YASM_WARN_UNREC_CHAR);
-        yasm_warn_enable(YASM_WARN_ORPHAN_LABEL);
-        yasm_warn_enable(YASM_WARN_UNINIT_CONTENTS);
-        return 0;
-    }
-
-    /* detect no- prefix to disable the warning */
-    if (cmd[0] == '-') {
-        action = yasm_warn_disable;
-    } else if (cmd[0] == '+') {
-        action = yasm_warn_enable;
-    } else return 1;
-
-    /* skip past '+/-' */
-    cmd++;
-
-    if (cmd[0] == '\0')
-        /* just /w- or /w+, so definitely not valid */
-        return 1;
-    else if (strcmp(cmd, "error") == 0)
-        warning_error = (action == yasm_warn_enable);
-    else if (strcmp(cmd, "unrecognized-char") == 0)
-        action(YASM_WARN_UNREC_CHAR);
-    else if (strcmp(cmd, "orphan-labels") == 0)
-        action(YASM_WARN_ORPHAN_LABEL);
-    else if (strcmp(cmd, "uninit-contents") == 0)
-        action(YASM_WARN_UNINIT_CONTENTS);
-    else if (strcmp(cmd, "size-override") == 0)
-        action(YASM_WARN_SIZE_OVERRIDE);
-    else
-        return 1;
-
-    return 0;
-}
-
-static int
-opt_preproc_option(/*@unused@*/ char *cmd, char *param, int extra)
-{
-    constcharparam *cp;
-    cp = yasm_xmalloc(sizeof(constcharparam));
-    cp->param = param;
-    cp->id = extra;
-    STAILQ_INSERT_TAIL(&preproc_options, cp, link);
-    return 0;
-}
-
-static int
-opt_exe_handler(char *cmd, /*@unused@*/ char *param, int extra)
-{
-    objfmt_keyword = yasm__xstrdup("dosexe");
-    return 0;
-}
-
-static void
-apply_preproc_builtins()
-{
-    char *predef;
-
-    if (!objfmt_keyword)
-        objfmt_keyword = yasm__xstrdup(DEFAULT_OBJFMT_MODULE);
-
-    /* Define standard YASM assembly-time macro constants */
-    predef = yasm_xmalloc(strlen("__YASM_OBJFMT__=")
-                          + strlen(objfmt_keyword) + 1);
-    strcpy(predef, "__YASM_OBJFMT__=");
-    strcat(predef, objfmt_keyword);
-    yasm_preproc_define_builtin(cur_preproc, predef);
-    yasm_xfree(predef);
-}
-
-static void
-apply_preproc_standard_macros(const yasm_stdmac *stdmacs)
-{
-    int i, matched;
-
-    if (!stdmacs)
-        return;
-
-    matched = -1;
-    for (i=0; stdmacs[i].parser; i++)
-        if (yasm__strcasecmp(stdmacs[i].parser,
-                             cur_parser_module->keyword) == 0 &&
-            yasm__strcasecmp(stdmacs[i].preproc,
-                             cur_preproc_module->keyword) == 0)
-            matched = i;
-    if (matched >= 0 && stdmacs[matched].macros)
-        yasm_preproc_add_standard(cur_preproc, stdmacs[matched].macros);
-}
-
-static void
-apply_preproc_saved_options()
-{
-    constcharparam *cp, *cpnext;
-
-    void (*funcs[3])(yasm_preproc *, const char *);
-    funcs[0] = cur_preproc_module->add_include_file;
-    funcs[1] = cur_preproc_module->predefine_macro;
-    funcs[2] = cur_preproc_module->undefine_macro;
-
-    STAILQ_FOREACH(cp, &preproc_options, link) {
-        if (0 <= cp->id && cp->id < 3 && funcs[cp->id])
-            funcs[cp->id](cur_preproc, cp->param);
-    }
-
-    cp = STAILQ_FIRST(&preproc_options);
-    while (cp != NULL) {
-        cpnext = STAILQ_NEXT(cp, link);
-        yasm_xfree(cp);
-        cp = cpnext;
-    }
-    STAILQ_INIT(&preproc_options);
-}
-
-/* Replace extension on a filename (or append one if none is present).
- * If output filename would be identical to input (same extension out as in),
- * returns (copy of) def.
- * A NULL ext means the trailing '.' should NOT be included, whereas a "" ext
- * means the trailing '.' should be included.
- */
-static char *
-replace_extension(const char *orig, /*@null@*/ const char *ext,
-                  const char *def)
-{
-    char *out, *outext;
-    size_t deflen, outlen;
-
-    /* allocate enough space for full existing name + extension */
-    outlen = strlen(orig) + 2;
-    if (ext)
-        outlen += strlen(ext) + 1;
-    deflen = strlen(def) + 1;
-    if (outlen < deflen)
-        outlen = deflen;
-    out = yasm_xmalloc(outlen);
-
-    strcpy(out, orig);
-    outext = strrchr(out, '.');
-    if (outext) {
-        /* Existing extension: make sure it's not the same as the replacement
-         * (as we don't want to overwrite the source file).
-         */
-        outext++;   /* advance past '.' */
-        if (ext && strcmp(outext, ext) == 0) {
-            outext = NULL;  /* indicate default should be used */
-            print_error(
-                _("file name already ends in `.%s': output will be in `%s'"),
-                ext, def);
-        }
-    } else {
-        /* No extension: make sure the output extension is not empty
-         * (again, we don't want to overwrite the source file).
-         */
-        if (!ext)
-            print_error(
-                _("file name already has no extension: output will be in `%s'"),
-                def);
-        else {
-            outext = strrchr(out, '\0');    /* point to end of the string */
-            *outext++ = '.';                    /* append '.' */
-        }
-    }
-
-    /* replace extension or use default name */
-    if (outext) {
-        if (!ext) {
-            /* Back up and replace '.' with string terminator */
-            outext--;
-            *outext = '\0';
-        } else
-            strcpy(outext, ext);
-    } else
-        strcpy(out, def);
-
-    return out;
-}
-
-void
-print_list_keyword_desc(const char *name, const char *keyword)
-{
-    printf("%4s%-12s%s\n", "", keyword, name);
-}
-
-static void
-print_error(const char *fmt, ...)
-{
-    va_list va;
-    fprintf(errfile, "tasm: ");
-    va_start(va, fmt);
-    vfprintf(errfile, fmt, va);
-    va_end(va);
-    fputc('\n', errfile);
-}
-
-static /*@exits@*/ void
-handle_yasm_int_error(const char *file, unsigned int line, const char *message)
-{
-    fprintf(stderr, _("INTERNAL ERROR at %s, line %u: %s\n"), file, line,
-            gettext(message));
-#ifdef HAVE_ABORT
-    abort();
-#else
-    exit(EXIT_FAILURE);
-#endif
-}
-
-static /*@exits@*/ void
-handle_yasm_fatal(const char *fmt, va_list va)
-{
-    fprintf(errfile, "**%s**: ", _("Fatal"));
-    vfprintf(errfile, gettext(fmt), va);
-    fputc('\n', errfile);
-    exit(EXIT_FAILURE);
-}
-
-static const char *
-handle_yasm_gettext(const char *msgid)
-{
-    return gettext(msgid);
-}
-
-static void
-print_yasm_error(const char *filename, unsigned long line, const char *msg,
-                 const char *xref_fn, unsigned long xref_line,
-                 const char *xref_msg)
-{
-    if (line)
-        fprintf(errfile, "**%s** %s(%lu) %s\n", _("Error"), filename, line, msg);
-    else
-        fprintf(errfile, "**%s** %s %s\n", _("Error"), filename, msg);
-
-    if (/* xref_fn && */ xref_msg) {
-        if (xref_line)
-            fprintf(errfile, "**%s** %s(%lu) %s\n", _("Error"), filename, xref_line, xref_msg);
-        else
-            fprintf(errfile, "**%s** %s %s\n", _("Error"), filename, xref_msg);
-    }
-}
-
-static void
-print_yasm_warning(const char *filename, unsigned long line, const char *msg)
-{
-    if (line)
-        fprintf(errfile, "*%s* %s(%lu) %s\n", _("Warning"), filename, line, msg);
-    else
-        fprintf(errfile, "*%s* %s %s\n", _("Warning"), filename, msg);
-}
diff --git a/contrib/tools/yasm/frontends/vsyasm/vsyasm.c b/contrib/tools/yasm/frontends/vsyasm/vsyasm.c
deleted file mode 100644
index 905145fa15..0000000000
--- a/contrib/tools/yasm/frontends/vsyasm/vsyasm.c
+++ /dev/null
@@ -1,1424 +0,0 @@
-/*
- * Program entry point, command line parsing
- *
- *  Copyright (C) 2001-2007  Peter Johnson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <util.h>
-
-#include <ctype.h>
-#include <libyasm/compat-queue.h>
-#include <libyasm/bitvect.h>
-#include <libyasm.h>
-
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
-
-#include "frontends/yasm/yasm-options.h"
-
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-#include "frontends/yasm/yasm-plugin.h"
-#endif
-
-#include "license.c"
-
-#if defined(CMAKE_BUILD) && !defined(BUILD_SHARED_LIBS)
-void yasm_init_plugin(void);
-#endif
-
-/*@null@*/ /*@only@*/ static char *objdir_pathname = NULL;
-/*@null@*/ /*@only@*/ static char *global_prefix = NULL, *global_suffix = NULL;
-/*@null@*/ /*@only@*/ static char *listdir_pathname = NULL;
-/*@null@*/ /*@only@*/ static char *mapdir_pathname = NULL;
-/*@null@*/ /*@only@*/ static char *objext = NULL;
-/*@null@*/ /*@only@*/ static char *listext = NULL, *mapext = NULL;
-/*@null@*/ /*@only@*/ static char *machine_name = NULL;
-static int special_options = 0;
-/*@null@*/ /*@dependent@*/ static const yasm_arch_module *
-    cur_arch_module = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_parser_module *
-    cur_parser_module = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_preproc_module *
-    cur_preproc_module = NULL;
-/*@null@*/ static char *objfmt_keyword = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_objfmt_module *
-    cur_objfmt_module = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_dbgfmt_module *
-    cur_dbgfmt_module = NULL;
-/*@null@*/ /*@dependent@*/ static const yasm_listfmt_module *
-    cur_listfmt_module = NULL;
-static unsigned int force_strict = 0;
-static int warning_error = 0;   /* warnings being treated as errors */
-static FILE *errfile;
-/*@null@*/ /*@only@*/ static char *error_filename = NULL;
-static enum {
-    EWSTYLE_GNU = 0,
-    EWSTYLE_VC
-} ewmsg_style = EWSTYLE_GNU;
-
-/*@null@*/ /*@dependent@*/ static FILE *open_file(const char *filename,
-                                                  const char *mode);
-static int check_errors(/*@only@*/ yasm_errwarns *errwarns,
-                        /*@only@*/ yasm_object *object,
-                        /*@only@*/ yasm_linemap *linemap,
-                        /*@only@*/ yasm_preproc *preproc,
-                        /*@only@*/ yasm_arch *arch);
-static void cleanup(void);
-static void free_input_filenames(void);
-
-/* Forward declarations: cmd line parser handlers */
-static int opt_special_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_arch_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_parser_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_preproc_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_objfmt_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_dbgfmt_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_listfmt_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_listdir_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_objdir_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_mapdir_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_listext_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_objext_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_mapext_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_machine_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_strict_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_warning_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_error_file(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_error_stdout(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_include_option(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_preproc_option(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_ewmsg_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_prefix_handler(char *cmd, /*@null@*/ char *param, int extra);
-static int opt_suffix_handler(char *cmd, /*@null@*/ char *param, int extra);
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-static int opt_plugin_handler(char *cmd, /*@null@*/ char *param, int extra);
-#endif
-
-static /*@only@*/ char *replace_extension(const char *orig, /*@null@*/
-                                          const char *ext);
-static void print_error(const char *fmt, ...);
-
-static /*@exits@*/ void handle_yasm_int_error(const char *file,
-                                              unsigned int line,
-                                              const char *message);
-static /*@exits@*/ void handle_yasm_fatal(const char *message, va_list va);
-static const char *handle_yasm_gettext(const char *msgid);
-static void print_yasm_error(const char *filename, unsigned long line,
-                             const char *msg, /*@null@*/ const char *xref_fn,
-                             unsigned long xref_line,
-                             /*@null@*/ const char *xref_msg);
-static void print_yasm_warning(const char *filename, unsigned long line,
-                               const char *msg);
-
-static void apply_preproc_builtins(yasm_preproc *preproc);
-static void apply_preproc_standard_macros(yasm_preproc *preproc,
-                                          const yasm_stdmac *stdmacs);
-static void apply_preproc_saved_options(yasm_preproc *preproc);
-static void free_preproc_saved_options(void);
-static void print_list_keyword_desc(const char *name, const char *keyword);
-
-/* values for special_options */
-#define SPECIAL_SHOW_HELP 0x01
-#define SPECIAL_SHOW_VERSION 0x02
-#define SPECIAL_SHOW_LICENSE 0x04
-#define SPECIAL_LISTED 0x08
-
-/* command line options */
-static opt_option options[] =
-{
-    { 0, "version", 0, opt_special_handler, SPECIAL_SHOW_VERSION,
-      N_("show version text"), NULL },
-    { 0, "license", 0, opt_special_handler, SPECIAL_SHOW_LICENSE,
-      N_("show license text"), NULL },
-    { 'h', "help", 0, opt_special_handler, SPECIAL_SHOW_HELP,
-      N_("show help text"), NULL },
-    { 'a', "arch", 1, opt_arch_handler, 0,
-      N_("select architecture (list with -a help)"), N_("arch") },
-    { 'p', "parser", 1, opt_parser_handler, 0,
-      N_("select parser (list with -p help)"), N_("parser") },
-    { 'r', "preproc", 1, opt_preproc_handler, 0,
-      N_("select preprocessor (list with -r help)"), N_("preproc") },
-    { 'f', "oformat", 1, opt_objfmt_handler, 0,
-      N_("select object format (list with -f help)"), N_("format") },
-    { 'g', "dformat", 1, opt_dbgfmt_handler, 0,
-      N_("select debugging format (list with -g help)"), N_("debug") },
-    { 'L', "lformat", 1, opt_listfmt_handler, 0,
-      N_("select list format (list with -L help)"), N_("list") },
-    { 'l', "list", 1, opt_listdir_handler, 0,
-      N_("name of list-file output directory"), N_("pathname") },
-    { 'o', "objdir", 1, opt_objdir_handler, 0,
-      N_("name of object-file output directory"), N_("pathname") },
-    { 0, "mapdir", 1, opt_mapdir_handler, 0,
-      N_("name of map-file output directory"), N_("pathname") },
-    { 0, "listext", 1, opt_listext_handler, 0,
-      N_("list-file extension (default `lst')"), N_("ext") },
-    { 0, "objext", 1, opt_objext_handler, 0,
-      N_("object-file extension (default is by object format)"), N_("ext") },
-    { 0, "mapext", 1, opt_mapext_handler, 0,
-      N_("map-file extension (default `map')"), N_("ext") },
-    { 'm', "machine", 1, opt_machine_handler, 0,
-      N_("select machine (list with -m help)"), N_("machine") },
-    { 0, "force-strict", 0, opt_strict_handler, 0,
-      N_("treat all sized operands as if `strict' was used"), NULL },
-    { 'w', NULL, 0, opt_warning_handler, 1,
-      N_("inhibits warning messages"), NULL },
-    { 'W', NULL, 0, opt_warning_handler, 0,
-      N_("enables/disables warning"), NULL },
-    { 'E', NULL, 1, opt_error_file, 0,
-      N_("redirect error messages to file"), N_("file") },
-    { 's', NULL, 0, opt_error_stdout, 0,
-      N_("redirect error messages to stdout"), NULL },
-    { 'i', NULL, 1, opt_include_option, 0,
-      N_("add include path"), N_("path") },
-    { 'I', NULL, 1, opt_include_option, 0,
-      N_("add include path"), N_("path") },
-    { 'P', NULL, 1, opt_preproc_option, 0,
-      N_("pre-include file"), N_("filename") },
-    { 'd', NULL, 1, opt_preproc_option, 1,
-      N_("pre-define a macro, optionally to value"), N_("macro[=value]") },
-    { 'D', NULL, 1, opt_preproc_option, 1,
-      N_("pre-define a macro, optionally to value"), N_("macro[=value]") },
-    { 'u', NULL, 1, opt_preproc_option, 2,
-      N_("undefine a macro"), N_("macro") },
-    { 'U', NULL, 1, opt_preproc_option, 2,
-      N_("undefine a macro"), N_("macro") },
-    { 'X', NULL, 1, opt_ewmsg_handler, 0,
-      N_("select error/warning message style (`gnu' or `vc')"), N_("style") },
-    { 0, "prefix", 1, opt_prefix_handler, 0,
-      N_("prepend argument to name of all external symbols"), N_("prefix") },
-    { 0, "suffix", 1, opt_suffix_handler, 0,
-      N_("append argument to name of all external symbols"), N_("suffix") },
-    { 0, "postfix", 1, opt_suffix_handler, 0,
-      N_("append argument to name of all external symbols"), N_("suffix") },
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-    { 'N', "plugin", 1, opt_plugin_handler, 0,
-      N_("load plugin module"), N_("plugin") },
-#endif
-};
-
-/* version message */
-/*@observer@*/ static const char *version_msg[] = {
-    PACKAGE_STRING,
-    "Compiled on " __DATE__ ".",
-    "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
-    "Run yasm --license for licensing overview and summary."
-};
-
-/* help messages */
-/*@observer@*/ static const char *help_head = N_(
-    "usage: vsyasm [option]* file...\n"
-    "Options:\n");
-/*@observer@*/ static const char *help_tail = N_(
-    "\n"
-    "Files are asm sources to be assembled.\n"
-    "\n"
-    "Sample invocation:\n"
-    "   vsyasm -f win64 -o objdir source1.asm source2.asm\n"
-    "\n"
-    "All options apply to all files.\n"
-    "\n"
-    "Report bugs to bug-yasm@tortall.net\n");
-
-/* parsed command line storage until appropriate modules have been loaded */
-typedef STAILQ_HEAD(constcharparam_head, constcharparam) constcharparam_head;
-
-typedef struct constcharparam {
-    STAILQ_ENTRY(constcharparam) link;
-    const char *param;
-    int id;
-} constcharparam;
-
-static constcharparam_head preproc_options;
-static constcharparam_head input_files;
-static int num_input_files = 0;
-
-static int
-do_assemble(const char *in_filename)
-{
-    yasm_object *object;
-    const char *base_filename;
-    char *fn = NULL;
-    char *obj_filename, *list_filename = NULL, *map_filename = NULL;
-    /*@null@*/ FILE *obj = NULL;
-    yasm_arch_create_error arch_error;
-    yasm_linemap *linemap;
-    yasm_arch *arch = NULL;
-    yasm_preproc *preproc = NULL;
-    yasm_errwarns *errwarns = yasm_errwarns_create();
-    int i, matched;
-
-    /* Initialize line map */
-    linemap = yasm_linemap_create();
-    yasm_linemap_set(linemap, in_filename, 0, 1, 1);
-
-    /* determine the output filenames */
-    /* replace (or add) extension to base filename */
-    yasm__splitpath(in_filename, &base_filename);
-    if (base_filename[0] != '\0')
-        fn = replace_extension(base_filename, objext);
-    if (!fn)
-    {
-        print_error(_("could not determine output filename for `%s'"),
-                    in_filename);
-        return EXIT_FAILURE;
-    }
-    obj_filename = yasm__combpath(objdir_pathname, fn);
-    yasm_xfree(fn);
-
-    if (listdir_pathname) {
-        fn = replace_extension(base_filename, listext);
-        if (!fn)
-        {
-            print_error(_("could not determine list filename for `%s'"),
-                        in_filename);
-            return EXIT_FAILURE;
-        }
-        list_filename = yasm__combpath(listdir_pathname, fn);
-        yasm_xfree(fn);
-    }
-
-    if (mapdir_pathname) {
-        fn = replace_extension(base_filename, mapext);
-        if (!fn)
-        {
-            print_error(_("could not determine map filename for `%s'"),
-                        in_filename);
-            return EXIT_FAILURE;
-        }
-        map_filename = yasm__combpath(mapdir_pathname, fn);
-        yasm_xfree(fn);
-    }
-
-    /* Set up architecture using machine and parser. */
-    if (!machine_name) {
-        /* If we're using x86 and the default objfmt bits is 64, default the
-         * machine to amd64.  When we get more arches with multiple machines,
-         * we should do this in a more modular fashion.
-         */
-        if (strcmp(cur_arch_module->keyword, "x86") == 0 &&
-            cur_objfmt_module->default_x86_mode_bits == 64)
-            machine_name = yasm__xstrdup("amd64");
-        else
-            machine_name =
-                yasm__xstrdup(cur_arch_module->default_machine_keyword);
-    }
-
-    arch = yasm_arch_create(cur_arch_module, machine_name,
-                            cur_parser_module->keyword, &arch_error);
-    if (!arch) {
-        switch (arch_error) {
-            case YASM_ARCH_CREATE_BAD_MACHINE:
-                print_error(_("%s: `%s' is not a valid %s for %s `%s'"),
-                            _("FATAL"), machine_name, _("machine"),
-                            _("architecture"), cur_arch_module->keyword);
-                break;
-            case YASM_ARCH_CREATE_BAD_PARSER:
-                print_error(_("%s: `%s' is not a valid %s for %s `%s'"),
-                            _("FATAL"), cur_parser_module->keyword,
-                            _("parser"), _("architecture"),
-                            cur_arch_module->keyword);
-                break;
-            default:
-                print_error(_("%s: unknown architecture error"), _("FATAL"));
-        }
-
-        return EXIT_FAILURE;
-    }
-
-    /* Create object */
-    object = yasm_object_create(in_filename, obj_filename, arch,
-                                cur_objfmt_module, cur_dbgfmt_module);
-    if (!object) {
-        yasm_error_class eclass;
-        unsigned long xrefline;
-        /*@only@*/ /*@null@*/ char *estr, *xrefstr;
-
-        yasm_error_fetch(&eclass, &estr, &xrefline, &xrefstr);
-        print_error("%s: %s", _("FATAL"), estr);
-        yasm_xfree(estr);
-        yasm_xfree(xrefstr);
-        return EXIT_FAILURE;
-    }
-
-    /* Get a fresh copy of objfmt_module as it may have changed. */
-    cur_objfmt_module = ((yasm_objfmt_base *)object->objfmt)->module;
-
-    /* Check to see if the requested preprocessor is in the allowed list
-     * for the active parser.
-     */
-    matched = 0;
-    for (i=0; cur_parser_module->preproc_keywords[i]; i++)
-        if (yasm__strcasecmp(cur_parser_module->preproc_keywords[i],
-                             cur_preproc_module->keyword) == 0)
-            matched = 1;
-    if (!matched) {
-        print_error(_("%s: `%s' is not a valid %s for %s `%s'"), _("FATAL"),
-                    cur_preproc_module->keyword, _("preprocessor"),
-                    _("parser"), cur_parser_module->keyword);
-        yasm_object_destroy(object);
-        return EXIT_FAILURE;
-    }
-
-    if (global_prefix)
-        yasm_object_set_global_prefix(object, global_prefix);
-    if (global_suffix)
-        yasm_object_set_global_suffix(object, global_suffix);
-
-    preproc = yasm_preproc_create(cur_preproc_module, in_filename,
-                                  object->symtab, linemap, errwarns);
-
-    apply_preproc_builtins(preproc);
-    apply_preproc_standard_macros(preproc, cur_parser_module->stdmacs);
-    apply_preproc_standard_macros(preproc, cur_objfmt_module->stdmacs);
-    apply_preproc_saved_options(preproc);
-
-    /* Get initial x86 BITS setting from object format */
-    if (strcmp(cur_arch_module->keyword, "x86") == 0) {
-        yasm_arch_set_var(arch, "mode_bits",
-                          cur_objfmt_module->default_x86_mode_bits);
-    }
-
-    yasm_arch_set_var(arch, "force_strict", force_strict);
-
-    /* Try to enable the map file via a map NASM directive.  This is
-     * somewhat of a hack.
-     */
-    if (map_filename) {
-        const yasm_directive *dir = &cur_objfmt_module->directives[0];
-        matched = 0;
-        for (; dir && dir->name; dir++) {
-            if (yasm__strcasecmp(dir->name, "map") == 0 &&
-                yasm__strcasecmp(dir->parser, "nasm") == 0) {
-                yasm_valparamhead vps;
-                yasm_valparam *vp;
-                matched = 1;
-                yasm_vps_initialize(&vps);
-                vp = yasm_vp_create_string(NULL, yasm__xstrdup(map_filename));
-                yasm_vps_append(&vps, vp);
-                dir->handler(object, &vps, NULL, 0);
-                yasm_vps_delete(&vps);
-            }
-        }
-        if (!matched) {
-            print_error(
-                _("warning: object format `%s' does not support map files"),
-                cur_objfmt_module->keyword);
-        }
-    }
-
-    /* Parse! */
-    cur_parser_module->do_parse(object, preproc, list_filename != NULL,
-                                linemap, errwarns);
-
-    if (check_errors(errwarns, object, linemap, preproc, arch) == EXIT_FAILURE)
-        return EXIT_FAILURE;
-
-    /* Finalize parse */
-    yasm_object_finalize(object, errwarns);
-    if (check_errors(errwarns, object, linemap, preproc, arch) == EXIT_FAILURE)
-        return EXIT_FAILURE;
-
-    /* Optimize */
-    yasm_object_optimize(object, errwarns);
-    if (check_errors(errwarns, object, linemap, preproc, arch) == EXIT_FAILURE)
-        return EXIT_FAILURE;
-
-    /* generate any debugging information */
-    yasm_dbgfmt_generate(object, linemap, errwarns);
-    if (check_errors(errwarns, object, linemap, preproc, arch) == EXIT_FAILURE)
-        return EXIT_FAILURE;
-
-    /* open the object file for output (if not already opened by dbg objfmt) */
-    if (!obj && strcmp(cur_objfmt_module->keyword, "dbg") != 0) {
-        obj = open_file(obj_filename, "wb");
-        if (!obj) {
-            yasm_preproc_destroy(preproc);
-            yasm_object_destroy(object);
-            yasm_linemap_destroy(linemap);
-            yasm_errwarns_destroy(errwarns);
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* Write the object file */
-    yasm_objfmt_output(object, obj?obj:stderr,
-                       strcmp(cur_dbgfmt_module->keyword, "null"), errwarns);
-
-    /* Close object file */
-    if (obj)
-        fclose(obj);
-
-    /* If we had an error at this point, we also need to delete the output
-     * object file (to make sure it's not left newer than the source).
-     */
-    if (yasm_errwarns_num_errors(errwarns, warning_error) > 0)
-        remove(obj_filename);
-    if (check_errors(errwarns, object, linemap, preproc, arch) == EXIT_FAILURE)
-        return EXIT_FAILURE;
-
-    /* Open and write the list file */
-    if (list_filename) {
-        yasm_listfmt *cur_listfmt;
-        FILE *list = open_file(list_filename, "wt");
-        if (!list) {
-            yasm_preproc_destroy(preproc);
-            yasm_object_destroy(object);
-            yasm_linemap_destroy(linemap);
-            yasm_errwarns_destroy(errwarns);
-            return EXIT_FAILURE;
-        }
-        /* Initialize the list format */
-        cur_listfmt = yasm_listfmt_create(cur_listfmt_module, in_filename,
-                                          obj_filename);
-        yasm_listfmt_output(cur_listfmt, list, linemap, arch);
-        yasm_listfmt_destroy(cur_listfmt);
-        fclose(list);
-    }
-
-    yasm_errwarns_output_all(errwarns, linemap, warning_error,
-                             print_yasm_error, print_yasm_warning);
-
-    yasm_preproc_destroy(preproc);
-    yasm_object_destroy(object);
-    yasm_linemap_destroy(linemap);
-    yasm_errwarns_destroy(errwarns);
-
-    yasm_xfree(obj_filename);
-    yasm_xfree(map_filename);
-    yasm_xfree(list_filename);
-    return EXIT_SUCCESS;
-}
-
-/* main function */
-/*@-globstate -unrecog@*/
-int
-main(int argc, char *argv[])
-{
-    size_t i;
-    constcharparam *infile;
-
-    errfile = stderr;
-
-#if defined(HAVE_SETLOCALE) && defined(HAVE_LC_MESSAGES)
-    setlocale(LC_MESSAGES, "");
-#endif
-#if defined(LOCALEDIR)
-    bindtextdomain(PACKAGE, LOCALEDIR);
-#endif
-    textdomain(PACKAGE);
-
-    /* Initialize errwarn handling */
-    yasm_internal_error_ = handle_yasm_int_error;
-    yasm_fatal = handle_yasm_fatal;
-    yasm_gettext_hook = handle_yasm_gettext;
-    yasm_errwarn_initialize();
-
-    /* Initialize BitVector (needed for intnum/floatnum). */
-    if (BitVector_Boot() != ErrCode_Ok) {
-        print_error(_("%s: could not initialize BitVector"), _("FATAL"));
-        return EXIT_FAILURE;
-    }
-
-    /* Initialize intnum and floatnum */
-    yasm_intnum_initialize();
-    yasm_floatnum_initialize();
-
-#ifdef CMAKE_BUILD
-    /* Load standard modules */
-#ifdef BUILD_SHARED_LIBS
-    if (!load_plugin("yasmstd")) {
-        print_error(_("%s: could not load standard modules"), _("FATAL"));
-        return EXIT_FAILURE;
-    }
-#else
-    yasm_init_plugin();
-#endif
-#endif
-
-    /* Initialize parameter storage */
-    STAILQ_INIT(&preproc_options);
-    STAILQ_INIT(&input_files);
-
-    if (parse_cmdline(argc, argv, options, NELEMS(options), print_error))
-        return EXIT_FAILURE;
-
-    switch (special_options) {
-        case SPECIAL_SHOW_HELP:
-            /* Does gettext calls internally */
-            help_msg(help_head, help_tail, options, NELEMS(options));
-            return EXIT_SUCCESS;
-        case SPECIAL_SHOW_VERSION:
-            for (i=0; i<NELEMS(version_msg); i++)
-                printf("%s\n", version_msg[i]);
-            return EXIT_SUCCESS;
-        case SPECIAL_SHOW_LICENSE:
-            for (i=0; i<NELEMS(license_msg); i++)
-                printf("%s\n", license_msg[i]);
-            return EXIT_SUCCESS;
-        case SPECIAL_LISTED:
-            /* Printed out earlier */
-            return EXIT_SUCCESS;
-    }
-
-    /* Open error file if specified. */
-    if (error_filename) {
-        int j;
-        errfile = open_file(error_filename, "wt");
-        if (!errfile)
-            return EXIT_FAILURE;
-
-        /* Print command line as first line in error file. */
-        for (j=0; j<argc; j++)
-            fprintf(errfile, "%s%c", argv[j], (j==argc-1) ? '\n' : ' ');
-    }
-
-    /* If not already specified, default to win32 as the object format. */
-    if (!cur_objfmt_module) {
-        if (!objfmt_keyword)
-            objfmt_keyword = yasm__xstrdup("win32");
-        cur_objfmt_module = yasm_load_objfmt(objfmt_keyword);
-        if (!cur_objfmt_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("object format"));
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* Default to x86 as the architecture */
-    if (!cur_arch_module) {
-        cur_arch_module = yasm_load_arch("x86");
-        if (!cur_arch_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("architecture"));
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* Check for arch help */
-    if (machine_name && strcmp(machine_name, "help") == 0) {
-        const yasm_arch_machine *m = cur_arch_module->machines;
-        printf(_("Available %s for %s `%s':\n"), _("machines"),
-               _("architecture"), cur_arch_module->keyword);
-        while (m->keyword && m->name) {
-            print_list_keyword_desc(m->name, m->keyword);
-            m++;
-        }
-        return EXIT_SUCCESS;
-    }
-
-    /* Default to NASM as the parser */
-    if (!cur_parser_module) {
-        cur_parser_module = yasm_load_parser("nasm");
-        if (!cur_parser_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("parser"));
-            cleanup();
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* If not already specified, default to the parser's default preproc. */
-    if (!cur_preproc_module) {
-        cur_preproc_module =
-            yasm_load_preproc(cur_parser_module->default_preproc_keyword);
-        if (!cur_preproc_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("preprocessor"));
-            cleanup();
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* Determine input filenames. */
-    if (STAILQ_EMPTY(&input_files)) {
-        print_error(_("No input files specified"));
-        return EXIT_FAILURE;
-    }
-
-    /* If list file enabled, make sure we have a list format loaded. */
-    if (listdir_pathname) {
-        /* If not already specified, default to nasm as the list format. */
-        if (!cur_listfmt_module) {
-            cur_listfmt_module = yasm_load_listfmt("nasm");
-            if (!cur_listfmt_module) {
-                print_error(_("%s: could not load default %s"), _("FATAL"),
-                            _("list format"));
-                return EXIT_FAILURE;
-            }
-        }
-    }
-
-    /* If not already specified, default to null as the debug format. */
-    if (!cur_dbgfmt_module) {
-        cur_dbgfmt_module = yasm_load_dbgfmt("null");
-        if (!cur_dbgfmt_module) {
-            print_error(_("%s: could not load default %s"), _("FATAL"),
-                        _("debug format"));
-            return EXIT_FAILURE;
-        }
-    }
-
-    /* If not already specified, output to the current directory. */
-    if (!objdir_pathname)
-        objdir_pathname = yasm__xstrdup("./");
-    else if ((i = yasm__createpath(objdir_pathname)) > 0 &&
-             num_input_files > 1) {
-        objdir_pathname[i] = '/';
-        objdir_pathname[i+1] = '\0';
-    }
-
-    /* Create other output directories if necessary */
-    if (listdir_pathname && (i = yasm__createpath(listdir_pathname)) > 0 &&
-        num_input_files > 1) {
-        listdir_pathname[i] = '/';
-        listdir_pathname[i+1] = '\0';
-    }
-    if (mapdir_pathname && (i = yasm__createpath(mapdir_pathname)) > 0 &&
-        num_input_files > 1) {
-        mapdir_pathname[i] = '/';
-        mapdir_pathname[i+1] = '\0';
-    }
-
-    /* If not already specified, set file extensions */
-    if (!objext && cur_objfmt_module->extension)
-        objext = yasm__xstrdup(cur_objfmt_module->extension);
-    if (!listext)
-        listext = yasm__xstrdup("lst");
-    if (!mapext)
-        mapext = yasm__xstrdup("map");
-
-    /* Assemble each input file.  Terminate on first error. */
-    STAILQ_FOREACH(infile, &input_files, link)
-    {
-        if (do_assemble(infile->param) == EXIT_FAILURE) {
-            cleanup();
-            return EXIT_FAILURE;
-        }
-    }
-    cleanup();
-    return EXIT_SUCCESS;
-}
-/*@=globstate =unrecog@*/
-
-/* Open the object file.  Returns 0 on failure. */
-static FILE *
-open_file(const char *filename, const char *mode)
-{
-    FILE *f;
-
-    f = fopen(filename, mode);
-    if (!f)
-        print_error(_("could not open file `%s'"), filename);
-    return f;
-}
-
-static int
-check_errors(yasm_errwarns *errwarns, yasm_object *object,
-             yasm_linemap *linemap, yasm_preproc *preproc, yasm_arch *arch)
-{
-    if (yasm_errwarns_num_errors(errwarns, warning_error) > 0) {
-        yasm_errwarns_output_all(errwarns, linemap, warning_error,
-                                 print_yasm_error, print_yasm_warning);
-        yasm_preproc_destroy(preproc);
-        yasm_object_destroy(object);
-        yasm_linemap_destroy(linemap);
-        yasm_errwarns_destroy(errwarns);
-        return EXIT_FAILURE;
-    }
-    return EXIT_SUCCESS;
-}
-
-/* Define DO_FREE to 1 to enable deallocation of all data structures.
- * Useful for detecting memory leaks, but slows down execution unnecessarily
- * (as the OS will free everything we miss here).
- */
-#define DO_FREE         1
-
-/* Cleans up all allocated structures. */
-static void
-cleanup(void)
-{
-    if (DO_FREE) {
-        yasm_floatnum_cleanup();
-        yasm_intnum_cleanup();
-
-        yasm_errwarn_cleanup();
-
-        BitVector_Shutdown();
-    }
-
-    if (DO_FREE) {
-        free_input_filenames();
-        if (objdir_pathname)
-            yasm_xfree(objdir_pathname);
-        if (listdir_pathname)
-            yasm_xfree(listdir_pathname);
-        if (mapdir_pathname)
-            yasm_xfree(mapdir_pathname);
-        if (objext)
-            yasm_xfree(objext);
-        if (listext)
-            yasm_xfree(listext);
-        if (mapext)
-            yasm_xfree(mapext);
-        if (machine_name)
-            yasm_xfree(machine_name);
-        if (objfmt_keyword)
-            yasm_xfree(objfmt_keyword);
-        free_preproc_saved_options();
-    }
-
-    if (errfile != stderr && errfile != stdout)
-        fclose(errfile);
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-    unload_plugins();
-#endif
-}
-
-static void
-free_input_filenames(void)
-{
-    constcharparam *cp, *cpnext;
-    cp = STAILQ_FIRST(&input_files);
-    while (cp != NULL) {
-        cpnext = STAILQ_NEXT(cp, link);
-        yasm_xfree(cp);
-        cp = cpnext;
-    }
-    STAILQ_INIT(&input_files);
-}
-
-/*
- *  Command line options handlers
- */
-int
-not_an_option_handler(char *param)
-{
-    constcharparam *cp;
-    cp = yasm_xmalloc(sizeof(constcharparam));
-    cp->param = param;
-    cp->id = 0;
-    STAILQ_INSERT_TAIL(&input_files, cp, link);
-    ++num_input_files;
-    return 0;
-}
-
-int
-other_option_handler(char *option)
-{
-    /* Accept, but ignore, -O and -Onnn, for compatibility with NASM. */
-    if (option[0] == '-' && option[1] == 'O') {
-        int n = 2;
-        for (;;) {
-            if (option[n] == '\0')
-                return 0;
-            if (!isdigit(option[n]))
-                return 1;
-            n++;
-        }
-    }
-    return 1;
-}
-
-static int
-opt_special_handler(/*@unused@*/ char *cmd, /*@unused@*/ char *param, int extra)
-{
-    if (special_options == 0)
-        special_options = extra;
-    return 0;
-}
-
-static int
-opt_arch_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    assert(param != NULL);
-    cur_arch_module = yasm_load_arch(param);
-    if (!cur_arch_module) {
-        if (!strcmp("help", param)) {
-            printf(_("Available yasm %s:\n"), _("architectures"));
-            yasm_list_arch(print_list_keyword_desc);
-            special_options = SPECIAL_LISTED;
-            return 0;
-        }
-        print_error(_("%s: unrecognized %s `%s'"), _("FATAL"),
-                    _("architecture"), param);
-        exit(EXIT_FAILURE);
-    }
-    return 0;
-}
-
-static int
-opt_parser_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    assert(param != NULL);
-    cur_parser_module = yasm_load_parser(param);
-    if (!cur_parser_module) {
-        if (!strcmp("help", param)) {
-            printf(_("Available yasm %s:\n"), _("parsers"));
-            yasm_list_parser(print_list_keyword_desc);
-            special_options = SPECIAL_LISTED;
-            return 0;
-        }
-        print_error(_("%s: unrecognized %s `%s'"), _("FATAL"), _("parser"),
-                    param);
-        exit(EXIT_FAILURE);
-    }
-    return 0;
-}
-
-static int
-opt_preproc_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    assert(param != NULL);
-    cur_preproc_module = yasm_load_preproc(param);
-    if (!cur_preproc_module) {
-        if (!strcmp("help", param)) {
-            printf(_("Available yasm %s:\n"), _("preprocessors"));
-            yasm_list_preproc(print_list_keyword_desc);
-            special_options = SPECIAL_LISTED;
-            return 0;
-        }
-        print_error(_("%s: unrecognized %s `%s'"), _("FATAL"),
-                    _("preprocessor"), param);
-        exit(EXIT_FAILURE);
-    }
-    return 0;
-}
-
-static int
-opt_objfmt_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    size_t i;
-    assert(param != NULL);
-    cur_objfmt_module = yasm_load_objfmt(param);
-    if (!cur_objfmt_module) {
-        if (!strcmp("help", param)) {
-            printf(_("Available yasm %s:\n"), _("object formats"));
-            yasm_list_objfmt(print_list_keyword_desc);
-            special_options = SPECIAL_LISTED;
-            return 0;
-        }
-        print_error(_("%s: unrecognized %s `%s'"), _("FATAL"),
-                    _("object format"), param);
-        exit(EXIT_FAILURE);
-    }
-    if (objfmt_keyword)
-        yasm_xfree(objfmt_keyword);
-    objfmt_keyword = yasm__xstrdup(param);
-    for (i=0; i<strlen(objfmt_keyword); i++)
-        objfmt_keyword[i] = tolower(objfmt_keyword[i]);
-    return 0;
-}
-
-static int
-opt_dbgfmt_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    assert(param != NULL);
-    cur_dbgfmt_module = yasm_load_dbgfmt(param);
-    if (!cur_dbgfmt_module) {
-        if (!strcmp("help", param)) {
-            printf(_("Available yasm %s:\n"), _("debug formats"));
-            yasm_list_dbgfmt(print_list_keyword_desc);
-            special_options = SPECIAL_LISTED;
-            return 0;
-        }
-        print_error(_("%s: unrecognized %s `%s'"), _("FATAL"),
-                    _("debug format"), param);
-        exit(EXIT_FAILURE);
-    }
-    return 0;
-}
-
-static int
-opt_listfmt_handler(/*@unused@*/ char *cmd, char *param,
-                    /*@unused@*/ int extra)
-{
-    assert(param != NULL);
-    cur_listfmt_module = yasm_load_listfmt(param);
-    if (!cur_listfmt_module) {
-        if (!strcmp("help", param)) {
-            printf(_("Available yasm %s:\n"), _("list formats"));
-            yasm_list_listfmt(print_list_keyword_desc);
-            special_options = SPECIAL_LISTED;
-            return 0;
-        }
-        print_error(_("%s: unrecognized %s `%s'"), _("FATAL"),
-                    _("list format"), param);
-        exit(EXIT_FAILURE);
-    }
-    return 0;
-}
-
-static int
-opt_listdir_handler(/*@unused@*/ char *cmd, char *param,
-                    /*@unused@*/ int extra)
-{
-    if (listdir_pathname) {
-        print_error(
-            _("warning: can output to only one list dir, last specified used"));
-        yasm_xfree(listdir_pathname);
-    }
-
-    assert(param != NULL);
-    listdir_pathname = yasm_xmalloc(strlen(param)+2);
-    strcpy(listdir_pathname, param);
-
-    return 0;
-}
-
-static int
-opt_objdir_handler(/*@unused@*/ char *cmd, char *param,
-                   /*@unused@*/ int extra)
-{
-    if (objdir_pathname) {
-        print_error(
-            _("warning: can output to only one object dir, last specified used"));
-        yasm_xfree(objdir_pathname);
-    }
-
-    assert(param != NULL);
-    objdir_pathname = yasm_xmalloc(strlen(param)+2);
-    strcpy(objdir_pathname, param);
-
-    return 0;
-}
-
-static int
-opt_mapdir_handler(/*@unused@*/ char *cmd, char *param,
-                   /*@unused@*/ int extra)
-{
-    if (mapdir_pathname) {
-        print_error(
-            _("warning: can output to only one map file, last specified used"));
-        yasm_xfree(mapdir_pathname);
-    }
-
-    assert(param != NULL);
-    mapdir_pathname = yasm_xmalloc(strlen(param)+2);
-    strcpy(mapdir_pathname, param);
-
-    return 0;
-}
-
-static int
-opt_listext_handler(/*@unused@*/ char *cmd, char *param,
-                    /*@unused@*/ int extra)
-{
-    if (listext) {
-        print_error(
-            _("warning: can set only one list extension, last specified used"));
-        yasm_xfree(listext);
-    }
-    assert(param != NULL);
-    listext = yasm__xstrdup(param);
-    return 0;
-}
-
-static int
-opt_objext_handler(/*@unused@*/ char *cmd, char *param,
-                   /*@unused@*/ int extra)
-{
-    if (objext) {
-        print_error(
-            _("warning: can set only one object extension, last specified used"));
-        yasm_xfree(objext);
-    }
-    assert(param != NULL);
-    objext = yasm__xstrdup(param);
-    return 0;
-}
-
-static int
-opt_mapext_handler(/*@unused@*/ char *cmd, char *param,
-                   /*@unused@*/ int extra)
-{
-    if (mapext) {
-        print_error(
-            _("warning: can set only one map extension, last specified used"));
-        yasm_xfree(mapext);
-    }
-    assert(param != NULL);
-    mapext = yasm__xstrdup(param);
-    return 0;
-}
-
-static int
-opt_machine_handler(/*@unused@*/ char *cmd, char *param,
-                    /*@unused@*/ int extra)
-{
-    if (machine_name)
-        yasm_xfree(machine_name);
-
-    assert(param != NULL);
-    machine_name = yasm__xstrdup(param);
-
-    return 0;
-}
-
-static int
-opt_strict_handler(/*@unused@*/ char *cmd,
-                   /*@unused@*/ /*@null@*/ char *param,
-                   /*@unused@*/ int extra)
-{
-    force_strict = 1;
-    return 0;
-}
-
-static int
-opt_warning_handler(char *cmd, /*@unused@*/ char *param, int extra)
-{
-    /* is it disabling the warning instead of enabling? */
-    void (*action)(yasm_warn_class wclass) = yasm_warn_enable;
-
-    if (extra == 1) {
-        /* -w, disable warnings */
-        yasm_warn_disable_all();
-        return 0;
-    }
-
-    /* skip past 'W' */
-    cmd++;
-
-    /* detect no- prefix to disable the warning */
-    if (cmd[0] == 'n' && cmd[1] == 'o' && cmd[2] == '-') {
-        action = yasm_warn_disable;
-        cmd += 3;   /* skip past it to get to the warning name */
-    }
-
-    if (cmd[0] == '\0')
-        /* just -W or -Wno-, so definitely not valid */
-        return 1;
-    else if (strcmp(cmd, "error") == 0)
-        warning_error = (action == yasm_warn_enable);
-    else if (strcmp(cmd, "unrecognized-char") == 0)
-        action(YASM_WARN_UNREC_CHAR);
-    else if (strcmp(cmd, "orphan-labels") == 0)
-        action(YASM_WARN_ORPHAN_LABEL);
-    else if (strcmp(cmd, "uninit-contents") == 0)
-        action(YASM_WARN_UNINIT_CONTENTS);
-    else if (strcmp(cmd, "size-override") == 0)
-        action(YASM_WARN_SIZE_OVERRIDE);
-    else
-        return 1;
-
-    return 0;
-}
-
-static int
-opt_error_file(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    if (error_filename) {
-        print_error(
-            _("warning: can output to only one error file, last specified used"));
-        yasm_xfree(error_filename);
-    }
-
-    assert(param != NULL);
-    error_filename = yasm__xstrdup(param);
-
-    return 0;
-}
-
-static int
-opt_error_stdout(/*@unused@*/ char *cmd, /*@unused@*/ char *param,
-                 /*@unused@*/ int extra)
-{
-    /* Clear any specified error filename */
-    if (error_filename) {
-        yasm_xfree(error_filename);
-        error_filename = NULL;
-    }
-    errfile = stdout;
-    return 0;
-}
-
-static int
-opt_include_option(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    yasm_add_include_path(param);
-    return 0;
-}
-
-static int
-opt_preproc_option(/*@unused@*/ char *cmd, char *param, int extra)
-{
-    constcharparam *cp;
-    cp = yasm_xmalloc(sizeof(constcharparam));
-    cp->param = param;
-    cp->id = extra;
-    STAILQ_INSERT_TAIL(&preproc_options, cp, link);
-    return 0;
-}
-
-static int
-opt_ewmsg_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    if (yasm__strcasecmp(param, "gnu") == 0 ||
-        yasm__strcasecmp(param, "gcc") == 0) {
-        ewmsg_style = EWSTYLE_GNU;
-    } else if (yasm__strcasecmp(param, "vc") == 0) {
-        ewmsg_style = EWSTYLE_VC;
-    } else
-        print_error(_("warning: unrecognized message style `%s'"), param);
-
-    return 0;
-}
-
-static int
-opt_prefix_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    if (global_prefix)
-        yasm_xfree(global_prefix);
-
-    assert(param != NULL);
-    global_prefix = yasm__xstrdup(param);
-
-    return 0;
-}
-
-static int
-opt_suffix_handler(/*@unused@*/ char *cmd, char *param, /*@unused@*/ int extra)
-{
-    if (global_suffix)
-        yasm_xfree(global_suffix);
-
-    assert(param != NULL);
-    global_suffix = yasm__xstrdup(param);
-
-    return 0;
-}
-
-#if defined(CMAKE_BUILD) && defined(BUILD_SHARED_LIBS)
-static int
-opt_plugin_handler(/*@unused@*/ char *cmd, char *param,
-                   /*@unused@*/ int extra)
-{
-    if (!load_plugin(param))
-        print_error(_("warning: could not load plugin `%s'"), param);
-    return 0;
-}
-#endif
-
-static void
-apply_preproc_builtins(yasm_preproc *preproc)
-{
-    char *predef;
-
-    /* Define standard YASM assembly-time macro constants */
-    predef = yasm_xmalloc(strlen("__YASM_OBJFMT__=")
-                          + strlen(objfmt_keyword) + 1);
-    strcpy(predef, "__YASM_OBJFMT__=");
-    strcat(predef, objfmt_keyword);
-    yasm_preproc_define_builtin(preproc, predef);
-    yasm_xfree(predef);
-}
-
-static void
-apply_preproc_standard_macros(yasm_preproc *preproc, const yasm_stdmac *stdmacs)
-{
-    int i, matched;
-
-    if (!stdmacs)
-        return;
-
-    matched = -1;
-    for (i=0; stdmacs[i].parser; i++)
-        if (yasm__strcasecmp(stdmacs[i].parser,
-                             cur_parser_module->keyword) == 0 &&
-            yasm__strcasecmp(stdmacs[i].preproc,
-                             cur_preproc_module->keyword) == 0)
-            matched = i;
-    if (matched >= 0 && stdmacs[matched].macros)
-        yasm_preproc_add_standard(preproc, stdmacs[matched].macros);
-}
-
-static void
-apply_preproc_saved_options(yasm_preproc *preproc)
-{
-    constcharparam *cp;
-
-    void (*funcs[3])(yasm_preproc *, const char *);
-    funcs[0] = cur_preproc_module->add_include_file;
-    funcs[1] = cur_preproc_module->predefine_macro;
-    funcs[2] = cur_preproc_module->undefine_macro;
-
-    STAILQ_FOREACH(cp, &preproc_options, link) {
-        if (0 <= cp->id && cp->id < 3 && funcs[cp->id])
-            funcs[cp->id](preproc, cp->param);
-    }
-}
-
-static void
-free_preproc_saved_options(void)
-{
-    constcharparam *cp, *cpnext;
-    cp = STAILQ_FIRST(&preproc_options);
-    while (cp != NULL) {
-        cpnext = STAILQ_NEXT(cp, link);
-        yasm_xfree(cp);
-        cp = cpnext;
-    }
-    STAILQ_INIT(&preproc_options);
-}
-
-/* Replace extension on a filename (or append one if none is present).
- * If output filename would be identical to input (same extension out as in),
- * returns NULL.
- * A NULL ext means the trailing '.' should NOT be included, whereas a "" ext
- * means the trailing '.' should be included.
- */
-static char *
-replace_extension(const char *orig, /*@null@*/ const char *ext)
-{
-    char *out, *outext;
-    size_t outlen;
-
-    /* allocate enough space for full existing name + extension */
-    outlen = strlen(orig) + 2;
-    if (ext)
-        outlen += strlen(ext) + 1;
-    out = yasm_xmalloc(outlen);
-
-    strcpy(out, orig);
-    outext = strrchr(out, '.');
-    if (outext) {
-        /* Existing extension: make sure it's not the same as the replacement
-         * (as we don't want to overwrite the source file).
-         */
-        outext++;   /* advance past '.' */
-        if (ext && strcmp(outext, ext) == 0) {
-            outext = NULL;  /* indicate default should be used */
-            print_error(_("file name already ends in `.%s'"), ext);
-        }
-    } else {
-        /* No extension: make sure the output extension is not empty
-         * (again, we don't want to overwrite the source file).
-         */
-        if (!ext) {
-            outext = NULL;
-            print_error(_("file name already has no extension"));
-        } else {
-            outext = strrchr(out, '\0');    /* point to end of the string */
-            *outext++ = '.';                /* append '.' */
-        }
-    }
-
-    /* replace extension or use default name */
-    if (outext) {
-        if (!ext) {
-            /* Back up and replace '.' with string terminator */
-            outext--;
-            *outext = '\0';
-        } else
-            strcpy(outext, ext);
-    } else
-        return NULL;
-
-    return out;
-}
-
-void
-print_list_keyword_desc(const char *name, const char *keyword)
-{
-    printf("%4s%-12s%s\n", "", keyword, name);
-}
-
-static void
-print_error(const char *fmt, ...)
-{
-    va_list va;
-    fprintf(errfile, "vsyasm: ");
-    va_start(va, fmt);
-    vfprintf(errfile, fmt, va);
-    va_end(va);
-    fputc('\n', errfile);
-}
-
-static /*@exits@*/ void
-handle_yasm_int_error(const char *file, unsigned int line, const char *message)
-{
-    fprintf(stderr, _("INTERNAL ERROR at %s, line %u: %s\n"), file, line,
-            gettext(message));
-#ifdef HAVE_ABORT
-    abort();
-#else
-    exit(EXIT_FAILURE);
-#endif
-}
-
-static /*@exits@*/ void
-handle_yasm_fatal(const char *fmt, va_list va)
-{
-    fprintf(errfile, "vsyasm: %s: ", _("FATAL"));
-    vfprintf(errfile, gettext(fmt), va);
-    fputc('\n', errfile);
-    exit(EXIT_FAILURE);
-}
-
-static const char *
-handle_yasm_gettext(const char *msgid)
-{
-    return gettext(msgid);
-}
-
-static const char *fmt[2] = {
-        "%s:%lu: %s%s\n",       /* GNU */
-        "%s(%lu) : %s%s\n"      /* VC */
-};
-
-static const char *fmt_noline[2] = {
-        "%s: %s%s\n",   /* GNU */
-        "%s : %s%s\n"   /* VC */
-};
-
-static void
-print_yasm_error(const char *filename, unsigned long line, const char *msg,
-                 const char *xref_fn, unsigned long xref_line,
-                 const char *xref_msg)
-{
-    if (line)
-        fprintf(errfile, fmt[ewmsg_style], filename, line, _("error: "), msg);
-    else
-        fprintf(errfile, fmt_noline[ewmsg_style], filename, _("error: "), msg);
-
-    if (xref_fn && xref_msg) {
-        if (xref_line)
-            fprintf(errfile, fmt[ewmsg_style], xref_fn, xref_line, _("error: "),
-                    xref_msg);
-        else
-            fprintf(errfile, fmt_noline[ewmsg_style], xref_fn, _("error: "),
-                    xref_msg);
-    }
-}
-
-static void
-print_yasm_warning(const char *filename, unsigned long line, const char *msg)
-{
-    if (line)
-        fprintf(errfile, fmt[ewmsg_style], filename, line, _("warning: "),
-                msg);
-    else
-        fprintf(errfile, fmt_noline[ewmsg_style], filename, _("warning: "),
-                msg);
-}
diff --git a/contrib/tools/yasm/frontends/yasm/yasm-plugin.c b/contrib/tools/yasm/frontends/yasm/yasm-plugin.c
deleted file mode 100644
index c64edc32f0..0000000000
--- a/contrib/tools/yasm/frontends/yasm/yasm-plugin.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Semi-portable (Windows and Unix) plugin loading
- *
- *  Copyright (C) 2008  Peter Johnson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <util.h>
-
-#include <string.h>
-
-#include "libyasm-stdint.h"
-#include "yasm-plugin.h"
-
-#if defined(_MSC_VER)
-#include <windows.h>
-#elif defined(__GNUC__)
-#include <dlfcn.h>
-#endif
-
-static void **loaded_plugins = NULL;
-static int num_loaded_plugins = 0;
-
-static void *
-load_dll(const char *name)
-{
-#if defined(_MSC_VER)
-    return LoadLibrary(name);
-#elif defined(__GNUC__)
-    return dlopen(name, RTLD_NOW);
-#else
-    return NULL;
-#endif
-}
-
-int
-load_plugin(const char *name)
-{
-    char *path;
-    void *lib = NULL;
-    void (*init_plugin) (void) = NULL;
-
-    /* Load library */
-
-    path = yasm_xmalloc(strlen(name)+10);
-#if defined(_MSC_VER)
-    strcpy(path, name);
-    strcat(path, ".dll");
-    lib = load_dll(path);
-#elif defined(__GNUC__)
-    strcpy(path, "lib");
-    strcat(path, name);
-    strcat(path, ".so");
-    lib = load_dll(path);
-    if (!lib) {
-        strcpy(path, name);
-        strcat(path, ".so");
-        lib = load_dll(path);
-    }
-#endif
-    yasm_xfree(path);
-    if (!lib)
-        lib = load_dll(name);
-
-    if (!lib)
-        return 0;       /* Didn't load successfully */
-
-    /* Add to array of loaded plugins */
-    loaded_plugins =
-        yasm_xrealloc(loaded_plugins, (num_loaded_plugins+1)*sizeof(void *));
-    loaded_plugins[num_loaded_plugins] = lib;
-    num_loaded_plugins++;
-
-    /* Get yasm_init_plugin() function and run it */
-
-#if defined(_MSC_VER)
-    init_plugin =
-        (void (*)(void))GetProcAddress((HINSTANCE)lib, "yasm_init_plugin");
-#elif defined(__GNUC__)
-    init_plugin = (void (*)(void))(uintptr_t)dlsym(lib, "yasm_init_plugin");
-#endif
-
-    if (!init_plugin)
-        return 0;       /* Didn't load successfully */
-
-    init_plugin();
-    return 1;
-}
-
-void
-unload_plugins(void)
-{
-    int i;
-
-    if (!loaded_plugins)
-        return;
-
-    for (i = 0; i < num_loaded_plugins; i++) {
-#if defined(_MSC_VER)
-        FreeLibrary((HINSTANCE)loaded_plugins[i]);
-#elif defined(__GNUC__)
-        dlclose(loaded_plugins[i]);
-#endif
-    }
-    yasm_xfree(loaded_plugins);
-    num_loaded_plugins = 0;
-}