Merge remote-tracking branch 'upstream/release_34' into merge-20140211

Conflicts:
	lib/Linker/LinkModules.cpp
	lib/Support/Unix/Signals.inc

Change-Id: Ia54f291fa5dc828052d2412736e8495c1282aa64

1 files changed, 73 insertions, 0 deletions

diff --git a/tools/llvm-c-test/main.c b/tools/llvm-c-test/main.c
new file mode 100644
index 0000000..72f8b04
--- /dev/null
+++ b/tools/llvm-c-test/main.c
@@ -0,0 +1,73 @@
+/*===-- main.c - tool for testing libLLVM and llvm-c API ------------------===*\
+|*                                                                            *|
+|*                     The LLVM Compiler Infrastructure                       *|
+|*                                                                            *|
+|* This file is distributed under the University of Illinois Open Source      *|
+|* License. See LICENSE.TXT for details.                                      *|
+|*                                                                            *|
+|*===----------------------------------------------------------------------===*|
+|*                                                                            *|
+|* Main file for llvm-c-tests. "Parses" arguments and dispatches.             *|
+|*                                                                            *|
+\*===----------------------------------------------------------------------===*/
+
+#include "llvm-c-test.h"
+#include "llvm-c/BitReader.h"
+#include "llvm-c/Core.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void print_usage(void) {
+  fprintf(stderr, "llvm-c-test command\n\n");
+  fprintf(stderr, " Commands:\n");
+  fprintf(stderr, "  * --module-dump\n");
+  fprintf(stderr, "    Read bytecode from stdin - print disassembly\n\n");
+  fprintf(stderr, "  * --module-list-functions\n");
+  fprintf(stderr,
+          "    Read bytecode from stdin - list summary of functions\n\n");
+  fprintf(stderr, "  * --module-list-globals\n");
+  fprintf(stderr, "    Read bytecode from stdin - list summary of globals\n\n");
+  fprintf(stderr, "  * --targets-list\n");
+  fprintf(stderr, "    List available targets\n\n");
+  fprintf(stderr, "  * --object-list-sections\n");
+  fprintf(stderr, "    Read object file form stdin - list sections\n\n");
+  fprintf(stderr, "  * --object-list-symbols\n");
+  fprintf(stderr,
+          "    Read object file form stdin - list symbols (like nm)\n\n");
+  fprintf(stderr, "  * --disassemble\n");
+  fprintf(stderr, "    Read lines of triple, hex ascii machine code from stdin "
+                  "- print disassembly\n\n");
+  fprintf(stderr, "  * --calc\n");
+  fprintf(
+      stderr,
+      "    Read lines of name, rpn from stdin - print generated module\n\n");
+}
+
+int main(int argc, char **argv) {
+  LLVMPassRegistryRef pr = LLVMGetGlobalPassRegistry();
+
+  LLVMInitializeCore(pr);
+
+  if (argc == 2 && !strcmp(argv[1], "--module-dump")) {
+    return module_dump();
+  } else if (argc == 2 && !strcmp(argv[1], "--module-list-functions")) {
+    return module_list_functions();
+  } else if (argc == 2 && !strcmp(argv[1], "--module-list-globals")) {
+    return module_list_globals();
+  } else if (argc == 2 && !strcmp(argv[1], "--targets-list")) {
+    return targets_list();
+  } else if (argc == 2 && !strcmp(argv[1], "--object-list-sections")) {
+    return object_list_sections();
+  } else if (argc == 2 && !strcmp(argv[1], "--object-list-symbols")) {
+    return object_list_symbols();
+  } else if (argc == 2 && !strcmp(argv[1], "--disassemble")) {
+    return disassemble();
+  } else if (argc == 2 && !strcmp(argv[1], "--calc")) {
+    return calc();
+  } else {
+    print_usage();
+  }
+
+  return 1;
+}