From: Julian Fessard <julian.fessard@oculus.com>
Date: Wed, 10 Oct 2018 00:24:48 +0000 (-0700)
Subject: Merge branch 'backtrace' of github.com:facebook/zstd into backtrace
X-Git-Tag: v1.3.7~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ea286f740baf98cab4d217d00977756fea7c513;p=thirdparty%2Fzstd.git

Merge branch 'backtrace' of github.com:facebook/zstd into backtrace
---

0ea286f740baf98cab4d217d00977756fea7c513
diff --cc programs/fileio.c
index a2d5af2c4,16bfd530d..1eb9a1e0a
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@@ -20,21 -20,7 +20,6 @@@
  #  define _POSIX_SOURCE 1          /* disable %llu warnings with MinGW on Windows */
  #endif
  
- #if defined(__has_feature) && !defined(BACKTRACE_ENABLE) /* Clang compiler */
- #  if (__has_feature(address_sanitizer))
- #    define BACKTRACE_ENABLE 0
- #  endif /* __has_feature(address_sanitizer) */
- #elif defined(__SANITIZE_ADDRESS__) && !defined(BACKTRACE_ENABLE) /* GCC compiler */
- #  define BACKTRACE_ENABLE 0
- #endif
- 
- #if !defined(BACKTRACE_ENABLE)          \
-    && ((defined(__linux__) && defined(__GLIBC__)) \
-        || (defined(__APPLE__) && defined(__MACH__)) )
- #  define BACKTRACE_ENABLE 1
- #endif
- 
--
  /*-*************************************
  *  Includes
  ***************************************/
@@@ -176,8 -159,17 +158,25 @@@ static void clearHandler(void
  /*-*********************************************************
  *  Termination signal trapping (Print debug stack trace)
  ***********************************************************/
++#if defined(__has_feature) && !defined(BACKTRACE_ENABLE) /* Clang compiler */
++#  if (__has_feature(address_sanitizer))
++#    define BACKTRACE_ENABLE 0
++#  endif /* __has_feature(address_sanitizer) */
++#elif defined(__SANITIZE_ADDRESS__) && !defined(BACKTRACE_ENABLE) /* GCC compiler */
++#  define BACKTRACE_ENABLE 0
++#endif
++
+ #if !defined(BACKTRACE_ENABLE)          \
+    && ((defined(__linux__) && defined(__GLIBC__)) \
+        || (defined(__APPLE__) && defined(__MACH__)) )
+ #  define BACKTRACE_ENABLE 1
+ #endif
+ 
+ 
  #if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE>=1)
  
+ #include <execinfo.h>   /* backtrace, backtrace_symbols */
+ 
  #define MAX_STACK_FRAMES    50
  
  static void ABRThandler(int sig) {