From d2f14256f06725840f35adcc2557b48fc9ade694 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Sat, 30 Oct 2010 15:57:50 +0000 Subject: Allow specifying a CPU to llvm-mc, so that we can properly set up subtarget feature lists for instruction pattern predicates. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117788 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-mc/llvm-mc.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index 9515189f19..9710805f9f 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -23,6 +23,7 @@ #include "llvm/Target/TargetAsmParser.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetRegistry.h" +#include "llvm/Target/SubtargetFeature.h" // FIXME. #include "llvm/Target/TargetMachine.h" // FIXME. #include "llvm/Target/TargetSelect.h" #include "llvm/ADT/OwningPtr.h" @@ -95,6 +96,12 @@ static cl::opt TripleName("triple", cl::desc("Target triple to assemble for, " "see -version for available targets")); +static cl::opt +MCPU("mcpu", + cl::desc("Target a specific cpu type (-mcpu=help for details)"), + cl::value_desc("cpu-name"), + cl::init("")); + static cl::opt NoInitialTextSection("n", cl::desc( "Don't assume assembly file starts in the text section")); @@ -301,8 +308,20 @@ static int AssembleInput(const char *ProgName) { MCContext Ctx(*MAI); + // Package up features to be passed to target/subtarget + std::string FeaturesStr; + if (MCPU.size()) { + SubtargetFeatures Features; + Features.setCPU(MCPU); + FeaturesStr = Features.getString(); + } + // FIXME: We shouldn't need to do this (and link in codegen). - OwningPtr TM(TheTarget->createTargetMachine(TripleName, "")); + // When we split this out, we should do it in a way that makes + // it straightforward to switch subtargets on the fly (.e.g, + // the .cpu and .code16 directives). + OwningPtr TM(TheTarget->createTargetMachine(TripleName, + FeaturesStr)); if (!TM) { errs() << ProgName << ": error: could not create target for triple '" -- cgit v1.2.3