From 9360e64e60f600bff98dbff96fabaab536947f86 Mon Sep 17 00:00:00 2001 From: Anders Waldenborg Date: Wed, 9 Oct 2013 19:02:09 +0000 Subject: [PATCH] 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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192316 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm-c/Target.h | 47 +++++++++------------------------------ lib/Target/AllTargets.cpp | 43 +++++++++++++++++++++++++++++++++++ lib/Target/CMakeLists.txt | 1 + 3 files changed, 55 insertions(+), 36 deletions(-) create mode 100644 lib/Target/AllTargets.cpp diff --git a/include/llvm-c/Target.h b/include/llvm-c/Target.h index 80fc3e5ad72..1d7884f1424 100644 --- a/include/llvm-c/Target.h +++ b/include/llvm-c/Target.h @@ -71,62 +71,37 @@ typedef struct LLVMStructLayout *LLVMStructLayoutRef; 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. */ diff --git a/lib/Target/AllTargets.cpp b/lib/Target/AllTargets.cpp new file mode 100644 index 00000000000..a265e8878a1 --- /dev/null +++ b/lib/Target/AllTargets.cpp @@ -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(); +} diff --git a/lib/Target/CMakeLists.txt b/lib/Target/CMakeLists.txt index 02ac493b421..75b65cfffa4 100644 --- a/lib/Target/CMakeLists.txt +++ b/lib/Target/CMakeLists.txt @@ -1,4 +1,5 @@ add_llvm_library(LLVMTarget + AllTargets.cpp Mangler.cpp Target.cpp TargetIntrinsicInfo.cpp -- 2.34.1