diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-04-13 22:47:43 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-04-13 22:47:43 +0000 |
| commit | 9078f954bfbfa336385c92f10a53d38f34bc453c (patch) | |
| tree | 5b16ca5012eb88df4257c05e84b7f2b1e4d02336 /llvm | |
| parent | 900d980cd881f40da142ae12c9f4317217f4dad2 (diff) | |
| download | bcm5719-llvm-9078f954bfbfa336385c92f10a53d38f34bc453c.tar.gz bcm5719-llvm-9078f954bfbfa336385c92f10a53d38f34bc453c.zip | |
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
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/ARM/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | llvm/tools/edis/CMakeLists.txt | 18 |
3 files changed, 3 insertions, 17 deletions
diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt index bbc0095f6ae..e2b073fab5f 100644 --- a/llvm/lib/Target/ARM/CMakeLists.txt +++ b/llvm/lib/Target/ARM/CMakeLists.txt @@ -10,6 +10,7 @@ tablegen(ARMGenAsmWriter.inc -gen-asm-writer) tablegen(ARMGenDAGISel.inc -gen-dag-isel) tablegen(ARMGenCallingConv.inc -gen-callingconv) tablegen(ARMGenSubtarget.inc -gen-subtarget) +tablegen(ARMGenEDInfo.inc -gen-enhanced-disassembly-info) add_llvm_target(ARMCodeGen ARMBaseInstrInfo.cpp diff --git a/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt index 22285f19323..cac32dbb0b2 100644 --- a/llvm/lib/Target/X86/CMakeLists.txt +++ b/llvm/lib/Target/X86/CMakeLists.txt @@ -13,6 +13,7 @@ tablegen(X86GenDAGISel.inc -gen-dag-isel) tablegen(X86GenFastISel.inc -gen-fast-isel) tablegen(X86GenCallingConv.inc -gen-callingconv) tablegen(X86GenSubtarget.inc -gen-subtarget) +tablegen(X86GenEDInfo.inc -gen-enhanced-disassembly-info) set(sources SSEDomainFix.cpp diff --git a/llvm/tools/edis/CMakeLists.txt b/llvm/tools/edis/CMakeLists.txt index 5f11ab4798d..f7a199d597b 100644 --- a/llvm/tools/edis/CMakeLists.txt +++ b/llvm/tools/edis/CMakeLists.txt @@ -1,4 +1,3 @@ -set(SHARED_LIBRARY TRUE) set(LLVM_NO_RTTI 1) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc @@ -20,22 +19,7 @@ add_llvm_library(EnhancedDisassembly ${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 PROPERTIES LINKER_LANGUAGE CXX) -
\ No newline at end of file + |
