Merging in from mainline

llvm-svn: 27864

2 files changed, 4 insertions, 0 deletions

diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index 357eedd..d95aea7 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -216,6 +216,9 @@ int main(int argc, char **argv) {
         sys::RemoveFileOnSignal(sys::Path(OutputFilename));
       }
     }
+
+    if (FileType != TargetMachine::AssemblyFile)
+      std::cerr << "WARNING: only -filetype=asm is currently supported.\n";
     
     // Ask the target to add backend passes as necessary.
     if (Target.addPassesToEmitFile(Passes, *Out, FileType, Fast)) {
diff --git a/llvm/tools/llvm-db/llvm-db.cpp b/llvm/tools/llvm-db/llvm-db.cpp
index 140b8e4..a46aa08 100644
--- a/llvm/tools/llvm-db/llvm-db.cpp
+++ b/llvm/tools/llvm-db/llvm-db.cpp
@@ -50,6 +50,7 @@ namespace {
 // main Driver function
 //
 int main(int argc, char **argv, char * const *envp) {
+  std::cout << "NOTE: llvm-db is known useless right now.\n";
   try {
     cl::ParseCommandLineOptions(argc, argv,
                                 " llvm source-level debugger\n");