From 0e80e182a9401e6ae82df30ae93ef4b4585082f0 Mon Sep 17 00:00:00 2001 From: Victor Oliveira Date: Thu, 9 Aug 2012 01:13:59 +0000 Subject: [PATCH] Support for experimental targets Added LLVM_EXPERIMENTAL_TARGETS_TO_BUILD in CMake and --enable-experimental-targets in configure. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161561 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 8 ++++++++ autoconf/configure.ac | 11 +++++++++++ configure | 19 ++++++++++++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed230aee5ba..7b5240c7952 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,9 @@ else( MSVC ) CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") endif( MSVC ) +set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "" + CACHE STRING "Semicolon-separated list of experimental targets to build.") + option(BUILD_SHARED_LIBS "Build all libraries as shared libraries instead of static" OFF) @@ -136,6 +139,11 @@ foreach(c ${LLVM_TARGETS_TO_BUILD}) endif() endforeach(c) +set(LLVM_TARGETS_TO_BUILD + ${LLVM_TARGETS_TO_BUILD} + ${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD} + ) + set(llvm_builded_incs_dir ${LLVM_BINARY_DIR}/include/llvm) include(AddLLVMDefinitions) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 4d3a14efd4e..4dde3a6dfa3 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -717,6 +717,17 @@ case "$enableval" in done ;; esac + +AC_ARG_ENABLE([experimental-targets],AS_HELP_STRING([--enable-experimental-targets], + [Build experimental host targets: disable or target1,target2,... + (default=disable)]),, + enableval=disable) + +if test ${enableval} != "disable" +then + TARGETS_TO_BUILD="$enableval $TARGETS_TO_BUILD" +fi + AC_SUBST(TARGETS_TO_BUILD,$TARGETS_TO_BUILD) dnl Determine whether we are building LLVM support for the native architecture. diff --git a/configure b/configure index 405567c0f53..62a6478e0af 100755 --- a/configure +++ b/configure @@ -1425,6 +1425,9 @@ Optional Features: target1,target2,... Valid targets are: host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon, xcore, msp430, nvptx, and cpp (default=all) + --enable-experimental-targets + Build experimental host targets: disable or + target1,target2,... (default=disable) --enable-bindings Build specific language bindings: all,auto,none,{binding-name} (default=auto) --enable-libffi Check for the presence of libffi (default is NO) @@ -5415,6 +5418,20 @@ echo "$as_me: error: Unrecognized target $a_target" >&2;} done ;; esac + +# Check whether --enable-experimental-targets was given. +if test "${enable_experimental_targets+set}" = set; then + enableval=$enable_experimental_targets; +else + enableval=disable +fi + + +if test ${enableval} != "disable" +then + TARGETS_TO_BUILD="$enableval $TARGETS_TO_BUILD" +fi + TARGETS_TO_BUILD=$TARGETS_TO_BUILD @@ -10255,7 +10272,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <