diff options
author | 2022-07-27 03:25:12 +0600 | |
---|---|---|
committer | 2022-08-22 10:16:08 +0200 | |
commit | d005e3b069726d01579b86d32f6fe32c26573aa3 (patch) | |
tree | 70729937df5bed4b4437918fbf7b08984d55add6 /dev-lang/zig/files | |
parent | dev-lang/zig: add myself as a maintainer (diff) | |
download | gentoo-d005e3b069726d01579b86d32f6fe32c26573aa3.tar.gz gentoo-d005e3b069726d01579b86d32f6fe32c26573aa3.tar.bz2 gentoo-d005e3b069726d01579b86d32f6fe32c26573aa3.zip |
dev-lang/zig: block dev-lang/zig-bin, add risv stage0 patch for 0.9.1
Bug: https://bugs.gentoo.org/851732
Signed-off-by: Eric Joldasov <bratishkaerik@getgoogleoff.me>
Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'dev-lang/zig/files')
-rw-r--r-- | dev-lang/zig/files/zig-0.9.1-fix-riscv.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch b/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch new file mode 100644 index 000000000000..372a68ea02ad --- /dev/null +++ b/dev-lang/zig/files/zig-0.9.1-fix-riscv.patch @@ -0,0 +1,47 @@ +https://github.com/ziglang/zig/commit/ca3c4ff2d0afcdc8fe86e7e7b41a967c88779729 +From: Shupei Fan <dymarkfan@outlook.com> +zig0: properly set llvm_cpu_names and llvm_cpu_features for riscv + +Bug: https://bugs.gentoo.org/851732 + +--- a/src/stage1/zig0.cpp ++++ b/src/stage1/zig0.cpp +@@ -160,6 +160,17 @@ static void get_native_target(ZigTarget *target) { + } + } + ++static const char* get_baseline_llvm_cpu_name(ZigLLVM_ArchType arch) { ++ return ""; ++} ++ ++static const char* get_baseline_llvm_cpu_features(ZigLLVM_ArchType arch) { ++ switch (arch) { ++ case ZigLLVM_riscv64: return "+a,+c,+d,+m"; ++ default: return ""; ++ } ++} ++ + static Error target_parse_triple(struct ZigTarget *target, const char *zig_triple, const char *mcpu, + const char *dynamic_linker) + { +@@ -178,8 +189,8 @@ static Error target_parse_triple(struct ZigTarget *target, const char *zig_tripl + } else if (strcmp(mcpu, "baseline") == 0) { + target->is_native_os = false; + target->is_native_cpu = false; +- target->llvm_cpu_name = ""; +- target->llvm_cpu_features = ""; ++ target->llvm_cpu_name = get_baseline_llvm_cpu_name(target->arch); ++ target->llvm_cpu_features = get_baseline_llvm_cpu_features(target->arch); + } else { + const char *msg = "stage0 can't handle CPU/features in the target"; + stage2_panic(msg, strlen(msg)); +@@ -220,6 +231,9 @@ static Error target_parse_triple(struct ZigTarget *target, const char *zig_tripl + const char *msg = "stage0 can't handle CPU/features in the target"; + stage2_panic(msg, strlen(msg)); + } ++ ++ target->llvm_cpu_name = get_baseline_llvm_cpu_name(target->arch); ++ target->llvm_cpu_features = get_baseline_llvm_cpu_features(target->arch); + } + + return ErrorNone; |