Author: rogfer01 Date: Tue Sep 10 01:16:24 2019 New Revision: 371496 URL: http://llvm.org/viewvc/llvm-project?rev=371496&view=rev Log: [RISCV] Make -march=rv{32,64}gc the default in RISC-V Linux
This is the logical follow-up of D65634. Differential Revision: https://reviews.llvm.org/D66003 Modified: cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.cpp cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.h cfe/trunk/lib/Driver/ToolChains/Clang.cpp cfe/trunk/test/Driver/riscv-features.c Modified: cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.cpp?rev=371496&r1=371495&r2=371496&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.cpp Tue Sep 10 01:16:24 2019 @@ -12,6 +12,7 @@ #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" +#include "llvm/ADT/Optional.h" #include "llvm/Support/TargetParser.h" #include "llvm/Support/raw_ostream.h" #include "ToolChains/CommonArgs.h" @@ -353,14 +354,18 @@ static bool getArchFeatures(const Driver return true; } -void riscv::getRISCVTargetFeatures(const Driver &D, const ArgList &Args, +void riscv::getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple, + const ArgList &Args, std::vector<StringRef> &Features) { - if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) { - StringRef MArch = A->getValue(); + llvm::Optional<StringRef> MArch; + if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) + MArch = A->getValue(); + else if (Triple.getOS() == llvm::Triple::Linux) + // RISC-V Linux defaults to rv{32,64}gc. + MArch = Triple.getArch() == llvm::Triple::riscv32 ? "rv32gc" : "rv64gc"; - if (!getArchFeatures(D, MArch, Features, Args)) - return; - } + if (MArch.hasValue() && !getArchFeatures(D, *MArch, Features, Args)) + return; // -mrelax is default, unless -mno-relax is specified. if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, true)) Modified: cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.h?rev=371496&r1=371495&r2=371496&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.h (original) +++ cfe/trunk/lib/Driver/ToolChains/Arch/RISCV.h Tue Sep 10 01:16:24 2019 @@ -19,7 +19,8 @@ namespace clang { namespace driver { namespace tools { namespace riscv { -void getRISCVTargetFeatures(const Driver &D, const llvm::opt::ArgList &Args, +void getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple, + const llvm::opt::ArgList &Args, std::vector<llvm::StringRef> &Features); StringRef getRISCVABI(const llvm::opt::ArgList &Args, const llvm::Triple &Triple); Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=371496&r1=371495&r2=371496&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Tue Sep 10 01:16:24 2019 @@ -336,7 +336,7 @@ static void getTargetFeatures(const Tool break; case llvm::Triple::riscv32: case llvm::Triple::riscv64: - riscv::getRISCVTargetFeatures(D, Args, Features); + riscv::getRISCVTargetFeatures(D, Triple, Args, Features); break; case llvm::Triple::systemz: systemz::getSystemZTargetFeatures(Args, Features); Modified: cfe/trunk/test/Driver/riscv-features.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/riscv-features.c?rev=371496&r1=371495&r2=371496&view=diff ============================================================================== --- cfe/trunk/test/Driver/riscv-features.c (original) +++ cfe/trunk/test/Driver/riscv-features.c Tue Sep 10 01:16:24 2019 @@ -18,4 +18,15 @@ // SAVE-RESTORE: warning: the clang compiler does not support '-msave-restore' // NO-SAVE-RESTORE-NOT: warning: the clang compiler does not support -// DEFAULT-NOT: warning: the clang compiler does not support \ No newline at end of file +// DEFAULT-NOT: warning: the clang compiler does not support + +// RUN: %clang -target riscv32-linux -### %s -fsyntax-only 2>&1 \ +// RUN: | FileCheck %s -check-prefix=DEFAULT-LINUX +// RUN: %clang -target riscv64-linux -### %s -fsyntax-only 2>&1 \ +// RUN: | FileCheck %s -check-prefix=DEFAULT-LINUX + +// DEFAULT-LINUX: "-target-feature" "+m" +// DEFAULT-LINUX-SAME: "-target-feature" "+a" +// DEFAULT-LINUX-SAME: "-target-feature" "+f" +// DEFAULT-LINUX-SAME: "-target-feature" "+d" +// DEFAULT-LINUX-SAME: "-target-feature" "+c" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
