[PATCH] D14482: Define findModulesAndOffsets() unconditionally to unbreak build

[Kamil Rytarowski via llvm-commits]

krytarowski created this revision.
krytarowski added a reviewer: rnk.
krytarowski added subscribers: llvm-commits, joerg.
krytarowski set the repository for this revision to rL LLVM.

With the following commit:
    http://reviews.llvm.org/D12884
    [Windows] Symbolize with llvm-symbolizer instead of dbghelp in a self-host

build has been broken on NetBSD.

Repository:
  rL LLVM

http://reviews.llvm.org/D14482

Files:
  lib/Support/Unix/Signals.inc

Index: lib/Support/Unix/Signals.inc
===================================================================
--- lib/Support/Unix/Signals.inc
+++ lib/Support/Unix/Signals.inc
@@ -253,9 +253,8 @@
   RegisterHandlers();
 }
 
-#if defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
-
-#if HAVE_LINK_H && (defined(__linux__) || defined(__FreeBSD__) ||              \
+#if defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES) && \
+     HAVE_LINK_H && (defined(__linux__) || defined(__FreeBSD__) ||              \
                     defined(__FreeBSD_kernel__) || defined(__NetBSD__))
 struct DlIteratePhdrData {
   void **StackTrace;
@@ -306,7 +305,6 @@
   return false;
 }
 #endif
-#endif // defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
 
 // PrintStackTrace - In the case of a program crash or fault, print out a stack
 // trace so that the user has an indication of why and where we died.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14482.39645.patch
Type: text/x-patch
Size: 898 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151108/ebf7946f/attachment.bin>