diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 66 |
1 files changed, 4 insertions, 62 deletions
diff --git a/src/main.cpp b/src/main.cpp index ca55d6ba..358de95e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,65 +26,7 @@ #include "trans/target.hpp" #include "expand/cfg.hpp" - -// Hacky default target detection -// - Windows (MSVC) -#ifdef _MSC_VER -# if defined(_WIN64) -# define DEFAULT_TARGET_NAME "x86_64-windows-msvc" -# else -# define DEFAULT_TARGET_NAME "x86-windows-msvc" -# endif -// - Linux -#elif defined(__linux__) -# if defined(__amd64__) -# define DEFAULT_TARGET_NAME "x86_64-linux-gnu" -# elif defined(__aarch64__) -# define DEFAULT_TARGET_NAME "aarch64-linux-gnu" -# elif defined(__arm__) -# define DEFAULT_TARGET_NAME "arm-linux-gnu" -# elif defined(__i386__) -# define DEFAULT_TARGET_NAME "i586-linux-gnu" -# else -# warning "Unable to detect a suitable default target (linux-gnu)" -# endif -// - MinGW -#elif defined(__MINGW32__) -# if defined(_WIN64) -# define DEFAULT_TARGET_NAME "x86_64-windows-gnu" -# else -# define DEFAULT_TARGET_NAME "i586-windows-gnu" -# endif -// - NetBSD -#elif defined(__NetBSD__) -# if defined(__amd64__) -# define DEFAULT_TARGET_NAME "x86_64-unknown-netbsd" -# else -# warning "Unable to detect a suitable default target (NetBSD)" -# endif -// - OpenBSD -#elif defined(__OpenBSD__) -# if defined(__amd64__) -# define DEFAULT_TARGET_NAME "x86_64-unknown-openbsd" -# elif defined(__aarch64__) -# define DEFAULT_TARGET_NAME "aarch64-unknown-openbsd" -# elif defined(__arm__) -# define DEFAULT_TARGET_NAME "arm-unknown-openbsd" -# elif defined(__i386__) -# define DEFAULT_TARGET_NAME "i686-unknown-openbsd" -# else -# warning "Unable to detect a suitable default target (OpenBSD)" -# endif -// - Apple devices -#elif defined(__APPLE__) -# define DEFAULT_TARGET_NAME "x86_64-apple-macosx" -// - Unknown -#else -# warning "Unable to detect a suitable default target" -#endif -#ifndef DEFAULT_TARGET_NAME -# define DEFAULT_TARGET_NAME "" -#endif +#include <target_detect.h> // tools/common/target_detect.h int g_debug_indent_level = 0; bool g_debug_enabled = true; @@ -929,7 +871,7 @@ ProgramParams::ProgramParams(int argc, char *argv[]) } else if( optname == "dump-hir" ) { no_optval(); - this->debug.dump_mir = true; + this->debug.dump_hir = true; } else if( optname == "dump-mir" ) { no_optval(); @@ -943,10 +885,10 @@ ProgramParams::ProgramParams(int argc, char *argv[]) this->last_stage = STAGE_EXPAND; else if( optval == "resolve" ) this->last_stage = STAGE_RESOLVE; + else if( optval == "typeck" ) + this->last_stage = STAGE_TYPECK; else if( optval == "mir" ) this->last_stage = STAGE_MIR; - else if( optval == "ALL" ) - this->last_stage = STAGE_ALL; else { ::std::cerr << "Unknown argument to -Z stop-after - '" << optval << "'" << ::std::endl; exit(1); |