summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/Makefile5
-rw-r--r--tools/lto/LTOCodeGenerator.cpp (renamed from tools/lto2/LTOCodeGenerator.cpp)0
-rw-r--r--tools/lto/LTOCodeGenerator.h (renamed from tools/lto2/LTOCodeGenerator.h)0
-rw-r--r--tools/lto/LTOModule.cpp (renamed from tools/lto2/LTOModule.cpp)0
-rw-r--r--tools/lto/LTOModule.h (renamed from tools/lto2/LTOModule.h)0
-rw-r--r--tools/lto/Makefile (renamed from tools/lto2/Makefile)0
-rw-r--r--tools/lto/lto.cpp (renamed from tools/lto2/lto.cpp)0
-rw-r--r--tools/lto/lto.exports (renamed from tools/lto2/lto.exports)0
8 files changed, 1 insertions, 4 deletions
diff --git a/tools/Makefile b/tools/Makefile
index d742f41bd6..30da5224a9 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,12 +21,9 @@ PARALLEL_DIRS := llvm-config \
include $(LEVEL)/Makefile.config
-# Disable liblto as it is going away
-#PARALLEL_DIRS += lto
-
# only build new lto project on Darwin for now
ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto2
+PARALLEL_DIRS += lto
endif
include $(LEVEL)/Makefile.common
diff --git a/tools/lto2/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index d82279d494..d82279d494 100644
--- a/tools/lto2/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
diff --git a/tools/lto2/LTOCodeGenerator.h b/tools/lto/LTOCodeGenerator.h
index eab076ebc8..eab076ebc8 100644
--- a/tools/lto2/LTOCodeGenerator.h
+++ b/tools/lto/LTOCodeGenerator.h
diff --git a/tools/lto2/LTOModule.cpp b/tools/lto/LTOModule.cpp
index 333e9ba103..333e9ba103 100644
--- a/tools/lto2/LTOModule.cpp
+++ b/tools/lto/LTOModule.cpp
diff --git a/tools/lto2/LTOModule.h b/tools/lto/LTOModule.h
index 40f92f9816..40f92f9816 100644
--- a/tools/lto2/LTOModule.h
+++ b/tools/lto/LTOModule.h
diff --git a/tools/lto2/Makefile b/tools/lto/Makefile
index 45fa69cd87..45fa69cd87 100644
--- a/tools/lto2/Makefile
+++ b/tools/lto/Makefile
diff --git a/tools/lto2/lto.cpp b/tools/lto/lto.cpp
index f60f7b5ac0..f60f7b5ac0 100644
--- a/tools/lto2/lto.cpp
+++ b/tools/lto/lto.cpp
diff --git a/tools/lto2/lto.exports b/tools/lto/lto.exports
index 415cbbe25b..415cbbe25b 100644
--- a/tools/lto2/lto.exports
+++ b/tools/lto/lto.exports