From 5c4e83626cceb2edf9ed158d89599dee0e878932 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Tue, 5 Mar 2013 14:43:07 +0000 Subject: Print a warning message if compiler-rt can't be built because of old CMake version to make this requirement more visible to users git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176481 91177308-0d34-0410-b5e6-96231b3b80d8 --- projects/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'projects') diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 36751cd31d..c19bb679d1 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -13,7 +13,10 @@ endforeach(entry) # Also add in the compiler-rt tree if present and we have a sufficiently # recent version of CMake. -if(${CMAKE_VERSION} VERSION_GREATER 2.8.7 AND - ${LLVM_BUILD_RUNTIME}) - add_llvm_external_project(compiler-rt) +if(${LLVM_BUILD_RUNTIME}) + if(${CMAKE_VERSION} VERSION_GREATER 2.8.7) + add_llvm_external_project(compiler-rt) + else() + message(WARNING "Can't build compiler-rt, CMake 2.8.8 required!") + endif() endif() -- cgit v1.2.3-18-g5258 From 8e46da20d9004f88a50c1a0e156b7525bea61334 Mon Sep 17 00:00:00 2001 From: Jia Liu Date: Wed, 24 Apr 2013 02:17:19 +0000 Subject: remove cbe backend from sample configure git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180169 91177308-0d34-0410-b5e6-96231b3b80d8 --- projects/sample/autoconf/configure.ac | 2 +- projects/sample/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'projects') diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index 283bc12bb3..b2c566aa73 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -592,7 +592,7 @@ TARGETS_TO_BUILD="" AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets], [Build specific host targets: all or target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon, - xcore, msp430, nvptx, cbe, and cpp (default=all)]),, + xcore, msp430, nvptx, and cpp (default=all)]),, enableval=all) if test "$enableval" = host-only ; then enableval=host diff --git a/projects/sample/configure b/projects/sample/configure index a8fc4bff7e..eef65565d5 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -1406,7 +1406,7 @@ Optional Features: --enable-targets Build specific host targets: all or target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon, - xcore, msp430, nvptx, cbe, and cpp (default=all) + xcore, msp430, nvptx, and cpp (default=all) --enable-bindings Build specific language bindings: all,auto,none,{binding-name} (default=auto) --enable-libffi Check for the presence of libffi (default is NO) -- cgit v1.2.3-18-g5258 From 735ab83b3cbe18c97ec9e397c41fa21a7ef639a4 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 6 May 2013 16:22:34 +0000 Subject: [SystemZ] Add configure bits This patch wires up the SystemZ target in configure, so that it can now be built using --enable-targets=systemz. It is not yet included in the default build (--enable-targets=all); this will be done by a follow-up patch. Patch by Richard Sandiford. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181208 91177308-0d34-0410-b5e6-96231b3b80d8 --- projects/sample/autoconf/configure.ac | 6 +++++- projects/sample/configure | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'projects') diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index b2c566aa73..a13fd67c9d 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -312,6 +312,7 @@ AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch], hexagon-*) llvm_cv_target_arch="Hexagon" ;; mblaze-*) llvm_cv_target_arch="MBlaze" ;; nvptx-*) llvm_cv_target_arch="NVPTX" ;; + s390x-*) llvm_cv_target_arch="SystemZ" ;; *) llvm_cv_target_arch="Unknown" ;; esac]) @@ -482,6 +483,7 @@ else Hexagon) AC_SUBST(TARGET_HAS_JIT,0) ;; MBlaze) AC_SUBST(TARGET_HAS_JIT,0) ;; NVPTX) AC_SUBST(TARGET_HAS_JIT,0) ;; + SystemZ) AC_SUBST(TARGET_HAS_JIT,1) ;; *) AC_SUBST(TARGET_HAS_JIT,0) ;; esac fi @@ -592,7 +594,7 @@ TARGETS_TO_BUILD="" AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets], [Build specific host targets: all or target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon, - xcore, msp430, nvptx, and cpp (default=all)]),, + xcore, msp430, nvptx, systemz, and cpp (default=all)]),, enableval=all) if test "$enableval" = host-only ; then enableval=host @@ -614,6 +616,7 @@ case "$enableval" in cpp) TARGETS_TO_BUILD="CppBackend $TARGETS_TO_BUILD" ;; mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;; nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + systemz) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; host) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; @@ -627,6 +630,7 @@ case "$enableval" in MSP430) TARGETS_TO_BUILD="MSP430 $TARGETS_TO_BUILD" ;; Hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; NVPTX) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + SystemZ) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; *) AC_MSG_ERROR([Can not set target to build]) ;; esac ;; *) AC_MSG_ERROR([Unrecognized target $a_target]) ;; diff --git a/projects/sample/configure b/projects/sample/configure index eef65565d5..e7ef0874ce 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -1406,7 +1406,7 @@ Optional Features: --enable-targets Build specific host targets: all or target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon, - xcore, msp430, nvptx, and cpp (default=all) + xcore, msp430, nvptx, systemz, and cpp (default=all) --enable-bindings Build specific language bindings: all,auto,none,{binding-name} (default=auto) --enable-libffi Check for the presence of libffi (default is NO) @@ -3852,6 +3852,7 @@ else hexagon-*) llvm_cv_target_arch="Hexagon" ;; mblaze-*) llvm_cv_target_arch="MBlaze" ;; nvptx-*) llvm_cv_target_arch="NVPTX" ;; + s390x-*) llvm_cv_target_arch="SystemZ" ;; *) llvm_cv_target_arch="Unknown" ;; esac fi @@ -5115,6 +5116,8 @@ else MBlaze) TARGET_HAS_JIT=0 ;; NVPTX) TARGET_HAS_JIT=0 + ;; + SystemZ) TARGET_HAS_JIT=1 ;; *) TARGET_HAS_JIT=0 ;; @@ -5316,6 +5319,7 @@ case "$enableval" in cpp) TARGETS_TO_BUILD="CppBackend $TARGETS_TO_BUILD" ;; mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;; nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + systemz) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; host) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; @@ -5329,6 +5333,7 @@ case "$enableval" in MSP430) TARGETS_TO_BUILD="MSP430 $TARGETS_TO_BUILD" ;; Hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; NVPTX) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; + SystemZ) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; *) { { echo "$as_me:$LINENO: error: Can not set target to build" >&5 echo "$as_me: error: Can not set target to build" >&2;} { (exit 1); exit 1; }; } ;; @@ -10353,7 +10358,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < Date: Mon, 6 May 2013 16:23:07 +0000 Subject: [SystemZ] Add to --enable-targets=all This patch finally enables the SystemZ target in the default build (with --enable-targets=all). Patch by Richard Sandiford. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181209 91177308-0d34-0410-b5e6-96231b3b80d8 --- projects/sample/autoconf/configure.ac | 2 +- projects/sample/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'projects') diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index a13fd67c9d..c0a1067595 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -600,7 +600,7 @@ if test "$enableval" = host-only ; then enableval=host fi case "$enableval" in - all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 Hexagon CppBackend MBlaze NVPTX" ;; + all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 Hexagon CppBackend MBlaze NVPTX SystemZ" ;; *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do case "$a_target" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; diff --git a/projects/sample/configure b/projects/sample/configure index e7ef0874ce..a2c70c626d 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -5303,7 +5303,7 @@ if test "$enableval" = host-only ; then enableval=host fi case "$enableval" in - all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 Hexagon CppBackend MBlaze NVPTX" ;; + all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 Hexagon CppBackend MBlaze NVPTX SystemZ" ;; *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do case "$a_target" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; -- cgit v1.2.3-18-g5258