Prefix external symbols in llvm-c-test.

This makes it less likely to clash with other stuff that might be linked
in by change, e.g. ncurses exposes an external function called simply
"echo", so linking ncurses statically into the binary explodes in funny
ways.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@259882 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-c-test/calc.c b/tools/llvm-c-test/calc.c
index 646b5b0..4c273cb 100644 (file)
--- a/tools/llvm-c-test/calc.c
+++ b/tools/llvm-c-test/calc.c
@@ -139,9 +139,9 @@ static void handle_line(char **tokens, int ntokens) {
   LLVMDisposeModule(M);
 }
 
-int calc(void) {
+int llvm_calc(void) {
 
-  tokenize_stdin(handle_line);
+  llvm_tokenize_stdin(handle_line);
 
   return 0;
 }

diff --git a/tools/llvm-c-test/disassemble.c b/tools/llvm-c-test/disassemble.c
index 05a9218..7d6f178 100644 (file)
--- a/tools/llvm-c-test/disassemble.c
+++ b/tools/llvm-c-test/disassemble.c
@@ -83,12 +83,12 @@ static void handle_line(char **tokens, int ntokens) {
   do_disassemble(triple, features, disbuf, disbuflen);
 }
 
-int disassemble(void) {
+int llvm_disassemble(void) {
   LLVMInitializeAllTargetInfos();
   LLVMInitializeAllTargetMCs();
   LLVMInitializeAllDisassemblers();
 
-  tokenize_stdin(handle_line);
+  llvm_tokenize_stdin(handle_line);
 
   return 0;
 }

diff --git a/tools/llvm-c-test/echo.cpp b/tools/llvm-c-test/echo.cpp
index 54bcd48..0b929fd 100644 (file)
--- a/tools/llvm-c-test/echo.cpp
+++ b/tools/llvm-c-test/echo.cpp
@@ -520,10 +520,10 @@ static void clone_functions(LLVMModuleRef Src, LLVMModuleRef Dst) {
   }
 }
 
-int echo(void) {
+int llvm_echo(void) {
   LLVMEnablePrettyStackTrace();
 
-  LLVMModuleRef Src = load_module(false, true);
+  LLVMModuleRef Src = llvm_load_module(false, true);
 
   LLVMContextRef Ctx = LLVMContextCreate();
   LLVMModuleRef Dst = LLVMModuleCreateWithNameInContext("<stdin>", Ctx);

diff --git a/tools/llvm-c-test/helpers.c b/tools/llvm-c-test/helpers.c
index 1ea8a4f..97fbaab 100644 (file)
--- a/tools/llvm-c-test/helpers.c
+++ b/tools/llvm-c-test/helpers.c
@@ -18,7 +18,7 @@
 #define MAX_TOKENS 512
 #define MAX_LINE_LEN 1024
 
-void tokenize_stdin(void (*cb)(char **tokens, int ntokens)) {
+void llvm_tokenize_stdin(void (*cb)(char **tokens, int ntokens)) {
   char line[MAX_LINE_LEN];
   char *tokbuf[MAX_TOKENS];
 

diff --git a/tools/llvm-c-test/llvm-c-test.h b/tools/llvm-c-test/llvm-c-test.h
index 72f3ccb..60edc0d 100644 (file)
--- a/tools/llvm-c-test/llvm-c-test.h
+++ b/tools/llvm-c-test/llvm-c-test.h
@@ -21,33 +21,33 @@ extern "C" {
 #endif
 
 // helpers.c
-void tokenize_stdin(void (*cb)(char **tokens, int ntokens));
+void llvm_tokenize_stdin(void (*cb)(char **tokens, int ntokens));
 
 // module.c
-LLVMModuleRef load_module(bool Lazy, bool New);
-int module_dump(bool Lazy, bool New);
-int module_list_functions(void);
-int module_list_globals(void);
+LLVMModuleRef llvm_load_module(bool Lazy, bool New);
+int llvm_module_dump(bool Lazy, bool New);
+int llvm_module_list_functions(void);
+int llvm_module_list_globals(void);
 
 // calc.c
-int calc(void);
+int llvm_calc(void);
 
 // disassemble.c
-int disassemble(void);
+int llvm_disassemble(void);
 
 // metadata.c
-int add_named_metadata_operand(void);
-int set_metadata(void);
+int llvm_add_named_metadata_operand(void);
+int llvm_set_metadata(void);
 
 // object.c
-int object_list_sections(void);
-int object_list_symbols(void);
+int llvm_object_list_sections(void);
+int llvm_object_list_symbols(void);
 
 // targets.c
-int targets_list(void);
+int llvm_targets_list(void);
 
 // echo.c
-int echo(void);
+int llvm_echo(void);
 
 #ifdef __cplusplus
 }

diff --git a/tools/llvm-c-test/main.c b/tools/llvm-c-test/main.c
index 10d7d75..ec09467 100644 (file)
--- a/tools/llvm-c-test/main.c
+++ b/tools/llvm-c-test/main.c
@@ -60,33 +60,33 @@ int main(int argc, char **argv) {
   LLVMInitializeCore(pr);
 
   if (argc == 2 && !strcmp(argv[1], "--lazy-new-module-dump")) {
-    return module_dump(true, true);
+    return llvm_module_dump(true, true);
   } else if (argc == 2 && !strcmp(argv[1], "--new-module-dump")) {
-    return module_dump(false, true);
+    return llvm_module_dump(false, true);
   } else if (argc == 2 && !strcmp(argv[1], "--lazy-module-dump")) {
-    return module_dump(true, false);
+    return llvm_module_dump(true, false);
   } else if (argc == 2 && !strcmp(argv[1], "--module-dump")) {
-    return module_dump(false, false);
+    return llvm_module_dump(false, false);
   } else if (argc == 2 && !strcmp(argv[1], "--module-list-functions")) {
-    return module_list_functions();
+    return llvm_module_list_functions();
   } else if (argc == 2 && !strcmp(argv[1], "--module-list-globals")) {
-    return module_list_globals();
+    return llvm_module_list_globals();
   } else if (argc == 2 && !strcmp(argv[1], "--targets-list")) {
-    return targets_list();
+    return llvm_targets_list();
   } else if (argc == 2 && !strcmp(argv[1], "--object-list-sections")) {
-    return object_list_sections();
+    return llvm_object_list_sections();
   } else if (argc == 2 && !strcmp(argv[1], "--object-list-symbols")) {
-    return object_list_symbols();
+    return llvm_object_list_symbols();
   } else if (argc == 2 && !strcmp(argv[1], "--disassemble")) {
-    return disassemble();
+    return llvm_disassemble();
   } else if (argc == 2 && !strcmp(argv[1], "--calc")) {
-    return calc();
+    return llvm_calc();
   } else if (argc == 2 && !strcmp(argv[1], "--add-named-metadata-operand")) {
-    return add_named_metadata_operand();
+    return llvm_add_named_metadata_operand();
   } else if (argc == 2 && !strcmp(argv[1], "--set-metadata")) {
-    return set_metadata();
+    return llvm_set_metadata();
   } else if (argc == 2 && !strcmp(argv[1], "--echo")) {
-    return echo();
+    return llvm_echo();
   } else {
     print_usage();
   }

diff --git a/tools/llvm-c-test/metadata.c b/tools/llvm-c-test/metadata.c
index eabe75f..89215b8 100644 (file)
--- a/tools/llvm-c-test/metadata.c
+++ b/tools/llvm-c-test/metadata.c
@@ -14,7 +14,7 @@
 
 #include "llvm-c-test.h"
 
-int add_named_metadata_operand(void) {
+int llvm_add_named_metadata_operand(void) {
   LLVMModuleRef m = LLVMModuleCreateWithName("Mod");
   LLVMValueRef values[] = { LLVMConstInt(LLVMInt32Type(), 0, 0) };
 
@@ -26,7 +26,7 @@ int add_named_metadata_operand(void) {
   return 0;
 }
 
-int set_metadata(void) {
+int llvm_set_metadata(void) {
   LLVMBuilderRef b = LLVMCreateBuilder();
   LLVMValueRef values[] = { LLVMConstInt(LLVMInt32Type(), 0, 0) };
 

diff --git a/tools/llvm-c-test/module.c b/tools/llvm-c-test/module.c
index 16ed6db..c47b55d 100644 (file)
--- a/tools/llvm-c-test/module.c
+++ b/tools/llvm-c-test/module.c
@@ -25,7 +25,7 @@ static void diagnosticHandler(LLVMDiagnosticInfoRef DI, void *C) {
   exit(1);
 }
 
-LLVMModuleRef load_module(bool Lazy, bool New) {
+LLVMModuleRef llvm_load_module(bool Lazy, bool New) {
   LLVMMemoryBufferRef MB;
   LLVMModuleRef M;
   char *msg = NULL;
@@ -62,8 +62,8 @@ LLVMModuleRef load_module(bool Lazy, bool New) {
   return M;
 }
 
-int module_dump(bool Lazy, bool New) {
-  LLVMModuleRef M = load_module(Lazy, New);
+int llvm_module_dump(bool Lazy, bool New) {
+  LLVMModuleRef M = llvm_load_module(Lazy, New);
 
   char *irstr = LLVMPrintModuleToString(M);
   puts(irstr);
@@ -74,8 +74,8 @@ int module_dump(bool Lazy, bool New) {
   return 0;
 }
 
-int module_list_functions(void) {
-  LLVMModuleRef M = load_module(false, false);
+int llvm_module_list_functions(void) {
+  LLVMModuleRef M = llvm_load_module(false, false);
   LLVMValueRef f;
 
   f = LLVMGetFirstFunction(M);
@@ -115,8 +115,8 @@ int module_list_functions(void) {
   return 0;
 }
 
-int module_list_globals(void) {
-  LLVMModuleRef M = load_module(false, false);
+int llvm_module_list_globals(void) {
+  LLVMModuleRef M = llvm_load_module(false, false);
   LLVMValueRef g;
 
   g = LLVMGetFirstGlobal(M);

diff --git a/tools/llvm-c-test/object.c b/tools/llvm-c-test/object.c
index a5421d9..809ad54 100644 (file)
--- a/tools/llvm-c-test/object.c
+++ b/tools/llvm-c-test/object.c
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int object_list_sections(void) {
+int llvm_object_list_sections(void) {
   LLVMMemoryBufferRef MB;
   LLVMObjectFileRef O;
   LLVMSectionIteratorRef sect;
@@ -49,7 +49,7 @@ int object_list_sections(void) {
   return 0;
 }
 
-int object_list_symbols(void) {
+int llvm_object_list_symbols(void) {
   LLVMMemoryBufferRef MB;
   LLVMObjectFileRef O;
   LLVMSectionIteratorRef sect;

diff --git a/tools/llvm-c-test/targets.c b/tools/llvm-c-test/targets.c
index 252c2e0..f2a9e92 100644 (file)
--- a/tools/llvm-c-test/targets.c
+++ b/tools/llvm-c-test/targets.c
@@ -14,7 +14,7 @@
 #include "llvm-c/TargetMachine.h"
 #include <stdio.h>
 
-int targets_list(void) {
+int llvm_targets_list(void) {
   LLVMTargetRef t;
   LLVMInitializeAllTargetInfos();
   LLVMInitializeAllTargets();