diff options
| author | Stephen Hines <srhines@google.com> | 2014-12-04 19:51:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 19:51:48 +0000 |
| commit | a21bbdfad461e957fa42ac9d6860ddc9de2da3e9 (patch) | |
| tree | 8d32ff2094b47e15a8def30d62fd7dee6e009de3 /host | |
| parent | 6b8c6a5088c221af2b25065b8b6b8b0fec8a116f (diff) | |
| parent | 876d6995443e99d13696f3941c3a789a4daa7c7a (diff) | |
| download | external_llvm-a21bbdfad461e957fa42ac9d6860ddc9de2da3e9.zip external_llvm-a21bbdfad461e957fa42ac9d6860ddc9de2da3e9.tar.gz external_llvm-a21bbdfad461e957fa42ac9d6860ddc9de2da3e9.tar.bz2 | |
am 876d6995: Merge "Update aosp/master LLVM for rebase to r222494."
* commit '876d6995443e99d13696f3941c3a789a4daa7c7a':
Update aosp/master LLVM for rebase to r222494.
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/llvm/Config/config.h | 10 | ||||
| -rw-r--r-- | host/include/llvm/Config/llvm-config.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h index 2626a32..052adab 100644 --- a/host/include/llvm/Config/config.h +++ b/host/include/llvm/Config/config.h @@ -223,7 +223,11 @@ #define HAVE_LINK_EXPORT_DYNAMIC 1 /* Define to 1 if you have the <link.h> header file. */ +#if defined(__APPLE__) +/* #undef HAVE_LINK_H */ +#else #define HAVE_LINK_H 1 +#endif /* Define if you can use -Wl,-R. to pass -R. to the linker, in order to add the current directory to the dynamic linker search path. */ @@ -650,7 +654,7 @@ #define LLVM_VERSION_MAJOR 3 /* Minor version of the LLVM API */ -#define LLVM_VERSION_MINOR 5 +#define LLVM_VERSION_MINOR 6 /* Define if the OS needs help to load dependent libraries for dlopen(). */ /* #undef LTDL_DLOPEN_DEPLIBS */ @@ -683,13 +687,13 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 3.5.svn" +#define PACKAGE_STRING "LLVM 3.6.svn" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "llvm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.5" +#define PACKAGE_VERSION "3.6" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void diff --git a/host/include/llvm/Config/llvm-config.h b/host/include/llvm/Config/llvm-config.h index 95f85fe..6cb218e 100644 --- a/host/include/llvm/Config/llvm-config.h +++ b/host/include/llvm/Config/llvm-config.h @@ -95,7 +95,7 @@ #define LLVM_VERSION_MAJOR 3 /* Minor version of the LLVM API */ -#define LLVM_VERSION_MINOR 5 +#define LLVM_VERSION_MINOR 6 #include "llvm/Config/llvm-platform-config.h" |