diff options
| author | Elliott Hughes <enh@google.com> | 2019-02-16 00:12:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-16 00:12:51 +0000 |
| commit | f84d0a95bd237e56c6aa7cbdce786ef611c53254 (patch) | |
| tree | 47d29f2ffa879494e50a9014ea0e20224abf4b6f /linker | |
| parent | f60449c21c3e4d2e261ef6dea741b9f6d29d497c (diff) | |
| parent | 3019d78d4abc2a5a279c75e78f76478b79364b7e (diff) | |
| download | android_bionic-f84d0a95bd237e56c6aa7cbdce786ef611c53254.tar.gz android_bionic-f84d0a95bd237e56c6aa7cbdce786ef611c53254.tar.bz2 android_bionic-f84d0a95bd237e56c6aa7cbdce786ef611c53254.zip | |
Merge "libasync_safe: stop clobbering other folks' identifiers."
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/linker_debug.h | 1 | ||||
| -rw-r--r-- | linker/linker_tls.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linker/linker_debug.h b/linker/linker_debug.h index 862ea122c..7a1cb3cbe 100644 --- a/linker/linker_debug.h +++ b/linker/linker_debug.h @@ -56,6 +56,7 @@ #include <unistd.h> #include <async_safe/log.h> +#include <async_safe/CHECK.h> __LIBC_HIDDEN__ extern int g_ld_debug_verbosity; diff --git a/linker/linker_tls.cpp b/linker/linker_tls.cpp index a3aa9bfac..d2edbb335 100644 --- a/linker/linker_tls.cpp +++ b/linker/linker_tls.cpp @@ -30,6 +30,7 @@ #include <vector> +#include "async_safe/CHECK.h" #include "private/ScopedRWLock.h" #include "private/ScopedSignalBlocker.h" #include "private/bionic_defs.h" |