wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak CMake build by improving the EnhancedDisassembly makefile a 

bit (we're not trying to build a shared library yet) and generating
the X86GenEDInfo.inc and ARMGenEDInfo.inc files as necessary.

llvm-svn: 101188
This commit is contained in:
Douglas Gregor 2010-04-13 22:47:43 +00:00
parent 900d980cd8
commit 9078f954bf
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/lib/Target/ARM/CMakeLists.txt
View File

@ -10,6 +10,7 @@ tablegen(ARMGenAsmWriter.inc -gen-asm-writer)
tablegen(ARMGenDAGISel.inc -gen-dag-isel) tablegen(ARMGenDAGISel.inc -gen-dag-isel)
tablegen(ARMGenCallingConv.inc -gen-callingconv) tablegen(ARMGenCallingConv.inc -gen-callingconv)
tablegen(ARMGenSubtarget.inc -gen-subtarget) tablegen(ARMGenSubtarget.inc -gen-subtarget)
tablegen(ARMGenEDInfo.inc -gen-enhanced-disassembly-info)
add_llvm_target(ARMCodeGen add_llvm_target(ARMCodeGen
ARMBaseInstrInfo.cpp ARMBaseInstrInfo.cpp

1
llvm/lib/Target/X86/CMakeLists.txt
View File

@ -13,6 +13,7 @@ tablegen(X86GenDAGISel.inc -gen-dag-isel)
tablegen(X86GenFastISel.inc -gen-fast-isel) tablegen(X86GenFastISel.inc -gen-fast-isel)
tablegen(X86GenCallingConv.inc -gen-callingconv) tablegen(X86GenCallingConv.inc -gen-callingconv)
tablegen(X86GenSubtarget.inc -gen-subtarget) tablegen(X86GenSubtarget.inc -gen-subtarget)
tablegen(X86GenEDInfo.inc -gen-enhanced-disassembly-info)
set(sources set(sources
SSEDomainFix.cpp SSEDomainFix.cpp

16
llvm/tools/edis/CMakeLists.txt
View File

@ -1,4 +1,3 @@
set(SHARED_LIBRARY TRUE)
set(LLVM_NO_RTTI 1) set(LLVM_NO_RTTI 1)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
@ -20,21 +19,6 @@ add_llvm_library(EnhancedDisassembly
${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
) )
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# FIXME: Deal with EDIS version?
set_target_properties(EnhancedDisassembly
PROPERTIES
LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/EnhancedDisassembly.exports -Wl,-dead_strip -Wl"
)
endif()
if(MSVC)
# windows.h doesn't compile with /Za
get_target_property(NON_ANSI_COMPILE_FLAGS CIndex COMPILE_FLAGS)
string(REPLACE /Za "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
set_target_properties(EnhancedDisassembly PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
endif(MSVC)
set_target_properties(EnhancedDisassembly set_target_properties(EnhancedDisassembly
PROPERTIES PROPERTIES
LINKER_LANGUAGE CXX) LINKER_LANGUAGE CXX)