X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=85964f0454f92d486e6ac94fe2f674040f1d5f98;hb=6833c6f5a5ade3d5ad0c9ec21c9a89b7985517f4;hp=77bf0c620a627f3267c7d00d00ff7a8cd3bb52db;hpb=09a8bede94a4eae894820ceb9aaa556cec8455ef;p=cparser

diff --git a/main.c b/main.c
index 77bf0c6..85964f0 100644
--- a/main.c
+++ b/main.c
@@ -70,67 +70,54 @@
 #include "diagnostic.h"
 #include "lang_features.h"
 #include "driver/firm_opt.h"
-#include "driver/firm_cmdline.h"
 #include "driver/firm_timing.h"
+#include "driver/firm_machine.h"
 #include "adt/error.h"
+#include "adt/strutil.h"
 #include "wrappergen/write_fluffy.h"
-#include "wrappergen/write_caml.h"
 #include "wrappergen/write_jna.h"
 #include "revision.h"
 #include "warning.h"
+#include "help.h"
 #include "mangle.h"
 #include "printer.h"
 
 #ifndef PREPROCESSOR
 #ifndef __WIN32__
-#define PREPROCESSOR "gcc -E -m32 -U__STRICT_ANSI__"
+#define PREPROCESSOR "gcc -E -U__STRICT_ANSI__"
 #else
-#define PREPROCESSOR "cpp -m32 -U__STRICT_ANSI__"
+#define PREPROCESSOR "cpp -U__STRICT_ANSI__"
 #endif
 #endif
 
 #ifndef LINKER
-#define LINKER    "gcc -m32"
+#define LINKER    "gcc"
 #endif
 
 #ifndef ASSEMBLER
-#ifdef __APPLE__
-#define ASSEMBLER "gcc -m32 -c -xassembler"
-#else
-#define ASSEMBLER "as --32"
-#endif
+#define ASSEMBLER "gcc -c -xassembler"
 #endif
 
-/** The current c mode/dialect. */
-unsigned int c_mode = _C89 | _ANSI | _C99 | _GNUC;
-
-/** The 'machine size', 16, 32 or 64 bit, 32bit is the default. */
-unsigned int machine_size = 32;
-
-/** true if the char type is signed. */
-bool char_is_signed = true;
-
-/** true for strict language checking. */
-bool strict_mode = false;
-
-/** use builtins for some libc functions */
-bool use_builtins = false;
-
-/** we have extern function with const attribute. */
-bool have_const_functions = false;
-
-atomic_type_kind_t wchar_atomic_kind = ATOMIC_TYPE_INT;
-
-/* to switch on printing of implicit casts */
-extern bool print_implicit_casts;
-
-/* to switch on printing of parenthesis to indicate operator precedence */
-extern bool print_parenthesis;
-
-static int             verbose;
-static struct obstack  cppflags_obst, ldflags_obst;
-static char            dep_target[1024];
-static const char     *outname;
+unsigned int        c_mode                    = _C89 | _ANSI | _C99 | _GNUC;
+bool                byte_order_big_endian     = false;
+bool                strict_mode               = false;
+bool                enable_main_collect2_hack = false;
+bool                freestanding              = false;
+unsigned            architecture_modulo_shift = 0;
+
+static bool               char_is_signed      = true;
+static atomic_type_kind_t wchar_atomic_kind   = ATOMIC_TYPE_INT;
+
+static machine_triple_t *target_machine;
+static const char       *target_triple;
+static int               verbose;
+static struct obstack    cppflags_obst;
+static struct obstack    ldflags_obst;
+static struct obstack    asflags_obst;
+static char              dep_target[1024];
+static const char       *outname;
+static bool              define_intmax_types;
+static const char       *input_encoding;
 
 typedef enum lang_standard_t {
 	STANDARD_DEFAULT, /* gnu99 (for C, GCC does gnu89) or gnu++98 (for C++) */
@@ -169,32 +156,6 @@ struct file_list_entry_t {
 
 static file_list_entry_t *temp_files;
 
-#if defined(_DEBUG) || defined(FIRM_DEBUG)
-/**
- * Debug printf implementation.
- *
- * @param fmt  printf style format parameter
- */
-void dbg_printf(const char *fmt, ...)
-{
-	va_list list;
-
-	if (firm_dump.debug_print) {
-		va_start(list, fmt);
-		vprintf(fmt, list);
-		va_end(list);
-	}  /* if */
-}
-#endif /* defined(_DEBUG) || defined(FIRM_DEBUG) */
-
-static void initialize_firm(void)
-{
-	firm_early_init();
-
-	dump_consts_local(1);
-	dump_keepalive_edges(1);
-}
-
 static void get_output_name(char *buf, size_t buflen, const char *inputname,
                             const char *newext)
 {
@@ -218,33 +179,30 @@ static void get_output_name(char *buf, size_t buflen, const char *inputname,
 		panic("filename too long");
 }
 
-#include "gen_builtins.h"
-
 static translation_unit_t *do_parsing(FILE *const in, const char *const input_name)
 {
 	start_parsing();
 
-	if (use_builtins) {
-		lexer_open_buffer(builtins, sizeof(builtins)-1, "<builtin>");
-		parse();
-	}
-
-	lexer_open_stream(in, input_name);
+	input_t *input = input_from_stream(in, input_encoding);
+	lexer_switch_input(input, input_name);
 	parse();
-
 	translation_unit_t *unit = finish_parsing();
+	input_free(input);
+
 	return unit;
 }
 
 static void lextest(FILE *in, const char *fname)
 {
-	lexer_open_stream(in, fname);
+	input_t *input = input_from_stream(in, input_encoding);
+	lexer_switch_input(input, fname);
 
 	do {
 		lexer_next_preprocessing_token();
 		print_token(stdout, &lexer_token);
 		putchar('\n');
-	} while (lexer_token.type != T_EOF);
+	} while (lexer_token.kind != T_EOF);
+	input_free(input);
 }
 
 static void add_flag(struct obstack *obst, const char *format, ...)
@@ -317,17 +275,12 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
 		add_flag(&cppflags_obst, "-U__VERSION__");
 		add_flag(&cppflags_obst, "-D__VERSION__=\"%s\"", cparser_REVISION);
 
-		/* TODO hack... */
-		add_flag(&cppflags_obst, "-D__builtin_abort=abort");
-		add_flag(&cppflags_obst, "-D__builtin_abs=abs");
-		add_flag(&cppflags_obst, "-D__builtin_exit=exit");
-		add_flag(&cppflags_obst, "-D__builtin_malloc=malloc");
-		add_flag(&cppflags_obst, "-D__builtin_memcmp=memcmp");
-		add_flag(&cppflags_obst, "-D__builtin_memcpy=memcpy");
-		add_flag(&cppflags_obst, "-D__builtin_memset=memset");
-		add_flag(&cppflags_obst, "-D__builtin_strlen=strlen");
-		add_flag(&cppflags_obst, "-D__builtin_strcmp=strcmp");
-		add_flag(&cppflags_obst, "-D__builtin_strcpy=strcpy");
+		if (define_intmax_types) {
+			add_flag(&cppflags_obst, "-U__INTMAX_TYPE__");
+			add_flag(&cppflags_obst, "-D__INTMAX_TYPE__=%s", type_to_string(type_intmax_t));
+			add_flag(&cppflags_obst, "-U__UINTMAX_TYPE__");
+			add_flag(&cppflags_obst, "-D__UINTMAX_TYPE__=%s", type_to_string(type_uintmax_t));
+		}
 
 		if (flags[0] != '\0') {
 			size_t len = strlen(flags);
@@ -341,10 +294,14 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
 	assert(obstack_object_size(&cppflags_obst) == 0);
 
 	const char *preprocessor = getenv("CPARSER_PP");
-	if (preprocessor == NULL)
-		preprocessor = PREPROCESSOR;
+	if (preprocessor != NULL) {
+		obstack_printf(&cppflags_obst, "%s ", preprocessor);
+	} else {
+		if (target_triple != NULL)
+			obstack_printf(&cppflags_obst, "%s-", target_triple);
+		obstack_printf(&cppflags_obst, PREPROCESSOR);
+	}
 
-	obstack_printf(&cppflags_obst, "%s ", preprocessor);
 	switch (filetype) {
 	case FILETYPE_C:
 		add_flag(&cppflags_obst, "-std=c99");
@@ -371,43 +328,52 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
 		}
 	}
 	add_flag(&cppflags_obst, fname);
-
 	obstack_1grow(&cppflags_obst, '\0');
-	char *buf = obstack_finish(&cppflags_obst);
+
+	char *commandline = obstack_finish(&cppflags_obst);
 	if (verbose) {
-		puts(buf);
+		puts(commandline);
 	}
-
-	FILE *f = popen(buf, "r");
+	FILE *f = popen(commandline, "r");
 	if (f == NULL) {
 		fprintf(stderr, "invoking preprocessor failed\n");
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
-
-	/* we don't really need that anymore */
-	obstack_free(&cppflags_obst, buf);
+	/* we do not really need that anymore */
+	obstack_free(&cppflags_obst, commandline);
 
 	return f;
 }
 
 static void assemble(const char *out, const char *in)
 {
-	char buf[65536];
+	obstack_1grow(&asflags_obst, '\0');
+	const char *flags = obstack_finish(&asflags_obst);
 
 	const char *assembler = getenv("CPARSER_AS");
-	if (assembler == NULL)
-		assembler = ASSEMBLER;
+	if (assembler != NULL) {
+		obstack_printf(&asflags_obst, "%s", assembler);
+	} else {
+		if (target_triple != NULL)
+			obstack_printf(&asflags_obst, "%s-", target_triple);
+		obstack_printf(&asflags_obst, "%s", ASSEMBLER);
+	}
+	if (flags[0] != '\0')
+		obstack_printf(&asflags_obst, " %s", flags);
+
+	obstack_printf(&asflags_obst, " %s -o %s", in, out);
+	obstack_1grow(&asflags_obst, '\0');
 
-	snprintf(buf, sizeof(buf), "%s %s -o %s", assembler, in, out);
+	char *commandline = obstack_finish(&asflags_obst);
 	if (verbose) {
-		puts(buf);
+		puts(commandline);
 	}
-
-	int err = system(buf);
-	if (err != 0) {
+	int err = system(commandline);
+	if (err != EXIT_SUCCESS) {
 		fprintf(stderr, "assembler reported an error\n");
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
+	obstack_free(&asflags_obst, commandline);
 }
 
 static void print_file_name(const char *file)
@@ -419,22 +385,27 @@ static void print_file_name(const char *file)
 
 	/* construct commandline */
 	const char *linker = getenv("CPARSER_LINK");
-	if (linker == NULL)
-		linker = LINKER;
+	if (linker != NULL) {
+		obstack_printf(&ldflags_obst, "%s ", linker);
+	} else {
+		if (target_triple != NULL)
+			obstack_printf(&ldflags_obst, "%s-", target_triple);
+		obstack_printf(&ldflags_obst, "%s ", LINKER);
+	}
 	obstack_printf(&ldflags_obst, "%s ", linker);
 	obstack_printf(&ldflags_obst, "%s", flags);
 	obstack_1grow(&ldflags_obst, '\0');
 
 	char *commandline = obstack_finish(&ldflags_obst);
-
 	if (verbose) {
 		puts(commandline);
 	}
 	int err = system(commandline);
 	if (err != EXIT_SUCCESS) {
 		fprintf(stderr, "linker reported an error\n");
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
+	obstack_free(&ldflags_obst, commandline);
 }
 
 static const char *try_dir(const char *dir)
@@ -499,14 +470,14 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix)
 
 	int fd = mkstemp(buffer);
 	if (fd == -1) {
-		fprintf(stderr, "couldn't create temporary file: %s\n",
+		fprintf(stderr, "could not create temporary file: %s\n",
 		        strerror(errno));
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 	FILE *out = fdopen(fd, "w");
 	if (out == NULL) {
-		fprintf(stderr, "couldn't create temporary file FILE*\n");
-		exit(1);
+		fprintf(stderr, "could not create temporary file FILE*\n");
+		exit(EXIT_FAILURE);
 	}
 
 	file_list_entry_t *entry = xmalloc(sizeof(*entry));
@@ -537,21 +508,6 @@ static void free_temp_files(void)
 	temp_files = NULL;
 }
 
-/**
- * Do the necessary lowering for compound parameters.
- */
-void lower_compound_params(void)
-{
-	lower_params_t params;
-
-	params.def_ptr_alignment    = 4;
-	params.flags                = LF_COMPOUND_RETURN | LF_RETURN_HIDDEN;
-	params.hidden_params        = ADD_HIDDEN_ALWAYS_IN_FRONT;
-	params.find_pointer_type    = NULL;
-	params.ret_compound_in_regs = NULL;
-	lower_calls_with_compounds(&params);
-}
-
 typedef enum compile_mode_t {
 	BenchmarkParser,
 	PreprocessOnly,
@@ -564,13 +520,12 @@ typedef enum compile_mode_t {
 	LexTest,
 	PrintAst,
 	PrintFluffy,
-	PrintCaml,
 	PrintJna
 } compile_mode_t;
 
 static void usage(const char *argv0)
 {
-	fprintf(stderr, "Usage %s input [-o output] [-c]\n", argv0);
+	fprintf(stderr, "Usage %s [options] input [-o output]\n", argv0);
 }
 
 static void print_cparser_version(void)
@@ -595,16 +550,218 @@ static void print_cparser_version(void)
 	     "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
 }
 
-static void set_be_option(const char *arg)
+static void print_help_basic(const char *argv0)
+{
+	usage(argv0);
+	puts("");
+	put_help("--help",                   "Display this information");
+	put_help("--version",                "Display compiler version");
+	put_help("--help-parser",            "Display information about parser options");
+	put_help("--help-warnings",          "Display information about warning options");
+	put_help("--help-codegen",           "Display information about code-generation options");
+	put_help("--help-optimization",      "Display information about optimization options");
+	put_help("--help-linker",            "Display information about linker options");
+	put_help("--help-language-tools",    "Display information about language tools options");
+	put_help("--help-debug",             "Display information about compiler debugging options");
+	put_help("--help-firm",              "Display information about direct firm options");
+	put_help("--help-all",               "Display information about all options");
+	put_help("-c",                       "Compile and assemble but do not link");
+	put_help("-E",                       "Preprocess only");
+	put_help("-S",                       "Compile but do not assembler or link");
+	put_help("-o",                       "Specify output file");
+	put_help("-v",                       "Verbose output (show invocation of sub-processes)");
+	put_help("-x",                       "Force input language:");
+	put_choice("c",                      "C");
+	put_choice("c++",                    "C++");
+	put_choice("assembler",              "Assembler (no preprocessing)");
+	put_choice("assembler-with-cpp",     "Assembler with preprocessing");
+	put_choice("none",                   "Autodetection");
+	put_help("-pipe",                    "Ignored (gcc compatibility)");
+}
+
+static void print_help_preprocessor(void)
 {
-	int res = firm_be_option(arg);
+	put_help("-nostdinc",                "Do not search standard system include directories");
+	put_help("-trigraphs",               "Support ISO C trigraphs");
+	put_help("-isystem",                 "");
+	put_help("-include",                 "");
+	put_help("-I PATH",                  "");
+	put_help("-D SYMBOL[=value]",        "");
+	put_help("-U SYMBOL",                "");
+	put_help("-Wp,OPTION",               "Pass option directly to preprocessor");
+	put_help("-M",                       "");
+	put_help("-MD",                      "");
+	put_help("-MMD",                     "");
+	put_help("-MM",                      "");
+	put_help("-MP",                      "");
+	put_help("-MT",                      "");
+	put_help("-MQ",                      "");
+	put_help("-MF",                      "");
+}
+
+static void print_help_parser(void)
+{
+	put_help("-finput-charset=CHARSET",  "Select encoding of input files");
+	put_help("-fmessage-length=LEN",     "Ignored (gcc compatibility)");
+	put_help("-fshort-wchar",            "Type \"wchar_t\" is unsigned short instead of int");
+	put_help("-fshow-column",            "Show the column number in diagnostic messages");
+	put_help("-fsigned-char",            "Type \"char\" is a signed type");
+	put_help("-funsigned-char",          "Type \"char\" is an unsigned type");
+	put_help("--ms",                     "Enable msvc extensions");
+	put_help("--no-ms",                  "Disable msvc extensions");
+	put_help("--gcc",                    "Enable gcc extensions");
+	put_help("--no-gcc",                 "Disable gcc extensions");
+	put_help("-std=STANDARD",            "Specify language standard:");
+	put_choice("c99",                    "ISO C99 standard");
+	put_choice("c89",                    "ISO C89 standard");
+	put_choice("c9x",                    "Deprecated");
+	put_choice("c++",                    "ISO C++ 98");
+	put_choice("c++98",                  "ISO C++ 98");
+	put_choice("gnu99",                  "ISO C99 + GNU extensions (default)");
+	put_choice("gnu89",                  "ISO C89 + GNU extensions");
+	put_choice("gnu9x",                  "Deprecated");
+	put_choice("iso9899:1990",           "ISO C89");
+	put_choice("iso9899:199409",         "ISO C90");
+	put_choice("iso9899:1999",           "ISO C99");
+	put_choice("iso9899:199x",           "Deprecated");
+	put_help("-pedantic",                "Ignored (gcc compatibility)");
+	put_help("-ansi",                    "Ignored (gcc compatibility)");
+	put_help("--strict",                 "Enable strict conformance checking");
+}
+
+static void print_help_warnings(void)
+{
+	put_help("-f[no-]diagnostics-show-option", "Show the switch, which controls a warning, after each warning");
+	put_help("-w",                             "Disable all warnings");
+	put_help("-Wno-trigraphs",                 "Warn if input contains trigraphs");
+	put_help("-Wundef",                        "Warn if an undefined macro is used in an #if");
+	put_help("-Wmissing-include-dirs",         "Warn about missing user-specified include directories");
+	put_help("-Wendif-labels",                 "Warn about stray text after #elif and #endif");
+	put_help("-Winit-self",                    "Ignored (gcc compatibility)");
+	put_help("-Wformat-y2k",                   "Ignored (gcc compatibility)");
+	put_help("-Wformat-security",              "Ignored (gcc compatibility)");
+	put_help("-Wold-style-declaration",        "Ignored (gcc compatibility)");
+	put_help("-Wtype-limits",                  "Ignored (gcc compatibility)");
+	print_warning_opt_help();
+}
+
+static void print_help_optimization(void)
+{
+	put_help("-O LEVEL",                 "Select optimization level (0-4)");
+	firm_option_help(put_help);
+	put_help("-fexpensive-optimizations","Ignored (gcc compatibility)");
+}
+
+static void print_help_codegeneration(void)
+{
+	put_help("-g",                       "Generate debug information");
+	put_help("-pg",                      "Instrument code for gnu gprof");
+	put_help("-fomit-frame-pointer",     "Produce code without frame pointer where possible");
+	put_help("-ffreestanding",           "Compile in freestanding mode (see ISO C standard)");
+	put_help("-fhosted",                 "Compile in hosted (not freestanding) mode");
+	put_help("-fprofile-generate",       "Generate instrumented code to collect profile information");
+	put_help("-fprofile-use",            "Use profile information generated by instrumented binaries");
+	put_help("-ffp-precise",             "Precise floating point model");
+	put_help("-ffp-fast",                "Imprecise floating point model");
+	put_help("-ffp-strict",              "Strict floating point model");
+	put_help("-pthread",                 "Use pthread threading library");
+	put_help("-mtarget=TARGET",          "Specify target architecture as CPU-manufacturer-OS triple");
+	put_help("-mtriple=TARGET",          "Alias for -mtarget (clang compatibility)");
+	put_help("-march=ARCH",              "");
+	put_help("-mtune=ARCH",              "");
+	put_help("-mcpu=CPU",                "");
+	put_help("-mfpmath=",                "");
+	put_help("-mpreferred-stack-boundary=", "");
+	put_help("-mrtd",                    "");
+	put_help("-mregparm=",               "Not supported yet");
+	put_help("-msoft-float",             "Not supported yet");
+	put_help("-m32",                     "Generate 32bit code");
+	put_help("-m64",                     "Generate 64bit code");
+	put_help("-fverbose-asm",            "Ignored (gcc compatibility)");
+	put_help("-fjump-tables",            "Ignored (gcc compatibility)");
+	put_help("-fcommon",                 "Ignored (gcc compatibility)");
+	put_help("-foptimize-sibling-calls", "Ignored (gcc compatibility)");
+	put_help("-falign-loops",            "Ignored (gcc compatibility)");
+	put_help("-falign-jumps",            "Ignored (gcc compatibility)");
+	put_help("-falign-functions",        "Ignored (gcc compatibility)");
+	put_help("-fPIC",                    "Ignored (gcc compatibility)");
+	put_help("-ffast-math",              "Same as -ffp-fast (gcc compatibility)");
+	puts("");
+	puts("\tMost of these options can be used with a no- prefix to disable them");
+	puts("\te.g. -fno-omit-frame-pointer");
+}
+
+static void print_help_linker(void)
+{
+	put_help("-l LIBRARY",               "");
+	put_help("-L PATH",                  "");
+	put_help("-s",                       "Do not produce symbol table and relocation information");
+	put_help("-shared",                  "Produce a shared library");
+	put_help("-static",                  "Produce statically linked binary");
+	put_help("-Wl,OPTION",               "Pass option directly to linker");
+}
+
+static void print_help_debug(void)
+{
+	put_help("--lextest",                "Preprocess and tokenize only");
+	put_help("--print-ast",              "Preprocess, parse and print AST");
+	put_help("--print-implicit-cast",    "");
+	put_help("--print-parenthesis",      "");
+	put_help("--benchmark",              "Preprocess and parse, produces no output");
+	put_help("--time",                   "Measure time of compiler passes");
+	put_help("--dump-function func",     "Preprocess, parse and output vcg graph of func");
+	put_help("--export-ir",              "Preprocess, parse and output compiler intermediate representation");
+}
+
+static void print_help_language_tools(void)
+{
+	put_help("--print-fluffy",           "Preprocess, parse and generate declarations for the fluffy language");
+	put_help("--print-jna",              "Preprocess, parse and generate declarations for JNA");
+	put_help("--jna-limit filename",     "");
+	put_help("--jna-libname name",       "");
+}
+
+static void print_help_firm(void)
+{
+	put_help("-bOPTION",                 "Directly pass option to libFirm backend");
+	int res = be_parse_arg("help");
 	(void) res;
 	assert(res);
 }
 
-static void set_option(const char *arg)
+typedef enum {
+	HELP_NONE          = 0,
+	HELP_BASIC         = 1u << 0,
+	HELP_PREPROCESSOR  = 1u << 1,
+	HELP_PARSER        = 1u << 2,
+	HELP_WARNINGS      = 1u << 3,
+	HELP_OPTIMIZATION  = 1u << 4,
+	HELP_CODEGEN       = 1u << 5,
+	HELP_LINKER        = 1u << 6,
+	HELP_LANGUAGETOOLS = 1u << 7,
+	HELP_DEBUG         = 1u << 8,
+	HELP_FIRM          = 1u << 9,
+
+	HELP_ALL           = (unsigned)-1
+} help_sections_t;
+
+static void print_help(const char *argv0, help_sections_t sections)
 {
-	int res = firm_option(arg);
+	if (sections & HELP_BASIC)         print_help_basic(argv0);
+	if (sections & HELP_PREPROCESSOR)  print_help_preprocessor();
+	if (sections & HELP_PARSER)        print_help_parser();
+	if (sections & HELP_WARNINGS)      print_help_warnings();
+	if (sections & HELP_OPTIMIZATION)  print_help_optimization();
+	if (sections & HELP_CODEGEN)       print_help_codegeneration();
+	if (sections & HELP_LINKER)        print_help_linker();
+	if (sections & HELP_LANGUAGETOOLS) print_help_language_tools();
+	if (sections & HELP_DEBUG)         print_help_debug();
+	if (sections & HELP_FIRM)          print_help_firm();
+}
+
+static void set_be_option(const char *arg)
+{
+	int res = be_parse_arg(arg);
 	(void) res;
 	assert(res);
 }
@@ -616,25 +773,11 @@ static void copy_file(FILE *dest, FILE *input)
 	while (!feof(input) && !ferror(dest)) {
 		size_t read = fread(buf, 1, sizeof(buf), input);
 		if (fwrite(buf, 1, read, dest) != read) {
-			perror("couldn't write output");
+			perror("could not write output");
 		}
 	}
 }
 
-static inline bool streq(char const* a, char const* b)
-{
-	return strcmp(a, b) == 0;
-}
-
-static inline bool strstart(char const* str, char const* start)
-{
-	do {
-		if (*start == '\0')
-			return true;
-	} while (*str++ == *start++);
-	return false;
-}
-
 static FILE *open_file(const char *filename)
 {
 	if (streq(filename, "-")) {
@@ -643,9 +786,9 @@ static FILE *open_file(const char *filename)
 
 	FILE *in = fopen(filename, "r");
 	if (in == NULL) {
-		fprintf(stderr, "Couldn't open '%s': %s\n", filename,
+		fprintf(stderr, "Could not open '%s': %s\n", filename,
 				strerror(errno));
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	return in;
@@ -667,28 +810,244 @@ static filetype_t get_filetype_from_string(const char *string)
 	return FILETYPE_UNKNOWN;
 }
 
-static void init_os_support(void)
+static bool is_windows_os(const char *os)
 {
-	/* OS option must be set to the backend */
-	switch (firm_opt.os_support) {
-	case OS_SUPPORT_MINGW:
-		set_be_option("ia32-gasmode=mingw");
-		wchar_atomic_kind = ATOMIC_TYPE_USHORT;
-		break;
-	case OS_SUPPORT_LINUX:
-		set_be_option("ia32-gasmode=elf");
-		break;
-	case OS_SUPPORT_MACHO:
-		set_be_option("ia32-gasmode=macho");
-		set_be_option("ia32-stackalign=4");
-		set_be_option("pic");
-		break;
+	return strstr(os, "mingw") != NULL || streq(os, "win32");
+}
+
+static bool is_unixish_os(const char *os)
+{
+	return strstr(os, "linux") != NULL || strstr(os, "bsd") != NULL
+	       || streq(os, "solaris");
+}
+
+static bool is_darwin_os(const char *os)
+{
+	return streq(os, "darwin");
+}
+
+static bool init_os_support(void)
+{
+	const char *os = target_machine->operating_system;
+	wchar_atomic_kind         = ATOMIC_TYPE_INT;
+	enable_main_collect2_hack = false;
+	define_intmax_types       = false;
+
+	if (is_unixish_os(os)) {
+		set_create_ld_ident(create_name_linux_elf);
+	} else if (is_darwin_os(os)) {
+		set_create_ld_ident(create_name_macho);
+		define_intmax_types = true;
+	} else if (is_windows_os(os)) {
+		wchar_atomic_kind         = ATOMIC_TYPE_USHORT;
+		enable_main_collect2_hack = true;
+		set_create_ld_ident(create_name_win32);
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+static bool parse_target_triple(const char *arg)
+{
+	machine_triple_t *triple = firm_parse_machine_triple(arg);
+	if (triple == NULL) {
+		fprintf(stderr, "Target-triple is not in the form 'cpu_type-manufacturer-operating_system'\n");
+		return false;
+	}
+	target_machine = triple;
+	return true;
+}
+
+static unsigned decide_modulo_shift(unsigned type_size)
+{
+	if (architecture_modulo_shift == 0)
+		return 0;
+	if (type_size < architecture_modulo_shift)
+		return architecture_modulo_shift;
+	return type_size;
+}
+
+static bool is_ia32_cpu(const char *architecture)
+{
+	return streq(architecture, "i386")
+	    || streq(architecture, "i486")
+	    || streq(architecture, "i586")
+	    || streq(architecture, "i686")
+	    || streq(architecture, "i786");
+}
+
+static const char *setup_isa_from_tripel(const machine_triple_t *machine)
+{
+	const char *cpu = machine->cpu_type;
+
+	if (is_ia32_cpu(cpu)) {
+		return "ia32";
+	} else if (streq(cpu, "x86_64")) {
+		return "amd64";
+	} else if (streq(cpu, "sparc")) {
+		return "sparc";
+	} else if (streq(cpu, "arm")) {
+		return "arm";
+	} else {
+		fprintf(stderr, "Unknown cpu '%s' in target-triple\n", cpu);
+		return NULL;
+	}
+}
+
+static const char *setup_target_machine(void)
+{
+	if (!setup_firm_for_machine(target_machine))
+		exit(1);
+
+	const char *isa = setup_isa_from_tripel(target_machine);
+
+	if (isa == NULL)
+		exit(1);
+
+	init_os_support();
+
+	return isa;
+}
+
+/**
+ * initialize cparser type properties based on a firm type
+ */
+static void set_typeprops_type(atomic_type_properties_t* props, ir_type *type)
+{
+	props->size             = get_type_size_bytes(type);
+	props->alignment        = get_type_alignment_bytes(type);
+	props->struct_alignment = props->alignment;
+}
+
+/**
+ * Copy atomic type properties except the integer conversion rank
+ */
+static void copy_typeprops(atomic_type_properties_t *dest,
+                           const atomic_type_properties_t *src)
+{
+	dest->size             = src->size;
+	dest->alignment        = src->alignment;
+	dest->struct_alignment = src->struct_alignment;
+	dest->flags            = src->flags;
+}
+
+static void init_types_and_adjust(void)
+{
+	const backend_params *be_params = be_get_backend_param();
+	unsigned machine_size = be_params->machine_size;
+	init_types(machine_size);
+
+	atomic_type_properties_t *props = atomic_type_properties;
+
+	/* adjust types as requested by target architecture */
+	ir_type *type_long_double = be_params->type_long_double;
+	if (type_long_double != NULL)
+		set_typeprops_type(&props[ATOMIC_TYPE_LONG_DOUBLE], type_long_double);
+
+	ir_type *type_long_long = be_params->type_long_long;
+	if (type_long_long != NULL)
+		set_typeprops_type(&props[ATOMIC_TYPE_LONGLONG], type_long_long);
+
+	ir_type *type_unsigned_long_long = be_params->type_unsigned_long_long;
+	if (type_unsigned_long_long != NULL)
+		set_typeprops_type(&props[ATOMIC_TYPE_ULONGLONG], type_unsigned_long_long);
+
+	/* operating system ABI specifics */
+	const char *os = target_machine->operating_system;
+	if (is_darwin_os(os)) {
+		if (machine_size == 32) {
+			props[ATOMIC_TYPE_LONGLONG].struct_alignment    =  4;
+			props[ATOMIC_TYPE_ULONGLONG].struct_alignment   =  4;
+			props[ATOMIC_TYPE_DOUBLE].struct_alignment      =  4;
+			props[ATOMIC_TYPE_LONG_DOUBLE].size             = 16;
+			props[ATOMIC_TYPE_LONG_DOUBLE].alignment        = 16;
+			props[ATOMIC_TYPE_LONG_DOUBLE].struct_alignment = 16;
+		}
+	} else if (is_windows_os(os)) {
+		if (machine_size == 64) {
+			/* to ease porting of old c-code microsoft decided to use 32bits
+			 * even for long */
+			props[ATOMIC_TYPE_LONG]  = props[ATOMIC_TYPE_INT];
+			props[ATOMIC_TYPE_ULONG] = props[ATOMIC_TYPE_UINT];
+		}
+
+		/* on windows long double is not supported */
+		props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE];
+	} else if (is_unixish_os(os)) {
+		if (is_ia32_cpu(target_machine->cpu_type)) {
+			/* System V has a broken alignment for double so we have to add
+			 * a hack here */
+			props[ATOMIC_TYPE_DOUBLE].struct_alignment    = 4;
+			props[ATOMIC_TYPE_LONGLONG].struct_alignment  = 4;
+			props[ATOMIC_TYPE_ULONGLONG].struct_alignment = 4;
+		}
+	}
+
+	/* stuff decided after processing operating system specifics and
+	 * commandline flags */
+	if (char_is_signed) {
+		props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED;
+	} else {
+		props[ATOMIC_TYPE_CHAR].flags &= ~ATOMIC_TYPE_FLAG_SIGNED;
+	}
+	/* copy over wchar_t properties (including rank) */
+	props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
+
+	/* initialize defaults for unsupported types */
+	if (type_long_long == NULL) {
+		copy_typeprops(&props[ATOMIC_TYPE_LONGLONG], &props[ATOMIC_TYPE_LONG]);
+	}
+	if (type_unsigned_long_long == NULL) {
+		copy_typeprops(&props[ATOMIC_TYPE_ULONGLONG],
+		               &props[ATOMIC_TYPE_ULONG]);
+	}
+	if (type_long_double == NULL) {
+		copy_typeprops(&props[ATOMIC_TYPE_LONG_DOUBLE],
+		               &props[ATOMIC_TYPE_DOUBLE]);
+	}
+
+	/* initialize firm pointer modes */
+	char               name[64];
+	ir_mode_sort       sort         = irms_reference;
+	unsigned           bit_size     = machine_size;
+	bool               is_signed    = 0;
+	ir_mode_arithmetic arithmetic   = irma_twos_complement;
+	unsigned           modulo_shift = decide_modulo_shift(bit_size);
+
+	snprintf(name, sizeof(name), "p%u", machine_size);
+	ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic,
+	                                modulo_shift);
+
+	if (machine_size == 16) {
+		set_reference_mode_signed_eq(ptr_mode, mode_Hs);
+		set_reference_mode_unsigned_eq(ptr_mode, mode_Hu);
+	} else if (machine_size == 32) {
+		set_reference_mode_signed_eq(ptr_mode, mode_Is);
+		set_reference_mode_unsigned_eq(ptr_mode, mode_Iu);
+	} else if (machine_size == 64) {
+		set_reference_mode_signed_eq(ptr_mode, mode_Ls);
+		set_reference_mode_unsigned_eq(ptr_mode, mode_Lu);
+	} else {
+		panic("strange machine_size when determining pointer modes");
+	}
+
+	/* Hmm, pointers should be machine size */
+	set_modeP_data(ptr_mode);
+	set_modeP_code(ptr_mode);
+
+	byte_order_big_endian = be_params->byte_order_big_endian;
+	if (be_params->modulo_shift_efficient) {
+		architecture_modulo_shift = machine_size;
+	} else {
+		architecture_modulo_shift = 0;
 	}
 }
 
 int main(int argc, char **argv)
 {
-	initialize_firm();
+	firm_early_init();
 
 	const char        *dumpfunction         = NULL;
 	const char        *print_file_name_file = NULL;
@@ -700,6 +1059,8 @@ int main(int argc, char **argv)
 	file_list_entry_t *last_file            = NULL;
 	bool               construct_dep_target = false;
 	bool               do_timing            = false;
+	bool               profile_generate     = false;
+	bool               profile_use          = false;
 	struct obstack     file_obst;
 
 	atexit(free_temp_files);
@@ -712,28 +1073,31 @@ int main(int argc, char **argv)
 
 	obstack_init(&cppflags_obst);
 	obstack_init(&ldflags_obst);
+	obstack_init(&asflags_obst);
 	obstack_init(&file_obst);
 
 #define GET_ARG_AFTER(def, args)                                             \
+	do {                                                                     \
 	def = &arg[sizeof(args)-1];                                              \
-	if (def[0] == '\0') {                                                     \
+	if (def[0] == '\0') {                                                    \
 		++i;                                                                 \
-		if (i >= argc) {                                                      \
+		if (i >= argc) {                                                     \
 			fprintf(stderr, "error: expected argument after '" args "'\n");  \
 			argument_errors = true;                                          \
 			break;                                                           \
 		}                                                                    \
 		def = argv[i];                                                       \
-		if (def[0] == '-' && def[1] != '\0') {                                \
+		if (def[0] == '-' && def[1] != '\0') {                               \
 			fprintf(stderr, "error: expected argument after '" args "'\n");  \
 			argument_errors = true;                                          \
 			continue;                                                        \
 		}                                                                    \
-	}
+	}                                                                        \
+	} while (0)
 
 #define SINGLE_OPTION(ch) (option[0] == (ch) && option[1] == '\0')
 
-	/* early options parsing (find out optimisation level and OS) */
+	/* early options parsing (find out optimization level and OS) */
 	for (int i = 1; i < argc; ++i) {
 		const char *arg = argv[i];
 		if (arg[0] != '-')
@@ -743,48 +1107,23 @@ int main(int argc, char **argv)
 		if (option[0] == 'O') {
 			sscanf(&option[1], "%d", &opt_level);
 		}
-		if (strcmp(arg, "-fwin32") == 0) {
-			firm_opt.os_support = OS_SUPPORT_MINGW;
-		} else if (strcmp(arg, "-fmac") == 0) {
-			firm_opt.os_support = OS_SUPPORT_MACHO;
-		} else if (strcmp(arg, "-flinux") == 0) {
-			firm_opt.os_support = OS_SUPPORT_LINUX;
-		}
 	}
 
-	/* set target/os specific stuff */
-	init_os_support();
-
-	/* apply optimisation level */
-	switch(opt_level) {
-	case 0:
-		set_option("no-opt");
-		break;
-	case 1:
-		set_option("no-inline");
-		break;
-	default:
-	case 4:
-		/* use_builtins = true; */
-		/* fallthrough */
-	case 3:
-		set_option("thread-jumps");
-		set_option("if-conversion");
-		/* fallthrough */
-	case 2:
-		set_option("strict-aliasing");
-		set_option("inline");
-		set_option("deconv");
-		set_be_option("omitfp");
-		break;
+	const char *target = getenv("TARGET");
+	if (target != NULL)
+		parse_target_triple(target);
+	if (target_machine == NULL) {
+		target_machine = firm_get_host_machine();
 	}
+	choose_optimization_pack(opt_level);
+	setup_target_machine();
 
 	/* parse rest of options */
-	standard                        = STANDARD_DEFAULT;
+	                standard        = STANDARD_DEFAULT;
 	unsigned        features_on     = 0;
 	unsigned        features_off    = 0;
 	filetype_t      forced_filetype = FILETYPE_AUTODETECT;
-	bool            help_displayed  = false;
+	help_sections_t help            = HELP_NONE;
 	bool            argument_errors = false;
 	for (int i = 1; i < argc; ++i) {
 		const char *arg = argv[i];
@@ -801,6 +1140,8 @@ int main(int argc, char **argv)
 				mode = CompileAssemble;
 			} else if (SINGLE_OPTION('E')) {
 				mode = PreprocessOnly;
+			} else if (SINGLE_OPTION('s')) {
+				add_flag(&ldflags_obst, "-s");
 			} else if (SINGLE_OPTION('S')) {
 				mode = Compile;
 			} else if (option[0] == 'O') {
@@ -828,7 +1169,8 @@ int main(int argc, char **argv)
 			} else if (SINGLE_OPTION('v')) {
 				verbose = 1;
 			} else if (SINGLE_OPTION('w')) {
-				memset(&warning, 0, sizeof(warning));
+				add_flag(&cppflags_obst, "-w");
+				disable_all_warnings();
 			} else if (option[0] == 'x') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-x");
@@ -864,26 +1206,59 @@ int main(int argc, char **argv)
 				GET_ARG_AFTER(opt, "-isystem");
 				add_flag(&cppflags_obst, "-isystem");
 				add_flag(&cppflags_obst, "%s", opt);
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__CYGWIN__)
+			} else if (streq(option, "pthread")) {
+				/* set flags for the preprocessor */
+				add_flag(&cppflags_obst, "-D_REENTRANT");
+				/* set flags for the linker */
+				add_flag(&ldflags_obst, "-lpthread");
+#endif
 			} else if (streq(option, "nostdinc")
 					|| streq(option, "trigraphs")) {
 				/* pass these through to the preprocessor */
 				add_flag(&cppflags_obst, "%s", arg);
 			} else if (streq(option, "pipe")) {
 				/* here for gcc compatibility */
+			} else if (streq(option, "static")) {
+				add_flag(&ldflags_obst, "-static");
+			} else if (streq(option, "shared")) {
+				add_flag(&ldflags_obst, "-shared");
 			} else if (option[0] == 'f') {
 				char const *orig_opt;
 				GET_ARG_AFTER(orig_opt, "-f");
 
-				if (strstart(orig_opt, "align-loops=") ||
-				    strstart(orig_opt, "align-jumps=") ||
-				    strstart(orig_opt, "align-functions=")) {
-					fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
-				} else if (strstart(orig_opt, "input-charset=")) {
+				if (strstart(orig_opt, "input-charset=")) {
 					char const* const encoding = strchr(orig_opt, '=') + 1;
-					select_input_encoding(encoding);
-				} else if (streq(orig_opt, "verbose-asm")) {
-					/* ignore: we always print verbose assembler */
+					input_encoding = encoding;
+				} else if (strstart(orig_opt, "align-loops=") ||
+				           strstart(orig_opt, "align-jumps=") ||
+				           strstart(orig_opt, "align-functions=")) {
+					fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
+				} else if (strstart(orig_opt, "visibility=")) {
+					const char *val = strchr(orig_opt, '=')+1;
+					elf_visibility_tag_t visibility
+						= get_elf_visibility_from_string(val);
+					if (visibility == ELF_VISIBILITY_ERROR) {
+						fprintf(stderr, "invalid visibility '%s' specified\n",
+						        val);
+						argument_errors = true;
+					} else {
+						set_default_visibility(visibility);
+					}
+				} else if (strstart(orig_opt, "message-length=")) {
+					/* ignore: would only affect error message format */
+				} else if (streq(orig_opt, "fast-math") ||
+				           streq(orig_opt, "fp-fast")) {
+					firm_fp_model = fp_model_fast;
+				} else if (streq(orig_opt, "fp-precise")) {
+					firm_fp_model = fp_model_precise;
+				} else if (streq(orig_opt, "fp-strict")) {
+					firm_fp_model = fp_model_strict;
+				} else if (streq(orig_opt, "help")) {
+					fprintf(stderr, "warning: -fhelp is deprecated\n");
+					help |= HELP_OPTIMIZATION;
 				} else {
+					/* -f options which have an -fno- variant */
 					char const *opt         = orig_opt;
 					bool        truth_value = true;
 					if (opt[0] == 'n' && opt[1] == 'o' && opt[2] == '-') {
@@ -891,8 +1266,8 @@ int main(int argc, char **argv)
 						opt += 3;
 					}
 
-					if (streq(opt, "builtins")) {
-						use_builtins = truth_value;
+					if (streq(opt, "diagnostics-show-option")) {
+						diagnostics_show_option = truth_value;
 					} else if (streq(opt, "dollars-in-identifiers")) {
 						allow_dollar_in_symbol = truth_value;
 					} else if (streq(opt, "omit-frame-pointer")) {
@@ -900,22 +1275,41 @@ int main(int argc, char **argv)
 					} else if (streq(opt, "short-wchar")) {
 						wchar_atomic_kind = truth_value ? ATOMIC_TYPE_USHORT
 							: ATOMIC_TYPE_INT;
+					} else if (streq(opt, "show-column")) {
+						show_column = truth_value;
 					} else if (streq(opt, "signed-char")) {
 						char_is_signed = truth_value;
 					} else if (streq(opt, "strength-reduce")) {
-						firm_option(truth_value ? "strength-red" : "no-strength-red");
+						/* does nothing, for gcc compatibility (even gcc does
+						 * nothing for this switch anymore) */
 					} else if (streq(opt, "syntax-only")) {
 						mode = truth_value ? ParseOnly : CompileAssembleLink;
 					} else if (streq(opt, "unsigned-char")) {
 						char_is_signed = !truth_value;
-					} else if (streq(opt, "fast-math")               ||
-					           streq(opt, "jump-tables")             ||
+					} else if (streq(opt, "freestanding")) {
+						freestanding = truth_value;
+					} else if (streq(opt, "hosted")) {
+						freestanding = !truth_value;
+					} else if (streq(opt, "profile-generate")) {
+						profile_generate = truth_value;
+					} else if (streq(opt, "profile-use")) {
+						profile_use = truth_value;
+					} else if (!truth_value &&
+					           streq(opt, "asynchronous-unwind-tables")) {
+					    /* nothing todo, a gcc feature which we do not support
+					     * anyway was deactivated */
+					} else if (streq(opt, "verbose-asm")) {
+						/* ignore: we always print verbose assembler */
+					} else if (streq(opt, "jump-tables")             ||
 					           streq(opt, "expensive-optimizations") ||
 					           streq(opt, "common")                  ||
-					           streq(opt, "PIC")                     ||
+					           streq(opt, "optimize-sibling-calls")  ||
 					           streq(opt, "align-loops")             ||
 					           streq(opt, "align-jumps")             ||
-					           streq(opt, "align-functions")) {
+					           streq(opt, "align-functions")         ||
+					           streq(opt, "PIC")                     ||
+					           streq(opt, "stack-protector")         ||
+					           streq(opt, "stack-protector-all")) {
 						fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
 					} else {
 						int res = firm_option(orig_opt);
@@ -924,23 +1318,25 @@ int main(int argc, char **argv)
 							        orig_opt);
 							argument_errors = true;
 							continue;
-						} else if (res == -1) {
-							help_displayed = true;
 						}
 					}
 				}
 			} else if (option[0] == 'b') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-b");
-				int res = firm_be_option(opt);
-				if (res == 0) {
-					fprintf(stderr, "error: unknown Firm backend option '-b %s'\n",
-					        opt);
-					argument_errors = true;
-				} else if (res == -1) {
-					help_displayed = true;
-				} else if (strstart(opt, "isa=")) {
-					strncpy(cpu_arch, opt, sizeof(cpu_arch));
+
+				if (streq(opt, "help")) {
+					fprintf(stderr, "warning: -bhelp is deprecated (use --help-firm)\n");
+					help |= HELP_FIRM;
+				} else {
+					int res = be_parse_arg(opt);
+					if (res == 0) {
+						fprintf(stderr, "error: unknown Firm backend option '-b %s'\n",
+								opt);
+						argument_errors = true;
+					} else if (strstart(opt, "isa=")) {
+						strncpy(cpu_arch, opt, sizeof(cpu_arch));
+					}
 				}
 			} else if (option[0] == 'W') {
 				if (strstart(option + 1, "p,")) {
@@ -954,8 +1350,17 @@ int main(int argc, char **argv)
 					GET_ARG_AFTER(opt, "-Wl,");
 					add_flag(&ldflags_obst, "-Wl,%s", opt);
 				} else if (streq(option + 1, "no-trigraphs")
-							|| streq(option + 1, "undef")) {
+							|| streq(option + 1, "undef")
+							|| streq(option + 1, "missing-include-dirs")
+							|| streq(option + 1, "endif-labels")) {
 					add_flag(&cppflags_obst, "%s", arg);
+				} else if (streq(option+1, "init-self")) {
+					/* ignored (same as gcc does) */
+				} else if (streq(option+1, "format-y2k")
+				           || streq(option+1, "format-security")
+				           || streq(option+1, "old-style-declaration")
+				           || streq(option+1, "type-limits")) {
+				    /* ignore (gcc compatibility) */
 				} else {
 					set_warning_opt(&option[1]);
 				}
@@ -965,29 +1370,45 @@ int main(int argc, char **argv)
 				char arch_opt[64];
 
 				GET_ARG_AFTER(opt, "-m");
-				if (strstart(opt, "arch=")) {
+				if (strstart(opt, "target=")) {
+					GET_ARG_AFTER(opt, "-mtarget=");
+					if (!parse_target_triple(opt)) {
+						argument_errors = true;
+					} else {
+						const char *isa = setup_target_machine();
+						strncpy(cpu_arch, isa, sizeof(cpu_arch));
+						target_triple = opt;
+					}
+				} else if (strstart(opt, "triple=")) {
+					GET_ARG_AFTER(opt, "-mtriple=");
+					if (!parse_target_triple(opt)) {
+						argument_errors = true;
+					} else {
+						const char *isa = setup_target_machine();
+						strncpy(cpu_arch, isa, sizeof(cpu_arch));
+						target_triple = opt;
+					}
+				} else if (strstart(opt, "arch=")) {
 					GET_ARG_AFTER(opt, "-march=");
 					snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt);
-					int res = firm_be_option(arch_opt);
+					int res = be_parse_arg(arch_opt);
+					snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt);
+					res &= be_parse_arg(arch_opt);
+
 					if (res == 0) {
 						fprintf(stderr, "Unknown architecture '%s'\n", arch_opt);
 						argument_errors = true;
-					} else {
-						snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt);
-						int res = firm_be_option(arch_opt);
-						if (res == 0)
-							argument_errors = true;
 					}
 				} else if (strstart(opt, "tune=")) {
 					GET_ARG_AFTER(opt, "-mtune=");
 					snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt);
-					int res = firm_be_option(arch_opt);
+					int res = be_parse_arg(arch_opt);
 					if (res == 0)
 						argument_errors = true;
 				} else if (strstart(opt, "cpu=")) {
 					GET_ARG_AFTER(opt, "-mcpu=");
 					snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt);
-					int res = firm_be_option(arch_opt);
+					int res = be_parse_arg(arch_opt);
 					if (res == 0)
 						argument_errors = true;
 				} else if (strstart(opt, "fpmath=")) {
@@ -997,39 +1418,46 @@ int main(int argc, char **argv)
 					else if (streq(opt, "sse"))
 						opt = "sse2";
 					else {
-						fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n");
+						fprintf(stderr, "error: option -mfpmath supports only 387 or sse\n");
 						argument_errors = true;
 					}
 					if (!argument_errors) {
 						snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt);
-						int res = firm_be_option(arch_opt);
+						int res = be_parse_arg(arch_opt);
 						if (res == 0)
 							argument_errors = true;
 					}
 				} else if (strstart(opt, "preferred-stack-boundary=")) {
 					GET_ARG_AFTER(opt, "-mpreferred-stack-boundary=");
 					snprintf(arch_opt, sizeof(arch_opt), "%s-stackalign=%s", cpu_arch, opt);
-					int res = firm_be_option(arch_opt);
+					int res = be_parse_arg(arch_opt);
 					if (res == 0)
 						argument_errors = true;
-				} else if (streq(opt, "omit-leaf-frame-pointer")) {
-					set_be_option("omitleaffp=1");
-				} else if (streq(opt, "no-omit-leaf-frame-pointer")) {
-					set_be_option("omitleaffp=0");
 				} else if (streq(opt, "rtd")) {
 					default_calling_convention = CC_STDCALL;
+				} else if (strstart(opt, "regparm=")) {
+					fprintf(stderr, "error: regparm convention not supported yet\n");
+					argument_errors = true;
+				} else if (streq(opt, "soft-float")) {
+					add_flag(&ldflags_obst, "-msoft-float");
+					snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=softfloat", cpu_arch);
+					int res = be_parse_arg(arch_opt);
+					if (res == 0)
+						argument_errors = true;
 				} else {
-					char *endptr;
-					long int value = strtol(opt, &endptr, 10);
-					if (*endptr != '\0') {
+					long int value = strtol(opt, NULL, 10);
+					if (value == 0) {
 						fprintf(stderr, "error: wrong option '-m %s'\n",  opt);
 						argument_errors = true;
-					}
-					if (value != 16 && value != 32 && value != 64) {
+					} else if (value != 16 && value != 32 && value != 64) {
 						fprintf(stderr, "error: option -m supports only 16, 32 or 64\n");
 						argument_errors = true;
 					} else {
-						machine_size = (unsigned int)value;
+						unsigned machine_size = (unsigned)value;
+						/* TODO: choose/change backend based on this */
+						add_flag(&cppflags_obst, "-m%u", machine_size);
+						add_flag(&asflags_obst, "-m%u", machine_size);
+						add_flag(&ldflags_obst, "-m%u", machine_size);
 					}
 				}
 			} else if (streq(option, "pg")) {
@@ -1038,8 +1466,6 @@ int main(int argc, char **argv)
 			} else if (streq(option, "pedantic") ||
 			           streq(option, "ansi")) {
 				fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
-			} else if (streq(option, "shared")) {
-				add_flag(&ldflags_obst, "-shared");
 			} else if (strstart(option, "std=")) {
 				const char *const o = &option[4];
 				standard =
@@ -1090,15 +1516,51 @@ int main(int argc, char **argv)
 					print_parenthesis = true;
 				} else if (streq(option, "print-fluffy")) {
 					mode = PrintFluffy;
-				} else if (streq(option, "print-caml")) {
-					mode = PrintCaml;
 				} else if (streq(option, "print-jna")) {
 					mode = PrintJna;
+				} else if (streq(option, "jna-limit")) {
+					++i;
+					if (i >= argc) {
+						fprintf(stderr, "error: "
+						        "expected argument after '--jna-limit'\n");
+						argument_errors = true;
+						break;
+					}
+					jna_limit_output(argv[i]);
+				} else if (streq(option, "jna-libname")) {
+					++i;
+					if (i >= argc) {
+						fprintf(stderr, "error: "
+						        "expected argument after '--jna-libname'\n");
+						argument_errors = true;
+						break;
+					}
+					jna_set_libname(argv[i]);
 				} else if (streq(option, "time")) {
 					do_timing = true;
 				} else if (streq(option, "version")) {
 					print_cparser_version();
-					exit(EXIT_SUCCESS);
+					return EXIT_SUCCESS;
+				} else if (streq(option, "help")) {
+					help |= HELP_BASIC;
+				} else if (streq(option, "help-parser")) {
+					help |= HELP_PARSER;
+				} else if (streq(option, "help-warnings")) {
+					help |= HELP_WARNINGS;
+				} else if (streq(option, "help-codegen")) {
+					help |= HELP_CODEGEN;
+				} else if (streq(option, "help-linker")) {
+					help |= HELP_LINKER;
+				} else if (streq(option, "help-optimization")) {
+					help |= HELP_OPTIMIZATION;
+				} else if (streq(option, "help-language-tools")) {
+					help |= HELP_LANGUAGETOOLS;
+				} else if (streq(option, "help-debug")) {
+					help |= HELP_DEBUG;
+				} else if (streq(option, "help-firm")) {
+					help |= HELP_FIRM;
+				} else if (streq(option, "help-all")) {
+					help |= HELP_ALL;
 				} else if (streq(option, "dump-function")) {
 					++i;
 					if (i >= argc) {
@@ -1134,22 +1596,23 @@ int main(int argc, char **argv)
 							streq(suffix, "S")   ? FILETYPE_ASSEMBLER              :
 							streq(suffix, "a")   ? FILETYPE_OBJECT                 :
 							streq(suffix, "c")   ? FILETYPE_C                      :
+							streq(suffix, "i")   ? FILETYPE_PREPROCESSED_C         :
+							streq(suffix, "C")   ? FILETYPE_CXX                    :
 							streq(suffix, "cc")  ? FILETYPE_CXX                    :
+							streq(suffix, "cp")  ? FILETYPE_CXX                    :
 							streq(suffix, "cpp") ? FILETYPE_CXX                    :
+							streq(suffix, "CPP") ? FILETYPE_CXX                    :
 							streq(suffix, "cxx") ? FILETYPE_CXX                    :
+							streq(suffix, "c++") ? FILETYPE_CXX                    :
+							streq(suffix, "ii")  ? FILETYPE_PREPROCESSED_CXX       :
 							streq(suffix, "h")   ? FILETYPE_C                      :
 							streq(suffix, "ir")  ? FILETYPE_IR                     :
 							streq(suffix, "o")   ? FILETYPE_OBJECT                 :
 							streq(suffix, "s")   ? FILETYPE_PREPROCESSED_ASSEMBLER :
 							streq(suffix, "so")  ? FILETYPE_OBJECT                 :
-							FILETYPE_AUTODETECT;
+							FILETYPE_OBJECT; /* gcc behavior: unknown file extension means object file */
 					}
 				}
-
-				if (type == FILETYPE_AUTODETECT) {
-					fprintf(stderr, "'%s': file format not recognized\n", arg);
-					continue;
-				}
 			}
 
 			file_list_entry_t *entry
@@ -1167,36 +1630,47 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (help != HELP_NONE) {
+		print_help(argv[0], help);
+		return !argument_errors;
+	}
+
 	if (print_file_name_file != NULL) {
 		print_file_name(print_file_name_file);
-		return 0;
+		return EXIT_SUCCESS;
 	}
-
 	if (files == NULL) {
 		fprintf(stderr, "error: no input files specified\n");
 		argument_errors = true;
 	}
 
-	if (help_displayed) {
-		return !argument_errors;
-	}
 	if (argument_errors) {
 		usage(argv[0]);
-		return 1;
+		return EXIT_FAILURE;
 	}
 
-	/* we do the lowering in ast2firm */
-	firm_opt.lower_bitfields = FALSE;
-
-	/* set the c_mode here, types depends on it */
+	/* apply some effects from switches */
 	c_mode |= features_on;
 	c_mode &= ~features_off;
+	if (profile_generate) {
+		add_flag(&ldflags_obst, "-lfirmprof");
+		set_be_option("profilegenerate");
+	}
+	if (profile_use) {
+		set_be_option("profileuse");
+	}
 
 	gen_firm_init();
 	init_symbol_table();
-	init_types();
+	init_types_and_adjust();
 	init_typehash();
 	init_basic_types();
+	if (wchar_atomic_kind == ATOMIC_TYPE_INT)
+		init_wchar_types(type_int);
+	else if (wchar_atomic_kind == ATOMIC_TYPE_SHORT)
+		init_wchar_types(type_short);
+	else
+		panic("unexpected wchar type");
 	init_lexer();
 	init_ast();
 	init_parser();
@@ -1224,7 +1698,6 @@ int main(int argc, char **argv)
 		case BenchmarkParser:
 		case PrintAst:
 		case PrintFluffy:
-		case PrintCaml:
 		case PrintJna:
 		case LexTest:
 		case PreprocessOnly:
@@ -1266,13 +1739,14 @@ int main(int argc, char **argv)
 	} else {
 		out = fopen(outname, "w");
 		if (out == NULL) {
-			fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname,
+			fprintf(stderr, "Could not open '%s' for writing: %s\n", outname,
 					strerror(errno));
-			return 1;
+			return EXIT_FAILURE;
 		}
 	}
 
 	file_list_entry_t *file;
+	bool               already_constructed_firm = false;
 	for (file = files; file != NULL; file = file->next) {
 		char        asm_tempfile[1024];
 		const char *filename = file->name;
@@ -1287,7 +1761,7 @@ int main(int argc, char **argv)
 				in = open_file(filename);
 			lextest(in, filename);
 			fclose(in);
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 
 		FILE *preprocessed_in = NULL;
@@ -1310,13 +1784,13 @@ preprocess:
 				preprocessed_in = preprocess(filename, filetype);
 				if (mode == PreprocessOnly) {
 					copy_file(out, preprocessed_in);
-					int result = pclose(preprocessed_in);
+					int pp_result = pclose(preprocessed_in);
 					fclose(out);
 					/* remove output file in case of error */
-					if (out != stdout && result != EXIT_SUCCESS) {
+					if (out != stdout && pp_result != EXIT_SUCCESS) {
 						unlink(outname);
 					}
-					return result;
+					return pp_result;
 				}
 
 				in = preprocessed_in;
@@ -1414,7 +1888,7 @@ do_parsing:
 					/* remove output file */
 					if (out != stdout)
 						unlink(outname);
-					exit(EXIT_FAILURE);
+					return EXIT_FAILURE;
 				}
 			}
 
@@ -1423,9 +1897,6 @@ do_parsing:
 			} else if (mode == PrintFluffy) {
 				write_fluffy_decls(out, unit);
 				continue;
-			} else if (mode == PrintCaml) {
-				write_caml_decls(out, unit);
-				continue;
 			} else if (mode == PrintJna) {
 				write_jna_decls(out, unit);
 				continue;
@@ -1435,7 +1906,11 @@ do_parsing:
 			ir_timer_t *t_construct = ir_timer_new();
 			timer_register(t_construct, "Frontend: Graph construction");
 			timer_push(t_construct);
+			if (already_constructed_firm) {
+				panic("compiling multiple files/translation units not possible");
+			}
 			translation_unit_to_firm(unit);
+			already_constructed_firm = true;
 			timer_pop(t_construct);
 
 graph_built:
@@ -1460,22 +1935,21 @@ graph_built:
 				if (irg == NULL) {
 					fprintf(stderr, "No graph for function '%s' found\n",
 					        dumpfunction);
-					exit(1);
+					return EXIT_FAILURE;
 				}
 
-				dump_ir_block_graph_file(irg, out);
+				dump_ir_graph_file(out, irg);
 				fclose(out);
-				exit(0);
+				return EXIT_SUCCESS;
 			}
 
 			if (mode == CompileExportIR) {
 				fclose(out);
 				ir_export(outname);
-				exit(0);
+				return EXIT_SUCCESS;
 			}
 
-			gen_firm_finish(asm_out, filename, /*c_mode=*/1,
-			                have_const_functions);
+			gen_firm_finish(asm_out, filename);
 			if (asm_out != out) {
 				fclose(asm_out);
 			}
@@ -1544,9 +2018,14 @@ graph_built:
 
 		/* construct commandline */
 		const char *linker = getenv("CPARSER_LINK");
-		if (linker == NULL)
-			linker = LINKER;
-		obstack_printf(&file_obst, "%s", linker);
+		if (linker != NULL) {
+			obstack_printf(&file_obst, "%s ", linker);
+		} else {
+			if (target_triple != NULL)
+				obstack_printf(&file_obst, "%s-", target_triple);
+			obstack_printf(&file_obst, "%s ", LINKER);
+		}
+
 		for (file_list_entry_t *entry = files; entry != NULL;
 				entry = entry->next) {
 			if (entry->type != FILETYPE_OBJECT)
@@ -1568,7 +2047,7 @@ graph_built:
 		int err = system(commandline);
 		if (err != EXIT_SUCCESS) {
 			fprintf(stderr, "linker reported an error\n");
-			exit(1);
+			return EXIT_FAILURE;
 		}
 	}
 
@@ -1577,6 +2056,7 @@ graph_built:
 
 	obstack_free(&cppflags_obst, NULL);
 	obstack_free(&ldflags_obst, NULL);
+	obstack_free(&asflags_obst, NULL);
 	obstack_free(&file_obst, NULL);
 
 	exit_mangle();
@@ -1588,5 +2068,5 @@ graph_built:
 	exit_types();
 	exit_tokens();
 	exit_symbol_table();
-	return 0;
+	return EXIT_SUCCESS;
 }