diff options
author | Anders Waldenborg <anders@0x63.nu> | 2013-10-15 13:04:27 +0000 |
---|---|---|
committer | Anders Waldenborg <anders@0x63.nu> | 2013-10-15 13:04:27 +0000 |
commit | bfcd45cfe114311b32b171c529fd387dd8eac55f (patch) | |
tree | 8db20f611c5d78ee1d0a2fd46cf756938f6376f4 /lib | |
parent | 6480db4b3afb0adb0ffcedc6e88e3b3f394a86cf (diff) | |
download | external_llvm-bfcd45cfe114311b32b171c529fd387dd8eac55f.zip external_llvm-bfcd45cfe114311b32b171c529fd387dd8eac55f.tar.gz external_llvm-bfcd45cfe114311b32b171c529fd387dd8eac55f.tar.bz2 |
Revert "Add AllTargetsBindings sublibrary" as it breaks cmake build on (atleast) windows and darwin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192697 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Target/AllTargetsBindings/AllTargetsBindings.cpp | 42 | ||||
-rw-r--r-- | lib/Target/AllTargetsBindings/CMakeLists.txt | 3 | ||||
-rw-r--r-- | lib/Target/AllTargetsBindings/LLVMBuild.txt | 32 | ||||
-rw-r--r-- | lib/Target/AllTargetsBindings/Makefile | 14 | ||||
-rw-r--r-- | lib/Target/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lib/Target/LLVMBuild.txt | 9 | ||||
-rw-r--r-- | lib/Target/Makefile | 2 |
7 files changed, 9 insertions, 95 deletions
diff --git a/lib/Target/AllTargetsBindings/AllTargetsBindings.cpp b/lib/Target/AllTargetsBindings/AllTargetsBindings.cpp deleted file mode 100644 index 5f1a9c9..0000000 --- a/lib/Target/AllTargetsBindings/AllTargetsBindings.cpp +++ /dev/null @@ -1,42 +0,0 @@ -//===-- AllTargetsBindings.cpp --------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements the llvm-c functions for initialization of -// different aspects of all configured targets. -// -//===----------------------------------------------------------------------===// - -#include "llvm-c/Target.h" -#include "llvm/Support/TargetSelect.h" - -using namespace llvm; - -void LLVMInitializeAllTargetInfos(void) { - InitializeAllTargetInfos(); -} - -void LLVMInitializeAllTargets(void) { - InitializeAllTargets(); -} - -void LLVMInitializeAllTargetMCs(void) { - InitializeAllTargetMCs(); -} - -void LLVMInitializeAllAsmPrinters(void) { - InitializeAllAsmPrinters(); -} - -void LLVMInitializeAllAsmParsers(void) { - InitializeAllAsmParsers(); -} - -void LLVMInitializeAllDisassemblers(void) { - InitializeAllDisassemblers(); -} diff --git a/lib/Target/AllTargetsBindings/CMakeLists.txt b/lib/Target/AllTargetsBindings/CMakeLists.txt deleted file mode 100644 index 4b4dc77..0000000 --- a/lib/Target/AllTargetsBindings/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMAllTargetsBindings - AllTargetsBindings.cpp - ) diff --git a/lib/Target/AllTargetsBindings/LLVMBuild.txt b/lib/Target/AllTargetsBindings/LLVMBuild.txt deleted file mode 100644 index ecf8aca..0000000 --- a/lib/Target/AllTargetsBindings/LLVMBuild.txt +++ /dev/null @@ -1,32 +0,0 @@ -;===- ./lib/Target/LLVMBuild.txt -------------------------------*- Conf -*--===; -; -; The LLVM Compiler Infrastructure -; -; This file is distributed under the University of Illinois Open Source -; License. See LICENSE.TXT for details. -; -;===------------------------------------------------------------------------===; -; -; This is an LLVMBuild description file for the components in this subdirectory. -; -; For more information on the LLVMBuild system, please see: -; -; http://llvm.org/docs/LLVMBuild.html -; -;===------------------------------------------------------------------------===; - -; This is a special group whose required libraries are extended (by llvm-build) -; with every built target, which makes it easy for tools to include every -; target. -[component_0] -type = LibraryGroup -name = all-targets -parent = Libraries - -; This is the actual library built in this directory. -; It just contains the llvm-c bindings LLVMInitializeAllTarget* functions -[component_1] -type = Library -name = AllTargetsBindings -parent = Libraries -add_to_library_groups = all-targets diff --git a/lib/Target/AllTargetsBindings/Makefile b/lib/Target/AllTargetsBindings/Makefile deleted file mode 100644 index 47a6883..0000000 --- a/lib/Target/AllTargetsBindings/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -#===- lib/Target/AllTargetsBindings/Makefile ---------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../../.. -LIBRARYNAME = LLVMAllTargetsBindings -BUILD_ARCHIVE = 1 - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/CMakeLists.txt b/lib/Target/CMakeLists.txt index 861c999..02ac493 100644 --- a/lib/Target/CMakeLists.txt +++ b/lib/Target/CMakeLists.txt @@ -14,5 +14,3 @@ foreach(t ${LLVM_TARGETS_TO_BUILD}) message(STATUS "Targeting ${t}") add_subdirectory(${t}) endforeach() - -add_subdirectory("AllTargetsBindings") diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt index 10dc3dc..98d26bc 100644 --- a/lib/Target/LLVMBuild.txt +++ b/lib/Target/LLVMBuild.txt @@ -16,7 +16,7 @@ ;===------------------------------------------------------------------------===; [common] -subdirectories = AArch64 ARM CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ X86 XCore AllTargetsBindings +subdirectories = AArch64 ARM CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ X86 XCore ; This is a special group whose required libraries are extended (by llvm-build) ; with the best execution engine (the native JIT, if available, or the @@ -47,3 +47,10 @@ name = Target parent = Libraries required_libraries = Core MC Support +; This is a special group whose required libraries are extended (by llvm-build) +; with every built target, which makes it easy for tools to include every +; target. +[component_4] +type = LibraryGroup +name = all-targets +parent = Libraries diff --git a/lib/Target/Makefile b/lib/Target/Makefile index cfa2edb..50a360f 100644 --- a/lib/Target/Makefile +++ b/lib/Target/Makefile @@ -15,6 +15,6 @@ BUILD_ARCHIVE = 1 # value for PARALLEL_DIRS which must be set before Makefile.rules is included include $(LEVEL)/Makefile.config -PARALLEL_DIRS := $(TARGETS_TO_BUILD) AllTargetsBindings +PARALLEL_DIRS := $(TARGETS_TO_BUILD) include $(LLVM_SRC_ROOT)/Makefile.rules |