[llvm-commits] [llvm] r116291 - in /llvm/trunk: autoconf/configure.ac configure

[Chris Lattner]

On Oct 11, 2010, at 7:42 PM, Eric Christopher wrote:

> Author: echristo
> Date: Mon Oct 11 21:42:05 2010
> New Revision: 116291
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=116291&view=rev
> Log:
> Fix the last two commits to configure - configure is a generated file.
> Made necessary edits to configure.ac and regenerated.

Doh, thanks eric.  That was a short term hack that I forgot about while doing the rest of the excision.

-Chris

> 
> Modified:
>    llvm/trunk/autoconf/configure.ac
>    llvm/trunk/configure
> 
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=116291&r1=116290&r2=116291&view=diff
> ==============================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Mon Oct 11 21:42:05 2010
> @@ -326,7 +326,6 @@
>   alpha*-*)               llvm_cv_target_arch="Alpha" ;;
>   arm*-*)                 llvm_cv_target_arch="ARM" ;;
>   mips-*)                 llvm_cv_target_arch="Mips" ;;
> -  pic16-*)                llvm_cv_target_arch="PIC16" ;;
>   xcore-*)                llvm_cv_target_arch="XCore" ;;
>   msp430-*)               llvm_cv_target_arch="MSP430" ;;
>   s390x-*)                llvm_cv_target_arch="SystemZ" ;;
> @@ -464,7 +463,6 @@
>     Alpha)       AC_SUBST(TARGET_HAS_JIT,1) ;;
>     ARM)         AC_SUBST(TARGET_HAS_JIT,1) ;;
>     Mips)        AC_SUBST(TARGET_HAS_JIT,0) ;;
> -    PIC16)       AC_SUBST(TARGET_HAS_JIT,0) ;;
>     XCore)       AC_SUBST(TARGET_HAS_JIT,0) ;;
>     MSP430)      AC_SUBST(TARGET_HAS_JIT,0) ;;
>     SystemZ)     AC_SUBST(TARGET_HAS_JIT,0) ;;
> @@ -544,14 +542,14 @@
> 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, alpha, arm, mips, spu, pic16,
> +     host, x86, x86_64, sparc, powerpc, alpha, arm, mips, spu,
>      xcore, msp430, systemz, blackfin, ptx, cbe, and cpp (default=all)]),,
>     enableval=all)
> if test "$enableval" = host-only ; then
>   enableval=host
> fi
> case "$enableval" in
> -  all) TARGETS_TO_BUILD="X86 Sparc PowerPC Alpha ARM Mips CellSPU PIC16 XCore MSP430 SystemZ Blackfin CBackend CppBackend MBlaze PTX" ;;
> +  all) TARGETS_TO_BUILD="X86 Sparc PowerPC Alpha ARM Mips CellSPU XCore MSP430 SystemZ Blackfin CBackend CppBackend MBlaze PTX" ;;
>   *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
>       case "$a_target" in
>         x86)      TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
> @@ -562,7 +560,6 @@
>         arm)      TARGETS_TO_BUILD="ARM $TARGETS_TO_BUILD" ;;
>         mips)     TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;;
>         spu)      TARGETS_TO_BUILD="CellSPU $TARGETS_TO_BUILD" ;;
> -        pic16)    TARGETS_TO_BUILD="PIC16 $TARGETS_TO_BUILD" ;;
>         xcore)    TARGETS_TO_BUILD="XCore $TARGETS_TO_BUILD" ;;
>         msp430)   TARGETS_TO_BUILD="MSP430 $TARGETS_TO_BUILD" ;;
>         systemz)  TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;;
> @@ -581,7 +578,6 @@
>             Mips)        TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;;
>             MBlaze)      TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;;
>             CellSPU|SPU) TARGETS_TO_BUILD="CellSPU $TARGETS_TO_BUILD" ;;
> -            PIC16)       TARGETS_TO_BUILD="PIC16 $TARGETS_TO_BUILD" ;;
>             XCore)       TARGETS_TO_BUILD="XCore $TARGETS_TO_BUILD" ;;
>             MSP430)      TARGETS_TO_BUILD="MSP430 $TARGETS_TO_BUILD" ;;
>             s390x)       TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;;
> @@ -625,6 +621,10 @@
>   if test -f ${srcdir}/lib/Target/${target_to_build}/AsmPrinter/Makefile ; then
>     LLVM_ENUM_ASM_PRINTERS="LLVM_ASM_PRINTER($target_to_build) $LLVM_ENUM_ASM_PRINTERS";
>   fi
> +  # MC-ized AsmPrinters live in TARGET/InstPrinter, not AsmPrinter
> +  if test -f ${srcdir}/lib/Target/${target_to_build}/InstPrinter/Makefile ; then
> +    LLVM_ENUM_ASM_PRINTERS="LLVM_ASM_PRINTER($target_to_build) $LLVM_ENUM_ASM_PRINTERS";
> +  fi
>   if test -f ${srcdir}/lib/Target/${target_to_build}/AsmParser/Makefile ; then
>     LLVM_ENUM_ASM_PARSERS="LLVM_ASM_PARSER($target_to_build) $LLVM_ENUM_ASM_PARSERS";
>   fi
> 
> Modified: llvm/trunk/configure
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=116291&r1=116290&r2=116291&view=diff
> ==============================================================================
> --- llvm/trunk/configure (original)
> +++ llvm/trunk/configure Mon Oct 11 21:42:05 2010
> @@ -1415,8 +1415,8 @@
>   --enable-targets        Build specific host targets: all or
>                           target1,target2,... Valid targets are: host, x86,
>                           x86_64, sparc, powerpc, alpha, arm, mips, spu,
> -                          pic16, xcore, msp430, systemz, blackfin, ptx, cbe,
> -                          and cpp (default=all)
> +                          xcore, msp430, systemz, blackfin, ptx, cbe, and cpp
> +                          (default=all)
>   --enable-cbe-printf-a   Enable C Backend output with hex floating point via
>                           %a (default is YES)
>   --enable-bindings       Build specific language bindings:
> @@ -5049,7 +5049,6 @@
>   if test -f ${srcdir}/lib/Target/${target_to_build}/InstPrinter/Makefile ; then
>     LLVM_ENUM_ASM_PRINTERS="LLVM_ASM_PRINTER($target_to_build) $LLVM_ENUM_ASM_PRINTERS";
>   fi
> -
>   if test -f ${srcdir}/lib/Target/${target_to_build}/AsmParser/Makefile ; then
>     LLVM_ENUM_ASM_PARSERS="LLVM_ASM_PARSER($target_to_build) $LLVM_ENUM_ASM_PARSERS";
>   fi
> @@ -11451,7 +11450,7 @@
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
> -#line 11454 "configure"
> +#line 11453 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits