[Lldb-commits] [lldb] r179705 - Revert 179694 -- it breaks remote debugging of mac os x targets for some folk

[Daniel Malea]

Author: dmalea
Date: Wed Apr 17 13:40:42 2013
New Revision: 179705

URL: http://llvm.org/viewvc/llvm-project?rev=179705&view=rev
Log:
Revert 179694 -- it breaks remote debugging of mac os x targets for some folk
- will commit a different workaround momentarily


Modified:
    lldb/trunk/CMakeLists.txt
    lldb/trunk/source/CMakeLists.txt
    lldb/trunk/source/Plugins/DynamicLoader/CMakeLists.txt
    lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
    lldb/trunk/source/Plugins/ObjectFile/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=179705&r1=179704&r2=179705&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Wed Apr 17 13:40:42 2013
@@ -93,13 +93,6 @@ else()
   set(CMAKE_CXX_FLAGS "-std=c++11")
 endif()
 
-# Disable Clang warnings
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  add_lldb_definitions(
-    -Wno-deprecated-declarations # Suppress "deprecated auto_ptr" warnings
-  )
-endif()
-
 # Disable MSVC warnings
 if( MSVC )
   add_lldb_definitions(

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=179705&r1=179704&r2=179705&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Wed Apr 17 13:40:42 2013
@@ -39,20 +39,24 @@ set( LLDB_USED_LIBS
   lldbPluginSymbolFileSymtab
   lldbPluginDynamicLoaderStatic
   
+  lldbPluginObjectFileMachO
+  lldbPluginObjectFileELF
   lldbPluginObjectContainerBSDArchive
   lldbPluginObjectContainerMachOArchive
-  lldbPluginObjectFileELF
   lldbPluginProcessGDBRemote  
   lldbPluginProcessUtility
   lldbPluginPlatformGDB
   lldbPluginPlatformFreeBSD
   lldbPluginPlatformLinux
+  lldbPluginObjectFileMachO
   lldbPluginObjectContainerMachOArchive
   lldbPluginObjectContainerBSDArchive
   lldbPluginPlatformMacOSX
+  lldbPluginDynamicLoaderMacOSXDYLD
   lldbPluginDynamicLoaderPosixDYLD
   lldbPluginUnwindAssemblyInstEmulation
   lldbPluginUnwindAssemblyX86
+  lldbPluginDynamicLoaderDarwinKernel
   lldbPluginAppleObjCRuntime
   lldbPluginCXXItaniumABI
   lldbPluginABIMacOSX_arm
@@ -81,15 +85,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
     )
 endif ()
 
-# Mac-only libraries
-if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-  list(APPEND LLDB_USED_LIBS
-    lldbPluginDynamicLoaderMacOSXDYLD
-    lldbPluginObjectFileMachO
-    lldbPluginDynamicLoaderDarwinKernel
-  )
-endif()
-
 set( CLANG_USED_LIBS
   clangAnalysis
   clangAST

Modified: lldb/trunk/source/Plugins/DynamicLoader/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/CMakeLists.txt?rev=179705&r1=179704&r2=179705&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/CMakeLists.txt Wed Apr 17 13:40:42 2013
@@ -1,6 +1,4 @@
-if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-  add_subdirectory(Darwin-Kernel)
-  add_subdirectory(MacOSX-DYLD)
-endif ()
+add_subdirectory(Darwin-Kernel)
+add_subdirectory(MacOSX-DYLD)
 add_subdirectory(POSIX-DYLD)
 add_subdirectory(Static)

Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=179705&r1=179704&r2=179705&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Wed Apr 17 13:40:42 2013
@@ -30,10 +30,6 @@
 
 #include "DynamicLoaderMacOSXDYLD.h"
 
-#if defined(__linux__)
-#include <linux/uuid.h>
-#endif
-
 //#define ENABLE_DEBUG_PRINTF // COMMENT THIS LINE OUT PRIOR TO CHECKIN
 #ifdef ENABLE_DEBUG_PRINTF
 #include <stdio.h>

Modified: lldb/trunk/source/Plugins/ObjectFile/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/CMakeLists.txt?rev=179705&r1=179704&r2=179705&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/ObjectFile/CMakeLists.txt Wed Apr 17 13:40:42 2013
@@ -1,5 +1,3 @@
 add_subdirectory(ELF)
-if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-  add_subdirectory(Mach-O)
-endif ()
+add_subdirectory(Mach-O)
 add_subdirectory(PECOFF)