From a055fdb88eee871fd525953969970fcd0c4f7fff Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Tue, 9 Dec 2008 07:57:24 +0000 Subject: [PATCH] adapt for latest firm changes [r24431] --- driver/firm_cmdline.c | 23 ----------------------- driver/firm_cmdline.h | 5 ----- driver/firm_opt.c | 1 - main.c | 18 ++++++++++-------- 4 files changed, 10 insertions(+), 37 deletions(-) diff --git a/driver/firm_cmdline.c b/driver/firm_cmdline.c index bf66c6e..bab94ef 100644 --- a/driver/firm_cmdline.c +++ b/driver/firm_cmdline.c @@ -417,26 +417,3 @@ int firm_be_option(const char *opt) { return 0; #endif /* FIRM_BACKEND */ } /* firm_be_option */ - -/** - * prints the firm version number - */ -void print_firm_version(FILE *f) { - firm_version_t version; - - firm_get_version(&version); - - fprintf(f, "Firm C-Compiler using libFirm (%u.%u", version.major, version.minor); - if (version.revision[0] != 0) { - fputc(' ', f); - fputs(version.revision, f); - } - if(version.build[0] != 0) { - fputc(' ', f); - fputs(version.build, f); - } - fprintf(f, "}\n" - "(C) 2005-2008 Michael Beck\n" - "(C) 1995-2008 University of Karlsruhe\n" - "Using "); -} /* print_firm_version */ diff --git a/driver/firm_cmdline.h b/driver/firm_cmdline.h index 75d1408..484cb52 100644 --- a/driver/firm_cmdline.h +++ b/driver/firm_cmdline.h @@ -138,11 +138,6 @@ extern struct a_firm_dump firm_dump; extern struct a_firm_ext_grs firm_ext_grs; -/** - * prints the firm version number - */ -void print_firm_version(FILE *f); - /** * called by the generic command line parser * to handle the --firm= or -f options diff --git a/driver/firm_opt.c b/driver/firm_opt.c index de1be15..7d9ec80 100644 --- a/driver/firm_opt.c +++ b/driver/firm_opt.c @@ -1074,5 +1074,4 @@ void firm_early_init(void) { /* arg: need this here for command line options */ be_opt_register(); - firm_init_options(NULL, 0, NULL); } diff --git a/main.c b/main.c index cf2a084..0104f31 100644 --- a/main.c +++ b/main.c @@ -517,18 +517,20 @@ static void usage(const char *argv0) } static void print_cparser_version(void) { - firm_version_t ver; - firm_get_version(&ver); - printf("cparser (%s) using libFirm (%u.%u", - cparser_REVISION, ver.major, ver.minor); - if (ver.revision[0] != 0) { + cparser_REVISION, firm_get_version_major(), + firm_get_version_minor()); + + const char *revision = firm_get_version_revision(); + if (revision[0] != 0) { putchar(' '); - fputs(ver.revision, stdout); + fputs(revision, stdout); } - if (ver.build[0] != 0) { + + const char *build = firm_get_version_build(); + if (build[0] != 0) { putchar(' '); - fputs(ver.build, stdout); + fputs(build, stdout); } puts(")\n"); } -- 2.20.1