diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-07-22 03:04:52 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-07-22 03:04:52 +0000 |
| commit | 2864de7c2d764a4be44bed073afadb663fdbb2dd (patch) | |
| tree | 4580679fc734a206afc53f6a5d2528ca75242e13 | |
| parent | c7088c9a9cc37a5dce54def94f8c347922e0631c (diff) | |
autoconf: Re-introduce LLVM_HOSTTRIPLE since r143500, as rework of PR11060.
cmake: Add LLVM_HOSTTRIPLE. For now, it is same as TARGET_TRIPLE.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160609 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | cmake/config-ix.cmake | 1 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.cmake | 3 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.in | 3 | ||||
| -rw-r--r-- | include/llvm/Config/llvm-config.h.cmake | 3 | ||||
| -rw-r--r-- | include/llvm/Config/llvm-config.h.in | 3 |
7 files changed, 20 insertions, 0 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 427c5413c6..7d36a06f14 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1538,6 +1538,8 @@ AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", [Installation directory for man pages]) AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", [Time at which LLVM was configured]) +AC_DEFINE_UNQUOTED(LLVM_HOSTTRIPLE, "$host", + [Host triple LLVM will be executed on]) AC_DEFINE_UNQUOTED(LLVM_DEFAULT_TARGET_TRIPLE, "$target", [Target triple LLVM will generate code for by default]) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 51b64ac8bb..25d6211ac6 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -295,6 +295,7 @@ get_host_triple(LLVM_HOST_TRIPLE) # By default, we target the host, but this can be overridden at CMake # invocation time. set(LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_HOST_TRIPLE}") +set(LLVM_HOSTTRIPLE "${LLVM_HOST_TRIPLE}") set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}") # Determine the native architecture. @@ -20949,6 +20949,11 @@ _ACEOF cat >>confdefs.h <<_ACEOF +#define LLVM_HOSTTRIPLE "$host" +_ACEOF + + +cat >>confdefs.h <<_ACEOF #define LLVM_DEFAULT_TARGET_TRIPLE "$target" _ACEOF diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index 5dcf11a9ce..b912251239 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -554,6 +554,9 @@ /* Has gcc/MSVC atomic intrinsics */ #cmakedefine01 LLVM_HAS_ATOMICS +/* Host triple LLVM will be executed on */ +#cmakedefine LLVM_HOSTTRIPLE "${LLVM_HOSTTRIPLE}" + /* Installation directory for include files */ #cmakedefine LLVM_INCLUDEDIR "${LLVM_INCLUDEDIR}" diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index ff7d16f2a0..fcd57a4b78 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -552,6 +552,9 @@ /* Has gcc/MSVC atomic intrinsics */ #undef LLVM_HAS_ATOMICS +/* Host triple LLVM will be executed on */ +#undef LLVM_HOSTTRIPLE + /* Installation directory for include files */ #undef LLVM_INCLUDEDIR diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake index 85d28fe134..39442926dc 100644 --- a/include/llvm/Config/llvm-config.h.cmake +++ b/include/llvm/Config/llvm-config.h.cmake @@ -40,6 +40,9 @@ /* Has gcc/MSVC atomic intrinsics */ #cmakedefine01 LLVM_HAS_ATOMICS +/* Host triple LLVM will be executed on */ +#cmakedefine LLVM_HOSTTRIPLE "${LLVM_HOSTTRIPLE}" + /* Installation directory for include files */ #cmakedefine LLVM_INCLUDEDIR "${LLVM_INCLUDEDIR}" diff --git a/include/llvm/Config/llvm-config.h.in b/include/llvm/Config/llvm-config.h.in index 973652ff2d..9489dfe016 100644 --- a/include/llvm/Config/llvm-config.h.in +++ b/include/llvm/Config/llvm-config.h.in @@ -40,6 +40,9 @@ /* Has gcc/MSVC atomic intrinsics */ #undef LLVM_HAS_ATOMICS +/* Host triple LLVM will be executed on */ +#undef LLVM_HOSTTRIPLE + /* Installation directory for include files */ #undef LLVM_INCLUDEDIR |