[llvm] r192316 - llvm-c: Make target initializer functions external functions in lib.

Anders Waldenborg anders at 0x63.nu
Wed Oct 9 12:02:09 PDT 2013


Author: andersg
Date: Wed Oct  9 14:02:09 2013
New Revision: 192316

URL: http://llvm.org/viewvc/llvm-project?rev=192316&view=rev
Log:
llvm-c: Make target initializer functions external functions in lib.

Making them proper functions defined in the (shared)lib instead of
static inlines defined in the header files makes it possible to
actually distribute a binary compiled against the shared library
without having to worry about getting undefined symbol errors when
calling e.g LLVMInitializeAllTargetInfos because the shared library on
the other system was compiled with different targets.

Differential Revision: http://llvm-reviews.chandlerc.com/D1714


Added:
    llvm/trunk/lib/Target/AllTargets.cpp
Modified:
    llvm/trunk/include/llvm-c/Target.h
    llvm/trunk/lib/Target/CMakeLists.txt

Modified: llvm/trunk/include/llvm-c/Target.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Target.h?rev=192316&r1=192315&r2=192316&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/Target.h (original)
+++ llvm/trunk/include/llvm-c/Target.h Wed Oct  9 14:02:09 2013
@@ -71,62 +71,37 @@ typedef struct LLVMStructLayout *LLVMStr
   void LLVMInitialize##TargetName##Disassembler(void);
 #include "llvm/Config/Disassemblers.def"
 #undef LLVM_DISASSEMBLER  /* Explicit undef to make SWIG happier */
-  
+
 /** LLVMInitializeAllTargetInfos - The main program should call this function if
     it wants access to all available targets that LLVM is configured to
     support. */
-static inline void LLVMInitializeAllTargetInfos(void) {
-#define LLVM_TARGET(TargetName) LLVMInitialize##TargetName##TargetInfo();
-#include "llvm/Config/Targets.def"
-#undef LLVM_TARGET  /* Explicit undef to make SWIG happier */
-}
+void LLVMInitializeAllTargetInfos(void);
 
 /** LLVMInitializeAllTargets - The main program should call this function if it
     wants to link in all available targets that LLVM is configured to
     support. */
-static inline void LLVMInitializeAllTargets(void) {
-#define LLVM_TARGET(TargetName) LLVMInitialize##TargetName##Target();
-#include "llvm/Config/Targets.def"
-#undef LLVM_TARGET  /* Explicit undef to make SWIG happier */
-}
+void LLVMInitializeAllTargets(void);
 
 /** LLVMInitializeAllTargetMCs - The main program should call this function if
     it wants access to all available target MC that LLVM is configured to
     support. */
-static inline void LLVMInitializeAllTargetMCs(void) {
-#define LLVM_TARGET(TargetName) LLVMInitialize##TargetName##TargetMC();
-#include "llvm/Config/Targets.def"
-#undef LLVM_TARGET  /* Explicit undef to make SWIG happier */
-}
-  
+void LLVMInitializeAllTargetMCs(void);
+
 /** LLVMInitializeAllAsmPrinters - The main program should call this function if
     it wants all asm printers that LLVM is configured to support, to make them
     available via the TargetRegistry. */
-static inline void LLVMInitializeAllAsmPrinters(void) {
-#define LLVM_ASM_PRINTER(TargetName) LLVMInitialize##TargetName##AsmPrinter();
-#include "llvm/Config/AsmPrinters.def"
-#undef LLVM_ASM_PRINTER  /* Explicit undef to make SWIG happier */
-}
-  
+void LLVMInitializeAllAsmPrinters(void);
+
 /** LLVMInitializeAllAsmParsers - The main program should call this function if
     it wants all asm parsers that LLVM is configured to support, to make them
     available via the TargetRegistry. */
-static inline void LLVMInitializeAllAsmParsers(void) {
-#define LLVM_ASM_PARSER(TargetName) LLVMInitialize##TargetName##AsmParser();
-#include "llvm/Config/AsmParsers.def"
-#undef LLVM_ASM_PARSER  /* Explicit undef to make SWIG happier */
-}
-  
+void LLVMInitializeAllAsmParsers(void);
+
 /** LLVMInitializeAllDisassemblers - The main program should call this function
     if it wants all disassemblers that LLVM is configured to support, to make
     them available via the TargetRegistry. */
-static inline void LLVMInitializeAllDisassemblers(void) {
-#define LLVM_DISASSEMBLER(TargetName) \
-  LLVMInitialize##TargetName##Disassembler();
-#include "llvm/Config/Disassemblers.def"
-#undef LLVM_DISASSEMBLER  /* Explicit undef to make SWIG happier */
-}
-  
+void LLVMInitializeAllDisassemblers(void);
+
 /** LLVMInitializeNativeTarget - The main program should call this function to
     initialize the native target corresponding to the host.  This is useful 
     for JIT applications to ensure that the target gets linked in correctly. */

Added: llvm/trunk/lib/Target/AllTargets.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AllTargets.cpp?rev=192316&view=auto
==============================================================================
--- llvm/trunk/lib/Target/AllTargets.cpp (added)
+++ llvm/trunk/lib/Target/AllTargets.cpp Wed Oct  9 14:02:09 2013
@@ -0,0 +1,43 @@
+//===-- AllTargets.cpp ----------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements functions for initialization of different
+// aspects of all configured targets. When calling any of these
+// functions all configured targets must be linked in.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm-c/Target.h"
+#include "llvm/Support/TargetSelect.h"
+
+using namespace llvm;
+
+void LLVMInitializeAllTargetInfos(void) {
+  InitializeAllTargetInfos();
+}
+
+void LLVMInitializeAllTargets(void) {
+  InitializeAllTargets();
+}
+
+void LLVMInitializeAllTargetMCs(void) {
+  InitializeAllTargetMCs();
+}
+
+void LLVMInitializeAllAsmPrinters(void) {
+  InitializeAllAsmPrinters();
+}
+
+void LLVMInitializeAllAsmParsers(void) {
+  InitializeAllAsmParsers();
+}
+
+void LLVMInitializeAllDisassemblers(void) {
+  InitializeAllDisassemblers();
+}

Modified: llvm/trunk/lib/Target/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CMakeLists.txt?rev=192316&r1=192315&r2=192316&view=diff
==============================================================================
--- llvm/trunk/lib/Target/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/CMakeLists.txt Wed Oct  9 14:02:09 2013
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMTarget
+  AllTargets.cpp
   Mangler.cpp
   Target.cpp
   TargetIntrinsicInfo.cpp





More information about the llvm-commits mailing list