diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-04-24 11:26:46 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2012-04-24 11:26:46 -0700 |
| commit | cf5a1461acaace0f3e7d11fbbcfbf635b8c8ea9d (patch) | |
| tree | 557137810ae9efc96147d672d372e4dabd0a2440 /lib/Support/Unix/Signals.inc | |
| parent | 4c8fab82874a29dcd2b242533af3ebe7f66bfd74 (diff) | |
| parent | fc728fbdc2631ce8f343cf9b7292d218fde7419f (diff) | |
| download | external_llvm-cf5a1461acaace0f3e7d11fbbcfbf635b8c8ea9d.zip external_llvm-cf5a1461acaace0f3e7d11fbbcfbf635b8c8ea9d.tar.gz external_llvm-cf5a1461acaace0f3e7d11fbbcfbf635b8c8ea9d.tar.bz2 | |
Merge with LLVM upstream r155090.
Conflicts:
lib/Support/Unix/PathV2.inc
Change-Id: I7b89833849f6cbcfa958a33a971d0f7754c9cb2c
Diffstat (limited to 'lib/Support/Unix/Signals.inc')
| -rw-r--r-- | lib/Support/Unix/Signals.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Support/Unix/Signals.inc b/lib/Support/Unix/Signals.inc index c3885e1..399f686 100644 --- a/lib/Support/Unix/Signals.inc +++ b/lib/Support/Unix/Signals.inc @@ -275,9 +275,9 @@ void llvm::sys::PrintStackTraceOnErrorSignal() { kern_return_t ret = task_set_exception_ports(self, mask, - NULL, + MACH_PORT_NULL, EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, - NULL); + THREAD_STATE_NONE); (void)ret; } #endif |