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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119057 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 09e3379..74cb0aa 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -650,11 +650,7 @@
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/configure b/configure
index d65e2ff..cafc334 100755
--- a/configure
+++ b/configure
@@ -5100,11 +5100,7 @@
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/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in
index a13307b..840a10e 100644
--- a/tools/llvm-config/llvm-config.in.in
+++ b/tools/llvm-config/llvm-config.in.in
@@ -320,6 +320,9 @@
$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]]