Re: [Lldb-commits] [PATCH] D22352: Implement GetMemoryRegions() for Windows Minidumps and live processes.
hhellyer added inline comments.
Comment at: source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp:338
@@ -315,4 +337,3 @@
// truncated.
-error.SetErrorString("address is not in a known range");
return error;
}
amccarth wrote:
> hhellyer wrote:
> > Asking for an address outside a known range is not actually an error, you
> > just get back an unmapped range that specifies how far it is to the next
> > mapped range.
> > The original discussion about that happened here:
> > https://reviews.llvm.org/D21751 - GetMemoryRegionInfo should only need to
> > return an error if it is unimplemented. (I should probably have referenced
> > that in the summary.)
> Got it. Thanks for the explanation!
>
> Given that, should the condition on 284 ("the mini dump contains no memory
> range information") actually return an error or just an unmapped range?
I thought the most likely cause of having no memory info would be not passing
the MiniDumpWithFullMemoryInfo flag to MiniDumpWriteDump will create a dump
without the MemoryInfoListStream present. Saying that memory range information
from a dump like that is "unsupported" seemed like the right option. I think
MiniDumpWithFullMemoryInfo is part of the default set of flags used when you
create a dump through task manager so most dumps should have the stream.
I won't land the patch immediately, I'm happy to change it if you'd prefer it
to return an unmapped range. I think it would have to be one unmapped range
that ran from load_addr to LLDB_INVALID_ADDRESS to match the expected behaviour.
https://reviews.llvm.org/D22352
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D22357: [NPL] Simplify process launch code
tberghammer accepted this revision. tberghammer added a comment. This revision is now accepted and ready to land. Looks good https://reviews.llvm.org/D22357 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D22404: [test] Report error when inferior test processes exit with a non-zero code
labath created this revision.
labath added reviewers: tfiala, zturner.
labath added a subscriber: lldb-commits.
We've run into this problem when the test errored out so early (because it
could not connect to
the remote device), that the code in D20193 did not catch the error. This
resulted in the test
suite reporting success with 0 tests being run.
This patch makes sure that any non-zero exit code from the inferior process
gets reported as an
error. Basically I expand the concept of "exceptional exits", which was
previously being used for
signals to cover these cases as well.
https://reviews.llvm.org/D22404
Files:
packages/Python/lldbsuite/test/dosep.py
packages/Python/lldbsuite/test/test_runner/process_control.py
Index: packages/Python/lldbsuite/test/test_runner/process_control.py
===
--- packages/Python/lldbsuite/test/test_runner/process_control.py
+++ packages/Python/lldbsuite/test/test_runner/process_control.py
@@ -246,33 +246,25 @@
def is_exceptional_exit(self, popen_status):
"""Returns whether the program exit status is exceptional.
-Returns whether the return code from a Popen process is exceptional
-(e.g. signals on POSIX systems).
-
-Derived classes should override this if they can detect exceptional
-program exit.
+Returns whether the return code from a Popen process is exceptional.
@return True if the given popen_status represents an exceptional
program exit; False otherwise.
"""
-return False
+return popen_status != 0
def exceptional_exit_details(self, popen_status):
"""Returns the normalized exceptional exit code and a description.
Given an exceptional exit code, returns the integral value of the
-exception (e.g. signal number for POSIX) and a description (e.g.
-signal name on POSIX) for the result.
-
-Derived classes should override this if they can detect exceptional
-program exit.
+exception and a description for the result.
-It is fine to not implement this so long as is_exceptional_exit()
-always returns False.
+Derived classes can override this if they want to want custom
+exceptional exit code handling.
@return (normalized exception code, symbolic exception description)
"""
-raise Exception("exception_exit_details() called on unsupported class")
+return (popen_status, "exit")
class UnixProcessHelper(ProcessHelper):
@@ -397,16 +389,15 @@
def soft_terminate_signals(self):
return [signal.SIGQUIT, signal.SIGTERM]
-def is_exceptional_exit(self, popen_status):
-return popen_status < 0
-
@classmethod
def _signal_names_by_number(cls):
return dict(
(k, v) for v, k in reversed(sorted(signal.__dict__.items()))
if v.startswith('SIG') and not v.startswith('SIG_'))
def exceptional_exit_details(self, popen_status):
+if popen_status >= 0:
+return (popen_status, "exit")
signo = -popen_status
signal_names_by_number = self._signal_names_by_number()
signal_name = signal_names_by_number.get(signo, "")
Index: packages/Python/lldbsuite/test/dosep.py
===
--- packages/Python/lldbsuite/test/dosep.py
+++ packages/Python/lldbsuite/test/dosep.py
@@ -109,13 +109,14 @@
with output_lock:
if not (RESULTS_FORMATTER and RESULTS_FORMATTER.is_using_terminal()):
print(file=sys.stderr)
-print(output, file=sys.stderr)
if timeout:
timeout_str = " (TIMEOUT)"
else:
timeout_str = ""
print("[%s FAILED]%s" % (name, timeout_str), file=sys.stderr)
print("Command invoked: %s" % ' '.join(command), file=sys.stderr)
+print("Command stderr:\n", output[1], file=sys.stderr)
+print("Command stdout:\n", output[0], file=sys.stderr)
update_progress(name)
@@ -210,7 +211,7 @@
# only stderr does.
report_test_pass(self.file_name, output[1])
else:
-report_test_failure(self.file_name, command, output[1],
was_timeout)
+report_test_failure(self.file_name, command, output, was_timeout)
# Save off the results for the caller.
self.results = (
Index: packages/Python/lldbsuite/test/test_runner/process_control.py
===
--- packages/Python/lldbsuite/test/test_runner/process_control.py
+++ packages/Python/lldbsuite/test/test_runner/process_control.py
@@ -246,33 +246,25 @@
def is_exceptional_exit(self, popen_status):
"""Returns whether the program exit status is exceptional.
-Returns whether the return code from a Popen process is excep
Re: [Lldb-commits] [PATCH] D22404: [test] Report error when inferior test processes exit with a non-zero code
labath added a comment. I think this also makes the code in https://reviews.llvm.org/D20193 obsolete. If this goes in, I can create a follow-up to remove that. https://reviews.llvm.org/D22404 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r275544 - [NPL] Simplify process launch code
Author: labath
Date: Fri Jul 15 05:18:15 2016
New Revision: 275544
URL: http://llvm.org/viewvc/llvm-project?rev=275544&view=rev
Log:
[NPL] Simplify process launch code
Summary:
This removes one level of indirection, which was just packing and repacking
launch args into
different structures. NFC.
Reviewers: tberghammer
Subscribers: lldb-commits
Differential Revision: https://reviews.llvm.org/D22357
Modified:
lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h
Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=275544&r1=275543&r2=275544&view=diff
==
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Fri Jul 15
05:18:15 2016
@@ -161,17 +161,44 @@ DecodeChildExitCode(int exit_code)
return std::make_pair(LaunchCallSpecifier(exit_code & 0x7), exit_code >>
3);
}
-void
-DisplayBytes (StreamString &s, void *bytes, uint32_t count)
+void
+MaybeLogLaunchInfo(const ProcessLaunchInfo &info)
+{
+Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
+if (!log)
+return;
+
+if (const FileAction *action = info.GetFileActionForFD(STDIN_FILENO))
+log->Printf("%s: setting STDIN to '%s'", __FUNCTION__,
action->GetFileSpec().GetCString());
+else
+log->Printf("%s leaving STDIN as is", __FUNCTION__);
+
+if (const FileAction *action = info.GetFileActionForFD(STDOUT_FILENO))
+log->Printf("%s setting STDOUT to '%s'", __FUNCTION__,
action->GetFileSpec().GetCString());
+else
+log->Printf("%s leaving STDOUT as is", __FUNCTION__);
+
+if (const FileAction *action = info.GetFileActionForFD(STDERR_FILENO))
+log->Printf("%s setting STDERR to '%s'", __FUNCTION__,
action->GetFileSpec().GetCString());
+else
+log->Printf("%s leaving STDERR as is", __FUNCTION__);
+
+int i = 0;
+for (const char **args = info.GetArguments().GetConstArgumentVector();
*args; ++args, ++i)
+log->Printf("%s arg %d: \"%s\"", __FUNCTION__, i, *args ? *args :
"nullptr");
+}
+
+void
+DisplayBytes(StreamString &s, void *bytes, uint32_t count)
+{
+uint8_t *ptr = (uint8_t *)bytes;
+const uint32_t loop_count = std::min(DEBUG_PTRACE_MAXBYTES,
count);
+for (uint32_t i = 0; i < loop_count; i++)
{
-uint8_t *ptr = (uint8_t *)bytes;
-const uint32_t loop_count = std::min(DEBUG_PTRACE_MAXBYTES,
count);
-for(uint32_t i=0; iGetFileSpec();
-
-file_action = launch_info.GetFileActionForFD (STDOUT_FILENO);
-if (file_action)
-stdout_file_spec = file_action->GetFileSpec();
-
-file_action = launch_info.GetFileActionForFD (STDERR_FILENO);
-if (file_action)
-stderr_file_spec = file_action->GetFileSpec();
-
-if (log)
-{
-if (stdin_file_spec)
-log->Printf ("NativeProcessLinux::%s setting STDIN to '%s'",
-__FUNCTION__, stdin_file_spec.GetCString());
-else
-log->Printf ("NativeProcessLinux::%s leaving STDIN as is",
__FUNCTION__);
-
-if (stdout_file_spec)
-log->Printf ("NativeProcessLinux::%s setting STDOUT to '%s'",
-__FUNCTION__, stdout_file_spec.GetCString());
-else
-log->Printf ("NativeProcessLinux::%s leaving STDOUT as is",
__FUNCTION__);
-
-if (stderr_file_spec)
-log->Printf ("NativeProcessLinux::%s setting STDERR to '%s'",
-__FUNCTION__, stderr_file_spec.GetCString());
-else
-log->Printf ("NativeProcessLinux::%s leaving STDERR as is",
__FUNCTION__);
-}
-
// Create the NativeProcessLinux in launch mode.
native_process_sp.reset (new NativeProcessLinux ());
-if (log)
-{
-int i = 0;
-for (const char **args = launch_info.GetArguments
().GetConstArgumentVector (); *args; ++args, ++i)
-{
-log->Printf ("NativeProcessLinux::%s arg %d: \"%s\"",
__FUNCTION__, i, *args ? *args : "nullptr");
-++i;
-}
-}
-
if (!native_process_sp->RegisterNativeDelegate (native_delegate))
{
native_process_sp.reset ();
@@ -363,16 +324,7 @@ NativeProcessProtocol::Launch (
return error;
}
-std::static_pointer_cast
(native_process_sp)->LaunchInferior (
-mainloop,
-launch_info.GetArguments ().GetConstArgumentVector (),
-launch_info.GetEnvironmentEntries ().GetConstArgumentVector (),
-stdin_file_spec,
-stdout_file_spec,
-stderr_file_spec,
-working_dir,
-launch_info,
-error);
+error =
std::static_pointer_cast(native_process_sp)->
Re: [Lldb-commits] [PATCH] D22357: [NPL] Simplify process launch code
This revision was automatically updated to reflect the committed changes.
Closed by commit rL275544: [NPL] Simplify process launch code (authored by
labath).
Changed prior to commit:
https://reviews.llvm.org/D22357?vs=63973&id=64118#toc
Repository:
rL LLVM
https://reviews.llvm.org/D22357
Files:
lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h
Index: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h
===
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h
@@ -149,61 +149,25 @@
// the relevan breakpoint
std::map m_threads_stepping_with_breakpoint;
-/// @class LauchArgs
-///
-/// @brief Simple structure to pass data to the thread responsible for
-/// launching a child process.
-struct LaunchArgs
-{
-LaunchArgs(char const **argv, char const **envp, const FileSpec &stdin_file_spec,
- const FileSpec &stdout_file_spec, const FileSpec &stderr_file_spec, const FileSpec &working_dir,
- const ProcessLaunchInfo &launch_info);
-
-~LaunchArgs();
-
-char const **m_argv; // Process arguments.
-char const **m_envp; // Process environment.
-const FileSpec m_stdin_file_spec; // Redirect stdin if not empty.
-const FileSpec m_stdout_file_spec; // Redirect stdout if not empty.
-const FileSpec m_stderr_file_spec; // Redirect stderr if not empty.
-const FileSpec m_working_dir; // Working directory or empty.
-const ProcessLaunchInfo &m_launch_info;
-};
-
-typedef std::function< ::pid_t(Error &)> InitialOperation;
// -
// Private Instance Methods
// -
NativeProcessLinux ();
-/// Launches an inferior process ready for debugging. Forms the
-/// implementation of Process::DoLaunch.
-void
-LaunchInferior (
-MainLoop &mainloop,
-char const *argv[],
-char const *envp[],
-const FileSpec &stdin_file_spec,
-const FileSpec &stdout_file_spec,
-const FileSpec &stderr_file_spec,
-const FileSpec &working_dir,
-const ProcessLaunchInfo &launch_info,
-Error &error);
+Error
+LaunchInferior(MainLoop &mainloop, ProcessLaunchInfo &launch_info);
/// Attaches to an existing process. Forms the
/// implementation of Process::DoAttach
void
AttachToInferior (MainLoop &mainloop, lldb::pid_t pid, Error &error);
::pid_t
-Launch(LaunchArgs *args, Error &error);
-
-::pid_t
Attach(lldb::pid_t pid, Error &error);
static void
-ChildFunc(const LaunchArgs &args) LLVM_ATTRIBUTE_NORETURN;
+ChildFunc(const ProcessLaunchInfo &launch_info) LLVM_ATTRIBUTE_NORETURN;
static Error
SetDefaultPtraceOpts(const lldb::pid_t);
Index: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
===
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -161,17 +161,44 @@
return std::make_pair(LaunchCallSpecifier(exit_code & 0x7), exit_code >> 3);
}
-void
-DisplayBytes (StreamString &s, void *bytes, uint32_t count)
+void
+MaybeLogLaunchInfo(const ProcessLaunchInfo &info)
+{
+Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
+if (!log)
+return;
+
+if (const FileAction *action = info.GetFileActionForFD(STDIN_FILENO))
+log->Printf("%s: setting STDIN to '%s'", __FUNCTION__, action->GetFileSpec().GetCString());
+else
+log->Printf("%s leaving STDIN as is", __FUNCTION__);
+
+if (const FileAction *action = info.GetFileActionForFD(STDOUT_FILENO))
+log->Printf("%s setting STDOUT to '%s'", __FUNCTION__, action->GetFileSpec().GetCString());
+else
+log->Printf("%s leaving STDOUT as is", __FUNCTION__);
+
+if (const FileAction *action = info.GetFileActionForFD(STDERR_FILENO))
+log->Printf("%s setting STDERR to '%s'", __FUNCTION__, action->GetFileSpec().GetCString());
+else
+log->Printf("%s leaving STDERR as is", __FUNCTION__);
+
+int i = 0;
+for (const char **args = info.GetArguments().GetConstArgumentVector(); *args; ++args, ++i)
+log->Printf("%s arg %d: \"%s\"", __FUNCTION__, i, *args ? *args : "nullptr");
+}
+
+void
+DisplayBytes(StreamString &s, void *bytes, uint32_t count)
+{
+
[Lldb-commits] [lldb] r275555 - Fix TestDarwinNSLogOutput for windows
Author: labath
Date: Fri Jul 15 07:19:28 2016
New Revision: 27
URL: http://llvm.org/viewvc/llvm-project?rev=27&view=rev
Log:
Fix TestDarwinNSLogOutput for windows
pexpect python package does not exist on windows
Modified:
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
Modified:
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py?rev=27&r1=275554&r2=27&view=diff
==
---
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/TestDarwinNSLogOutput.py
Fri Jul 15 07:19:28 2016
@@ -10,7 +10,6 @@ from __future__ import print_function
import lldb
import os
-import pexpect
import platform
import re
import sys
@@ -58,6 +57,7 @@ class DarwinNSLogOutputTestCase(lldbtest
prompt = self.child_prompt
# So that the child gets torn down after the test.
+import pexpect
self.child = pexpect.spawn('%s %s %s' % (lldbtest_config.lldbExec,
self.lldbOption, exe))
child = self.child
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D22404: [test] Report error when inferior test processes exit with a non-zero code
It's useful to have more descriptive error messages about why a test failed though. Saying that a test returned exit code 1 is worse than saying it had a bad decorator invocation On Fri, Jul 15, 2016 at 3:12 AM Pavel Labath wrote: > labath added a comment. > > I think this also makes the code in https://reviews.llvm.org/D20193 > obsolete. If this goes in, I can create a follow-up to remove that. > > > https://reviews.llvm.org/D22404 > > > > ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D22404: [test] Report error when inferior test processes exit with a non-zero code
labath added a comment. I don't think the original version tried to make a nice error message. It got flagged as an error, and that was it. Now it will get flagged as exceptional exit. In any case we will print out the stderr/stdout (I changed this from stderr-only, because in my case the only useful information about the error was in stdout), which should contain the exception that caused the non-zero exit, it's backtrace and everything. https://reviews.llvm.org/D22404 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D22352: Implement GetMemoryRegions() for Windows Minidumps and live processes.
amccarth accepted this revision.
amccarth added a reviewer: amccarth.
amccarth added a comment.
LGTM. Thanks!
Comment at: source/Plugins/Process/Windows/MiniDump/ProcessWinMiniDump.cpp:338
@@ -315,4 +337,3 @@
// truncated.
-error.SetErrorString("address is not in a known range");
return error;
}
hhellyer wrote:
> amccarth wrote:
> > hhellyer wrote:
> > > Asking for an address outside a known range is not actually an error, you
> > > just get back an unmapped range that specifies how far it is to the next
> > > mapped range.
> > > The original discussion about that happened here:
> > > https://reviews.llvm.org/D21751 - GetMemoryRegionInfo should only need to
> > > return an error if it is unimplemented. (I should probably have
> > > referenced that in the summary.)
> > Got it. Thanks for the explanation!
> >
> > Given that, should the condition on 284 ("the mini dump contains no memory
> > range information") actually return an error or just an unmapped range?
> I thought the most likely cause of having no memory info would be not passing
> the MiniDumpWithFullMemoryInfo flag to MiniDumpWriteDump will create a dump
> without the MemoryInfoListStream present. Saying that memory range
> information from a dump like that is "unsupported" seemed like the right
> option. I think MiniDumpWithFullMemoryInfo is part of the default set of
> flags used when you create a dump through task manager so most dumps should
> have the stream.
>
> I won't land the patch immediately, I'm happy to change it if you'd prefer it
> to return an unmapped range. I think it would have to be one unmapped range
> that ran from load_addr to LLDB_INVALID_ADDRESS to match the expected
> behaviour.
Sounds like you've thought it through more thoroughly than I, and I agree with
your conclusions, so I have no objections. Thanks for the explanations.
https://reviews.llvm.org/D22352
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D22404: [test] Report error when inferior test processes exit with a non-zero code
tfiala accepted this revision. tfiala added a comment. This revision is now accepted and ready to land. Looks fine here. Did either of you try this with an exceptional exit to make sure that still shows up right? https://reviews.llvm.org/D22404 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D22322: [LLDB] Fixes for standalone build
This revision was automatically updated to reflect the committed changes.
Closed by commit rL275641: Fixes for standalone build: (authored by
eugenezelenko).
Changed prior to commit:
https://reviews.llvm.org/D22322?vs=64000&id=64206#toc
Repository:
rL LLVM
https://reviews.llvm.org/D22322
Files:
lldb/trunk/cmake/modules/LLDBStandalone.cmake
Index: lldb/trunk/cmake/modules/LLDBStandalone.cmake
===
--- lldb/trunk/cmake/modules/LLDBStandalone.cmake
+++ lldb/trunk/cmake/modules/LLDBStandalone.cmake
@@ -58,6 +58,7 @@
set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+ set(LLVM_DIR ${LLVM_OBJ_ROOT}/cmake/modules/CMakeFiles CACHE PATH "Path to
LLVM build tree CMake files")
set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
@@ -85,6 +86,7 @@
include(AddLLVM)
include(HandleLLVMOptions)
+ include(CheckAtomic)
if (PYTHON_EXECUTABLE STREQUAL "")
set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
Index: lldb/trunk/cmake/modules/LLDBStandalone.cmake
===
--- lldb/trunk/cmake/modules/LLDBStandalone.cmake
+++ lldb/trunk/cmake/modules/LLDBStandalone.cmake
@@ -58,6 +58,7 @@
set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+ set(LLVM_DIR ${LLVM_OBJ_ROOT}/cmake/modules/CMakeFiles CACHE PATH "Path to LLVM build tree CMake files")
set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
@@ -85,6 +86,7 @@
include(AddLLVM)
include(HandleLLVMOptions)
+ include(CheckAtomic)
if (PYTHON_EXECUTABLE STREQUAL "")
set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r275641 - Fixes for standalone build:
Author: eugenezelenko
Date: Fri Jul 15 17:46:15 2016
New Revision: 275641
URL: http://llvm.org/viewvc/llvm-project?rev=275641&view=rev
Log:
Fixes for standalone build:
* include CheckAtomic to set HAVE_CXX_ATOMICS64_WITHOUT_LIB properly
(introduced in r274121)
* hint Clang CMake files for LLVM CMake files location (inctroduced in ~
r274176)
Differential revision: https://reviews.llvm.org/D22322
Modified:
lldb/trunk/cmake/modules/LLDBStandalone.cmake
Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=275641&r1=275640&r2=275641&view=diff
==
--- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Fri Jul 15 17:46:15 2016
@@ -58,6 +58,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+ set(LLVM_DIR ${LLVM_OBJ_ROOT}/cmake/modules/CMakeFiles CACHE PATH "Path to
LLVM build tree CMake files")
set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
@@ -85,6 +86,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
include(AddLLVM)
include(HandleLLVMOptions)
+ include(CheckAtomic)
if (PYTHON_EXECUTABLE STREQUAL "")
set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D20436: Clean up vestigial remnants of locking primitives
Eugene.Zelenko added a subscriber: Eugene.Zelenko. Eugene.Zelenko added a comment. I think will be good idea to try to commit these changes before 3.9 branching. Repository: rL LLVM https://reviews.llvm.org/D20436 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r275652 - Fixed the location of the Swift bindings in the Xcode build.
Author: spyffe
Date: Fri Jul 15 19:18:24 2016
New Revision: 275652
URL: http://llvm.org/viewvc/llvm-project?rev=275652&view=rev
Log:
Fixed the location of the Swift bindings in the Xcode build.
$BUILT_PRODUCTS_DIR is usually the same as $CONFIGURATION_BUILD_DIR, but differs
when LLDB is being built BuildAndIntegration, in which case $BUILT_PRODUCTS_DIR
is more accurate.
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=275652&r1=275651&r2=275652&view=diff
==
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Jul 15 19:18:24 2016
@@ -6409,7 +6409,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "/usr/bin/python
$SRCROOT/scripts/prepare_bindings.py --find-swig --framework --src-root
$SRCROOT --target-dir $TARGET_BUILD_DIR --config-build-dir
$CONFIGURATION_BUILD_DIR --target-platform Darwin";
+ shellScript = "/usr/bin/python
$SRCROOT/scripts/prepare_bindings.py --find-swig --framework --src-root
$SRCROOT --target-dir $TARGET_BUILD_DIR --config-build-dir $BUILT_PRODUCTS_DIR
--target-platform Darwin";
};
4959511A1A1ACE9500F6F8FC /* Install Clang compiler headers */ =
{
isa = PBXShellScriptBuildPhase;
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
