From bfc3f301b6a5390b990c4abb05d134ffe8bb59bb Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Tue, 6 May 2014 16:29:50 +0000 Subject: Have the SubtargetFeature help routine just not return a number and fall back to the normal path without a cpu. While doing this fix llc to just exit when we don't have a module to process instead of asserting. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208102 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llc/llc.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tools/llc') diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index 654a9c3eee..712817d934 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -277,7 +277,14 @@ static int compileModule(char **argv, LLVMContext &Context) { TheTarget->createTargetMachine(TheTriple.getTriple(), MCPU, FeaturesStr, Options, RelocModel, CMModel, OLvl)); assert(target.get() && "Could not allocate target machine!"); - assert(mod && "Should have exited after outputting help!"); + + // If we don't have a module then just exit now. We do this down + // here since the CPU/Feature help is underneath the target machine + // creation. + if (SkipModule) + return 0; + + assert(mod && "Should have exited if we didn't have a module!"); TargetMachine &Target = *target.get(); if (EnableDwarfDirectory) -- cgit v1.2.3