RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-03 16:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build system fixes. llvm-mc depends on

Browse Source 
libEnhancedDisassembly, so we now build the
static library in all cases (although the shared
library is only built when requested/possible).

Also, fixed a bug where edis wasn't properly
initializing the targets it uses.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101072 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Callanan 2010-04-12 21:55:49 +00:00
parent ca9b7037e2
commit 2fb938fd42
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/Makefile
View File

@ -15,7 +15,10 @@ OPTIONAL_PARALLEL_DIRS := clang
# NOTE: The tools are organized into five groups of four consisting of one # NOTE: The tools are organized into five groups of four consisting of one
# large and three small executables. This is done to minimize memory load # large and three small executables. This is done to minimize memory load
# in parallel builds. Please retain this ordering. # in parallel builds. Please retain this ordering.
DIRS := llvm-config
# libEnhancedDisassembly must be built ahead of llvm-mc
# because llvm-mc links against libEnhancedDisassembly
DIRS := llvm-config edis
PARALLEL_DIRS := opt llvm-as llvm-dis \ PARALLEL_DIRS := opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \ llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \ llvm-ld llvm-prof llvm-link \
@ -36,10 +39,6 @@ include $(LEVEL)/Makefile.config
ifeq ($(ENABLE_PIC),1) ifeq ($(ENABLE_PIC),1)
# No support for dynamic libraries on windows targets. # No support for dynamic libraries on windows targets.
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW)) ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
# libEnhancedDisassembly must be built ahead of llvm-mc
# because llvm-mc links against libEnhancedDisassembly
DIRS += edis
# gold only builds if binutils is around. It requires "lto" to build before # gold only builds if binutils is around. It requires "lto" to build before
# it so it is added to DIRS. # it so it is added to DIRS.
ifdef BINUTILS_INCDIR ifdef BINUTILS_INCDIR
@ -50,11 +49,6 @@ ifeq ($(ENABLE_PIC),1)
endif endif
endif endif
# Only build edis if X86 target support is enabled.
ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
endif
# Don't build edis if we explicitly disabled it. # Don't build edis if we explicitly disabled it.
ifeq ($(DISABLE_EDIS),1) ifeq ($(DISABLE_EDIS),1)
PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS)) PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))

11
tools/edis/Makefile
View File

@ -17,8 +17,12 @@ BUILT_SOURCES = EDInfo.inc
# early so we can set up LINK_COMPONENTS before including Makefile.rules # early so we can set up LINK_COMPONENTS before including Makefile.rules
include $(LEVEL)/Makefile.config include $(LEVEL)/Makefile.config
LINK_LIBS_IN_SHARED = 1 ifeq ($(ENABLE_PIC),1)
SHARED_LIBRARY = 1 ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
endif
endif
LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler
@ -55,8 +59,7 @@ ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
EDIS_DEFINES := $(EDIS_DEFINES) -DEDIS_ARM EDIS_DEFINES := $(EDIS_DEFINES) -DEDIS_ARM
endif endif
CXXFLAGS := $(CXXFLAGS) CXXFLAGS := $(CXXFLAGS) $(EDIS_DEFINES)
#$(EDIS_DEFINES)
EDInfo.inc: $(TBLGEN) EDInfo.inc: $(TBLGEN)
$(Echo) "Building semantic information header" $(Echo) "Building semantic information header"