- add FE support for MS _AddressOfReturnAddress()

[cparser] / driver / firm_cmdline.c

diff --git a/driver/firm_cmdline.c b/driver/firm_cmdline.c
index d15e13f..a004be6 100644 (file)
--- a/driver/firm_cmdline.c
+++ b/driver/firm_cmdline.c
@@ -12,7 +12,7 @@
 #include <libfirm/firm.h>
 #include <libfirm/be.h>
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
 #define DEFAULT_OS OS_SUPPORT_MINGW
 #elif defined(__APPLE__)
 #define DEFAULT_OS OS_SUPPORT_MACHO
@@ -58,7 +58,7 @@ struct a_firm_opt firm_opt = {
   /* deconv          = */ FALSE,
   /* cc_opt          = */ TRUE,
   /* bool_opt        = */ FALSE,
-  /* end_melt        = */ FALSE,
+  /* shape_blocks    = */ FALSE,
   /* freestanding;   = */ FALSE,
   /* fp_model        = */ fp_model_precise,
   /* lower_ll        = */ FALSE,
@@ -199,8 +199,8 @@ static const struct params {
   { X("no-opt-cc"),              &firm_opt.cc_opt,           0, "firm: disable calling conventions optimization" },
   { X("bool"),                   &firm_opt.bool_opt,         1, "firm: enable bool simplification optimization" },
   { X("no-bool"),                &firm_opt.bool_opt,         0, "firm: disable bool simplification optimization" },
-  { X("end-melt"),               &firm_opt.end_melt,         1, "firm: enable end block melting" },
-  { X("no-end-melt"),            &firm_opt.end_melt,         0, "firm: disable end block melting" },
+  { X("shape-blocks"),           &firm_opt.shape_blocks,     1, "firm: enable block shaping" },
+  { X("no-shape-blcoks"),        &firm_opt.shape_blocks,     0, "firm: disable block shaping" },
   { X("freestanding"),           &firm_opt.freestanding,     1, "firm: freestanding environment" },
   { X("hosted"),                 &firm_opt.freestanding,     0, "firm: hosted environment" },
 
@@ -326,7 +326,7 @@ static void disable_opts(void) {
   firm_opt.deconv          = FALSE;
   firm_opt.cc_opt          = FALSE;
   firm_opt.bool_opt        = FALSE;
-  firm_opt.end_melt        = FALSE;
+  firm_opt.shape_blocks    = FALSE;
   firm_opt.freestanding    = TRUE;
 }  /* disable_opts */
 
@@ -414,29 +414,7 @@ int firm_be_option(const char *opt) {
 #ifdef FIRM_BACKEND
   return be_parse_arg(opt);
 #else
+  (void)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 */