<div dir="ltr">Note this change was by Kuba Ober.<div><br></div><div>I don't seem to be able to edit the commit message. My apologies...</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Mar 13, 2014 at 2:16 PM, Todd Fiala <span dir="ltr"><<a href="mailto:tfiala@google.com" target="_blank">tfiala@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tfiala<br>
Date: Thu Mar 13 16:16:13 2014<br>
New Revision: 203850<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=203850&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=203850&view=rev</a><br>
Log:<br>
Fix cmake build issues on Darwin.<br>
<br>
Modified:<br>
lldb/trunk/source/CMakeLists.txt<br>
lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt<br>
lldb/trunk/source/Plugins/Process/CMakeLists.txt<br>
lldb/trunk/tools/debugserver/source/CMakeLists.txt<br>
lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt<br>
lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp<br>
lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h<br>
<br>
Modified: lldb/trunk/source/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/CMakeLists.txt (original)<br>
+++ lldb/trunk/source/CMakeLists.txt Thu Mar 13 16:16:13 2014<br>
@@ -135,6 +135,9 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Darwin"<br>
lldbPluginProcessMacOSXKernel<br>
lldbPluginSymbolVendorMacOSX<br>
lldbPluginSystemRuntimeMacOSX<br>
+ lldbPluginProcessPOSIX<br>
+ lldbPluginProcessElfCore<br>
+ lldbPluginJITLoaderGDB<br>
)<br>
endif()<br>
<br>
@@ -167,6 +170,8 @@ if (NOT LLDB_DISABLE_PYTHON)<br>
list(APPEND LLDB_SYSTEM_LIBS ${PYTHON_LIBRARIES})<br>
endif()<br>
<br>
+list(APPEND LLDB_SYSTEM_LIBS ${system_libs})<br>
+<br>
set( LLVM_LINK_COMPONENTS<br>
${LLVM_TARGETS_TO_BUILD}<br>
jit<br>
<br>
Modified: lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt (original)<br>
+++ lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt Thu Mar 13 16:16:13 2014<br>
@@ -1,3 +1,4 @@<br>
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Windows")<br>
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux"<br>
+ OR CMAKE_SYSTEM_NAME MATCHES "Windows" OR CMAKE_SYSTEM_NAME MATCHES "Darwin")<br>
add_subdirectory(GDB)<br>
endif()<br>
<br>
Modified: lldb/trunk/source/Plugins/Process/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Plugins/Process/CMakeLists.txt (original)<br>
+++ lldb/trunk/source/Plugins/Process/CMakeLists.txt Thu Mar 13 16:16:13 2014<br>
@@ -1,16 +1,15 @@<br>
if (CMAKE_SYSTEM_NAME MATCHES "Linux")<br>
add_subdirectory(Linux)<br>
add_subdirectory(POSIX)<br>
- add_subdirectory(elf-core)<br>
elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")<br>
add_subdirectory(FreeBSD)<br>
add_subdirectory(POSIX)<br>
- add_subdirectory(elf-core)<br>
elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")<br>
- add_subdirectory(elf-core)<br>
elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")<br>
+ add_subdirectory(POSIX)<br>
add_subdirectory(MacOSX-Kernel)<br>
endif()<br>
add_subdirectory(gdb-remote)<br>
add_subdirectory(Utility)<br>
add_subdirectory(mach-core)<br>
+add_subdirectory(elf-core)<br>
<br>
Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/debugserver/source/CMakeLists.txt (original)<br>
+++ lldb/trunk/tools/debugserver/source/CMakeLists.txt Thu Mar 13 16:16:13 2014<br>
@@ -40,6 +40,8 @@ add_library(lldbDebugserverCommon<br>
add_dependencies(lldbDebugserverCommon generate_dnbconfig)<br>
<br>
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")<br>
+ find_library(COCOA_LIBRARY Cocoa)<br>
+ target_link_libraries(lldbDebugserverCommon ${COCOA_LIBRARY})<br>
add_subdirectory(MacOSX)<br>
endif()<br>
<br>
<br>
Modified: lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt (original)<br>
+++ lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Thu Mar 13 16:16:13 2014<br>
@@ -40,6 +40,12 @@ add_lldb_executable(debugserver<br>
${generated_mach_interfaces}<br>
)<br>
<br>
+set_source_files_properties(<br>
+ HasAVX.s<br>
+ # Necessary since compilation will fail with stand-alone assembler<br>
+ PROPERTIES LANGUAGE C COMPILE_FLAGS "-x assembler-with-cpp"<br>
+ )<br>
+<br>
add_dependencies(debugserver generate_dnbconfig)<br>
target_link_libraries(debugserver ${DEBUGSERVER_USED_LIBS})<br>
<br>
<br>
Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp (original)<br>
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Thu Mar 13 16:16:13 2014<br>
@@ -18,6 +18,7 @@<br>
#include <sys/sysctl.h><br>
<br>
#include "MacOSX/x86_64/DNBArchImplX86_64.h"<br>
+#include "../HasAVX.h"<br>
#include "DNBLog.h"<br>
#include "MachThread.h"<br>
#include "MachProcess.h"<br>
<br>
Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h?rev=203850&r1=203849&r2=203850&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h?rev=203850&r1=203849&r2=203850&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h (original)<br>
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h Thu Mar 13 16:16:13 2014<br>
@@ -16,7 +16,6 @@<br>
<br>
#if defined (__i386__) || defined (__x86_64__)<br>
#include "DNBArch.h"<br>
-#include "../HasAVX.h"<br>
#include "MachRegisterStatesX86_64.h"<br>
<br>
#include <map><br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><table cellspacing="0" cellpadding="0" style="color:rgb(136,136,136);font-family:'Times New Roman'"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small">
<td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Todd Fiala |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a> |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"><font color="#1155cc"> <a>650-943-3180</a></font></td></tr></tbody></table><br></div>
</div>