| author |  Andrew Kelley <andrew@ziglang.org> 2020-02-20 17:02:29-05:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-02-20 17:02:29-05:00 |
| log | e381a42de9c0f0c5439a926b0ac99026a0373f49 |
| tree | 97efb484ce5823d10cc43d24d39b4a17a72896d4 |
| parent | b0d2ebe529593566f209d34d5bbbfd72cde2a6b9 |
| signature |  Commit is signed but in an unrecognized format. |
quick fix: add -mcpu=baseline support to zig0
When the build.zig logic to build libzigstage2 was converted to a cmake
command, it neglected to use baseline CPU features rather than compiling
with native features.
This adds a hard coded flag `-mcpu=baseline` which can be used to detect
the native target, but mark it as non-native so that it does not get the
CPU features specific to the host used to compile libzigstage2.
Full `-mcpu` support is happening in the upcoming pull request #4509,
and so this "quick fix" will be cleaned up in that branch, before it is
merged to master.
closes #45062 files changed, 7 insertions(+), 0 deletions(-)
CMakeLists.txt+1
| ... | ... | @@ -616,6 +616,7 @@ endif() |
| 616 | 616 | |
| 617 | 617 | set(BUILD_LIBSTAGE2_ARGS "build-lib" |
| 618 | 618 | "src-self-hosted/stage2.zig" |
| 619 | -mcpu=baseline | |
| 619 | 620 | --name zigstage2 |
| 620 | 621 | --override-lib-dir "${CMAKE_SOURCE_DIR}/lib" |
| 621 | 622 | --cache on |
src/main.cpp+6
| ... | ... | @@ -450,6 +450,7 @@ static int main0(int argc, char **argv) { |
| 450 | 450 | const char *cpu = nullptr; |
| 451 | 451 | const char *features = nullptr; |
| 452 | 452 | CodeModel code_model = CodeModelDefault; |
| 453 | bool baseline_cpu = false; | |
| 453 | 454 | |
| 454 | 455 | ZigList<const char *> llvm_argv = {0}; |
| 455 | 456 | llvm_argv.append("zig (LLVM option parsing)"); |
| ... | ... | @@ -716,6 +717,8 @@ static int main0(int argc, char **argv) { |
| 716 | 717 | emit_llvm_ir = true; |
| 717 | 718 | } else if (strcmp(arg, "-fno-emit-llvm-ir") == 0) { |
| 718 | 719 | emit_llvm_ir = false; |
| 720 | } else if (strcmp(arg, "-mcpu=baseline") == 0) { | |
| 721 | baseline_cpu = true; | |
| 719 | 722 | } else if (i + 1 >= argc) { |
| 720 | 723 | fprintf(stderr, "Expected another argument after %s\n", arg); |
| 721 | 724 | return print_error_usage(arg0); |
| ... | ... | @@ -977,6 +980,9 @@ static int main0(int argc, char **argv) { |
| 977 | 980 | fprintf(stderr, "-target-glibc provided but no -target parameter\n"); |
| 978 | 981 | return print_error_usage(arg0); |
| 979 | 982 | } |
| 983 | if (baseline_cpu) { | |
| 984 | target.is_native = false; | |
| 985 | } | |
| 980 | 986 | } else { |
| 981 | 987 | if ((err = target_parse_triple(&target, target_string))) { |
| 982 | 988 | if (err == ErrorUnknownArchitecture && target.arch != ZigLLVM_UnknownArch) { |