diff --git a/CMakeLists.txt b/CMakeLists.txt index ab4607d230..a3d6a7fb68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -616,6 +616,7 @@ endif() set(BUILD_LIBSTAGE2_ARGS "build-lib" "src-self-hosted/stage2.zig" + -mcpu=baseline --name zigstage2 --override-lib-dir "${CMAKE_SOURCE_DIR}/lib" --cache on diff --git a/src/main.cpp b/src/main.cpp index d7f5e5b7b0..5046c92ddd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -450,6 +450,7 @@ static int main0(int argc, char **argv) { const char *cpu = nullptr; const char *features = nullptr; CodeModel code_model = CodeModelDefault; + bool baseline_cpu = false; ZigList llvm_argv = {0}; llvm_argv.append("zig (LLVM option parsing)"); @@ -716,6 +717,8 @@ static int main0(int argc, char **argv) { emit_llvm_ir = true; } else if (strcmp(arg, "-fno-emit-llvm-ir") == 0) { emit_llvm_ir = false; + } else if (strcmp(arg, "-mcpu=baseline") == 0) { + baseline_cpu = true; } else if (i + 1 >= argc) { fprintf(stderr, "Expected another argument after %s\n", arg); return print_error_usage(arg0); @@ -977,6 +980,9 @@ static int main0(int argc, char **argv) { fprintf(stderr, "-target-glibc provided but no -target parameter\n"); return print_error_usage(arg0); } + if (baseline_cpu) { + target.is_native = false; + } } else { if ((err = target_parse_triple(&target, target_string))) { if (err == ErrorUnknownArchitecture && target.arch != ZigLLVM_UnknownArch) {