summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/lli/Makefile2
-rw-r--r--tools/llvm-config/llvm-config.in.in9
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index b070cee271..8f6eeed486 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := lli
-LINK_COMPONENTS := jit interpreter native bitreader selectiondag
+LINK_COMPONENTS := jit interpreter nativecodegen bitreader selectiondag
# Enable JIT support
include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in
index 296ba4266d..36b5112bb6 100644
--- a/tools/llvm-config/llvm-config.in.in
+++ b/tools/llvm-config/llvm-config.in.in
@@ -326,8 +326,17 @@ sub build_name_map {
}
}
+ # Add target-specific entries
+ foreach my $target (@TARGETS_BUILT) {
+ # FIXME: Temporary, until we don't switch all targets
+ if (defined $NAME_MAP{$target.'asmprinter'}) {
+ $NAME_MAP{$target} = [$target.'asmprinter', $target.'codegen']
+ }
+ }
+
# Add virtual entries.
$NAME_MAP{'native'} = have_native_backend() ? [$ARCH] : [];
+ $NAME_MAP{'nativecodegen'} = have_native_backend() ? [$ARCH.'codegen'] : [];
$NAME_MAP{'backend'} = have_native_backend() ? ['native'] : ['cbackend'];
$NAME_MAP{'engine'} = find_best_engine;
$NAME_MAP{'all'} = [name_map_entries]; # Must be last.