Skip to content

Commit

Permalink
better default enabled features for riscv
Browse files Browse the repository at this point in the history
Until ability to specify target CPU features (#2883) is done, this
commit gives riscv target better default features.

This side-steps #3275 which is a deficiency in compiler-rt when features
do not include 32 bit integer division.

With this commit, RISC-V compiler-rt tests pass and Hello World works
both pure-zig and with musl libc.
  • Loading branch information
andrewrk committed Sep 25, 2019
1 parent 9983501 commit 53210b2
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/codegen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ enum ResumeId {
ResumeIdCall,
};

// TODO https://github.com/ziglang/zig/issues/2883
// Until then we have this same default as Clang.
// This avoids https://github.com/ziglang/zig/issues/3275
static const char *riscv_default_features = "+a,+c,+d,+f,+m,+relax";

static void init_darwin_native(CodeGen *g) {
char *osx_target = getenv("MACOSX_DEPLOYMENT_TARGET");
char *ios_target = getenv("IPHONEOS_DEPLOYMENT_TARGET");
Expand Down Expand Up @@ -8720,8 +8725,9 @@ static void init(CodeGen *g) {
}
} else if (target_is_riscv(g->zig_target)) {
// TODO https://github.com/ziglang/zig/issues/2883
// Be aware of https://github.com/ziglang/zig/issues/3275
target_specific_cpu_args = "";
target_specific_features = "+a";
target_specific_features = riscv_default_features;
} else {
target_specific_cpu_args = "";
target_specific_features = "";
Expand Down Expand Up @@ -9007,7 +9013,7 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
args.append("-Xclang");
args.append("-target-feature");
args.append("-Xclang");
args.append("+a");
args.append(riscv_default_features);
}
}
if (g->zig_target->os == OsFreestanding) {
Expand Down

0 comments on commit 53210b2

Please sign in to comment.