diff options
| author | Abseil Team <absl-team@google.com> | 2018-03-21T04·10-0700 |
|---|---|---|
| committer | katzdm <katzdm@google.com> | 2018-03-21T14·51-0400 |
| commit | 4e2e6c5c0071e6430056a8ef0a6c8a1fe584d8ff (patch) | |
| tree | 37fb874b61a1ef7dac7cc6efa36de0b2cc2f40d7 /absl/debugging/internal | |
| parent | 506fb4b56a339314fde23802bd749dbc3b3c1c79 (diff) | |
Changes imported from Abseil "staging" branch:
- 1320147f7597a9490562d439ecea46faa1793a24 Support Hex formatting of pointers without forcing a cast... by Jorg Brown <jorg@google.com> - 13c793d6e14a52063c2d4ee327b6c976631b690e Add support for native WebAssembly llvm backend. by Abseil Team <absl-team@google.com> GitOrigin-RevId: 1320147f7597a9490562d439ecea46faa1793a24 Change-Id: Ibd4dbf288903ab45387932e5b11a28f5accdf166
Diffstat (limited to 'absl/debugging/internal')
| -rw-r--r-- | absl/debugging/internal/elf_mem_image.h | 2 | ||||
| -rw-r--r-- | absl/debugging/internal/stacktrace_config.h | 2 | ||||
| -rw-r--r-- | absl/debugging/internal/symbolize.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/absl/debugging/internal/elf_mem_image.h b/absl/debugging/internal/elf_mem_image.h index 993508362056..3b5772689543 100644 --- a/absl/debugging/internal/elf_mem_image.h +++ b/absl/debugging/internal/elf_mem_image.h @@ -30,7 +30,7 @@ #endif #if defined(__ELF__) && defined(__GLIBC__) && !defined(__native_client__) && \ - !defined(__asmjs__) + !defined(__asmjs__) && !defined(__wasm__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h index ed82722b91a6..48adfccc62e5 100644 --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h @@ -26,7 +26,7 @@ #error ABSL_STACKTRACE_INL_HEADER cannot be directly set #elif defined(__native_client__) || defined(__APPLE__) || \ defined(__FreeBSD__) || defined(__ANDROID__) || defined(__myriad2__) || \ - defined(__asmjs__) || defined(__Fuchsia__) + defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_unimplemented-inl.inc" diff --git a/absl/debugging/internal/symbolize.h b/absl/debugging/internal/symbolize.h index 802ea22240df..7ae13839b7c3 100644 --- a/absl/debugging/internal/symbolize.h +++ b/absl/debugging/internal/symbolize.h @@ -24,7 +24,7 @@ #ifdef ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE #error ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE cannot be directly set #elif defined(__ELF__) && defined(__GLIBC__) && !defined(__native_client__) && \ - !defined(__asmjs__) + !defined(__asmjs__) && !defined(__wasm__) #define ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE 1 #include <elf.h> |