[llvm-branch-commits] [lldb] r258964 - Merging r258921:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 27 12:46:03 2016
New Revision: 258964

URL: http://llvm.org/viewvc/llvm-project?rev=258964&view=rev
Log:
Merging r258921:
------------------------------------------------------------------------
r258921 | labath | 2016-01-27 03:02:02 -0800 (Wed, 27 Jan 2016) | 12 lines

Fix linking with LLVM_LINK_LLVM_DYLIB=ON

Linking with LLVM shared libraries currently produces linker errors.  This works around the issue
(pr24953) by disabling linking with llvm so for lldb libraries.

Patch by Evangelos Foutras.

Reviewers: zturner

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D16293
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/cmake/modules/AddLLDB.cmake
    lldb/branches/release_38/include/lldb/API/SBError.h
    lldb/branches/release_38/include/lldb/Core/Error.h
    lldb/branches/release_38/tools/driver/Driver.cpp

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 27 12:46:03 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691-257692
+/lldb/trunk:257691-257692,258921

Modified: lldb/branches/release_38/cmake/modules/AddLLDB.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/cmake/modules/AddLLDB.cmake?rev=258964&r1=258963&r2=258964&view=diff
==============================================================================
--- lldb/branches/release_38/cmake/modules/AddLLDB.cmake (original)
+++ lldb/branches/release_38/cmake/modules/AddLLDB.cmake Wed Jan 27 12:46:03 2016
@@ -56,7 +56,7 @@ macro(add_lldb_library name)
   if (PARAM_OBJECT)
     add_library(${name} ${libkind} ${srcs})
   else()
-    llvm_add_library(${name} ${libkind} ${srcs})
+    llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs})
 
     lldb_link_common_libs(${name} "${libkind}")
 
@@ -93,7 +93,7 @@ macro(add_lldb_library name)
 endmacro(add_lldb_library)
 
 macro(add_lldb_executable name)
-  add_llvm_executable(${name} ${ARGN})
+  add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
   set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
 endmacro(add_lldb_executable)
 

Modified: lldb/branches/release_38/include/lldb/API/SBError.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/include/lldb/API/SBError.h?rev=258964&r1=258963&r2=258964&view=diff
==============================================================================
--- lldb/branches/release_38/include/lldb/API/SBError.h (original)
+++ lldb/branches/release_38/include/lldb/API/SBError.h Wed Jan 27 12:46:03 2016
@@ -56,7 +56,7 @@ public:
     SetErrorString (const char *err_str);
 
     int
-    SetErrorStringWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
+    SetErrorStringWithFormat (const char *format, ...) /*__attribute__ ((format (printf, 2, 3)))*/;
 
     bool
     IsValid () const;

Modified: lldb/branches/release_38/include/lldb/Core/Error.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/include/lldb/Core/Error.h?rev=258964&r1=258963&r2=258964&view=diff
==============================================================================
--- lldb/branches/release_38/include/lldb/Core/Error.h (original)
+++ lldb/branches/release_38/include/lldb/Core/Error.h Wed Jan 27 12:46:03 2016
@@ -272,7 +272,7 @@ public:
     ///     A printf style format string
     //------------------------------------------------------------------
     int
-    SetErrorStringWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
+    SetErrorStringWithFormat (const char *format, ...) /*__attribute__ ((format (printf, 2, 3)))*/;
 
     int
     SetErrorStringWithVarArg (const char *format, va_list args);

Modified: lldb/branches/release_38/tools/driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/tools/driver/Driver.cpp?rev=258964&r1=258963&r2=258964&view=diff
==============================================================================
--- lldb/branches/release_38/tools/driver/Driver.cpp (original)
+++ lldb/branches/release_38/tools/driver/Driver.cpp Wed Jan 27 12:46:03 2016
@@ -914,7 +914,8 @@ PrepareCommandsForSourcing (const char *
         {
             fprintf(stderr, "error: write(%i, %p, %" PRIu64 ") failed (errno = %i) "
                             "when trying to open LLDB commands pipe\n",
-                    fds[WRITE], commands_data, static_cast<uint64_t>(commands_size), errno);
+                    fds[WRITE], static_cast<const void*>(commands_data),
+                    static_cast<uint64_t>(commands_size), errno);
         }
         else if (static_cast<size_t>(nrwr) == commands_size)
         {