diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-11-14 19:10:47 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-11-14 19:10:47 +0000 |
| commit | 287766075f58f44593e771f0fe716a7f29a0d197 (patch) | |
| tree | 0db4d787b7001d3f699804ff33120cfc87da9264 | |
| parent | 66031ed8394e34af35bfb02364d06b36d53e7b23 (diff) | |
| download | bcm5719-llvm-287766075f58f44593e771f0fe716a7f29a0d197.tar.gz bcm5719-llvm-287766075f58f44593e771f0fe716a7f29a0d197.zip | |
fix the autoconf script to detect "has asmprinter"ness of a target by
looking for lib/Target/*AsmPrinter.cpp. Fix llvm-config to handle targets
that don't have an explicit AsmPrinter library.
llvm-svn: 119057
| -rw-r--r-- | llvm/autoconf/configure.ac | 6 | ||||
| -rwxr-xr-x | llvm/configure | 6 | ||||
| -rw-r--r-- | llvm/tools/llvm-config/llvm-config.in.in | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 09e3379f36f..74cb0aa7c27 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -650,11 +650,7 @@ LLVM_ENUM_ASM_PARSERS="" LLVM_ENUM_DISASSEMBLERS="" for target_to_build in $TARGETS_TO_BUILD; do LLVM_ENUM_TARGETS="LLVM_TARGET($target_to_build) $LLVM_ENUM_TARGETS" - 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 + if test -f ${srcdir}/lib/Target/${target_to_build}/*AsmPrinter.cpp ; 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 diff --git a/llvm/configure b/llvm/configure index d65e2ff316c..cafc334c9df 100755 --- a/llvm/configure +++ b/llvm/configure @@ -5100,11 +5100,7 @@ LLVM_ENUM_ASM_PARSERS="" LLVM_ENUM_DISASSEMBLERS="" for target_to_build in $TARGETS_TO_BUILD; do LLVM_ENUM_TARGETS="LLVM_TARGET($target_to_build) $LLVM_ENUM_TARGETS" - 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 + if test -f ${srcdir}/lib/Target/${target_to_build}/*AsmPrinter.cpp ; 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 diff --git a/llvm/tools/llvm-config/llvm-config.in.in b/llvm/tools/llvm-config/llvm-config.in.in index a13307b867c..840a10e23a1 100644 --- a/llvm/tools/llvm-config/llvm-config.in.in +++ b/llvm/tools/llvm-config/llvm-config.in.in @@ -320,6 +320,9 @@ sub build_name_map { $NAME_MAP{$target} = [$target.'info', $target.'asmprinter', $target.'codegen'] + } elsif (defined $NAME_MAP{$target.'codegen'}) { + $NAME_MAP{$target} = [$target.'info', + $target.'codegen'] } else { $NAME_MAP{$target} = [$target.'info', $NAME_MAP{$target}[0]] |
