diff options
| author | Eric Christopher <echristo@apple.com> | 2010-08-30 18:34:48 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2010-08-30 18:34:48 +0000 |
| commit | 753f3265dafdcfeec07b561ca278524c35477583 (patch) | |
| tree | c8adfeeb491b48394175af2929c2ba38323604ae /include/llvm/Config | |
| parent | 2027362e8d99df1780ba604cff624b116a4e6ecf (diff) | |
Fix LLVM target initialization to deal with sociopathic outside projects
that like to randomly define things like "X86", regenerate autoconf bits
and update cmake.
Fixes PR7852.
Patch by Xerxes Rånby!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112499 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Config')
| -rw-r--r-- | include/llvm/Config/config.h.cmake | 16 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.in | 10 | ||||
| -rw-r--r-- | include/llvm/Config/llvm-config.h.cmake | 12 | ||||
| -rw-r--r-- | include/llvm/Config/llvm-config.h.in | 10 |
4 files changed, 36 insertions, 12 deletions
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index 81e6ab5748..e8feabffda 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -626,10 +626,16 @@ /* Define to a function implementing strdup */ #cmakedefine strdup ${strdup} -/* Native LLVM architecture */ -#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH}Target - -/* Native LLVM architecture, short name */ -#cmakedefine LLVM_NATIVE_ARCHNAME ${LLVM_NATIVE_ARCH} +/* LLVM architecture name for the native architecture, if available */ +#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH} + +/* LLVM name for the native Target init function, if available */ +#cmakedefine LLVM_NATIVE_TARGET LLVMInitialize${LLVM_NATIVE_ARCH}Target + +/* LLVM name for the native TargetInfo init function, if available */ +#cmakedefine LLVM_NATIVE_TARGETINFO LLVMInitialize${LLVM_NATIVE_ARCH}TargetInfo + +/* LLVM name for the native AsmPrinter init function, if available */ +#cmakedefine LLVM_NATIVE_ASMPRINTER LLVMInitialize${LLVM_NATIVE_ARCH}AsmPrinter #endif diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index 911f9877ba..d62da1ab03 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -500,8 +500,14 @@ /* LLVM architecture name for the native architecture, if available */ #undef LLVM_NATIVE_ARCH -/* Short LLVM architecture name for the native architecture, if available */ -#undef LLVM_NATIVE_ARCHNAME +/* LLVM name for the native AsmPrinter init function, if available */ +#undef LLVM_NATIVE_ASMPRINTER + +/* LLVM name for the native Target init function, if available */ +#undef LLVM_NATIVE_TARGET + +/* LLVM name for the native TargetInfo init function, if available */ +#undef LLVM_NATIVE_TARGETINFO /* Define if this is Unixish platform */ #undef LLVM_ON_UNIX diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake index b68592a64a..8469bcc606 100644 --- a/include/llvm/Config/llvm-config.h.cmake +++ b/include/llvm/Config/llvm-config.h.cmake @@ -50,10 +50,16 @@ #cmakedefine LLVM_MULTITHREADED /* LLVM architecture name for the native architecture, if available */ -#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH}Target +#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH} -/* Short LLVM architecture name for the native architecture, if available */ -#cmakedefine LLVM_NATIVE_ARCHNAME ${LLVM_NATIVE_ARCH} +/* LLVM name for the native Target init function, if available */ +#cmakedefine LLVM_NATIVE_TARGET LLVMInitialize${LLVM_NATIVE_ARCH}Target + +/* LLVM name for the native TargetInfo init function, if available */ +#cmakedefine LLVM_NATIVE_TARGETINFO LLVMInitialize${LLVM_NATIVE_ARCH}TargetInfo + +/* LLVM name for the native AsmPrinter init function, if available */ +#cmakedefine LLVM_NATIVE_ASMPRINTER LLVMInitialize${LLVM_NATIVE_ARCH}AsmPrinter /* Define if this is Unixish platform */ #cmakedefine LLVM_ON_UNIX diff --git a/include/llvm/Config/llvm-config.h.in b/include/llvm/Config/llvm-config.h.in index f35859ea04..e7a04ee91b 100644 --- a/include/llvm/Config/llvm-config.h.in +++ b/include/llvm/Config/llvm-config.h.in @@ -52,8 +52,14 @@ /* LLVM architecture name for the native architecture, if available */ #undef LLVM_NATIVE_ARCH -/* Short LLVM architecture name for the native architecture, if available */ -#undef LLVM_NATIVE_ARCHNAME +/* LLVM name for the native Target init function, if available */ +#undef LLVM_NATIVE_TARGET + +/* LLVM name for the native TargetInfo init function, if available */ +#undef LLVM_NATIVE_TARGETINFO + +/* LLVM name for the native AsmPrinter init function, if available */ +#undef LLVM_NATIVE_ASMPRINTER /* Define if this is Unixish platform */ #undef LLVM_ON_UNIX |