diff options
| author | Sebastian Pop <spop@codeaurora.org> | 2012-01-04 19:47:22 +0000 |
|---|---|---|
| committer | Sebastian Pop <spop@codeaurora.org> | 2012-01-04 19:47:22 +0000 |
| commit | 8a86887ba3dcf59ddfd1d26bd2af1ac9c6bed76a (patch) | |
| tree | d063101aa566588fde106548beed730b9023ced8 /projects | |
| parent | b0e7af779732c5ff3c054c837a4b04ad6089d0ac (diff) | |
use getHostTriple instead of getDefaultTargetTriple in getClosestTargetForJIT
Get back getHostTriple.
For JIT compilation, use the host triple instead of the default
target: this fixes some JIT testcases that used to fail when the
compiler has been configured as a cross compiler.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147542 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/sample/autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | projects/sample/configure | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index a19e87ddf9..3fd02578c4 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -1390,6 +1390,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_HOST_TRIPLE, "$host", + [Host triple LLVM will run on]) AC_DEFINE_UNQUOTED(LLVM_DEFAULT_TARGET_TRIPLE, "$target", [Target triple LLVM will generate code for by default]) diff --git a/projects/sample/configure b/projects/sample/configure index 860faa2927..f64383b3bd 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -8854,7 +8854,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) +freebsd1.*) dynamic_linker=no ;; @@ -8877,7 +8877,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[123].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -8895,7 +8895,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10409,7 +10409,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10423 "configure" +#line 10412 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20819,6 +20819,11 @@ _ACEOF cat >>confdefs.h <<_ACEOF +#define LLVM_HOST_TRIPLE "$host" +_ACEOF + + +cat >>confdefs.h <<_ACEOF #define LLVM_DEFAULT_TARGET_TRIPLE "$target" _ACEOF |