diff options
| author | Ryan Prichard <rprichard@google.com> | 2020-01-10 22:21:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-10 22:21:15 +0000 |
| commit | a04764bd286cf86f28d65487e1b6d6d36c9671e8 (patch) | |
| tree | 26736176398392ba7e9c584c8a8b7561c71bfa41 /linker/linker_debug.h | |
| parent | 9c5c87ed0575328b004a2512d7ff8ef8495cdcca (diff) | |
| parent | 551565e87c595aeced1cd1edf50c916378a3623e (diff) | |
Merge changes I578d36a1,Id17508ab,I385f312b
* changes:
Create linker_log[_va_list] functions
Validate defined versions in prelink_image
Prelink each library only once
Diffstat (limited to 'linker/linker_debug.h')
| -rw-r--r-- | linker/linker_debug.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/linker/linker_debug.h b/linker/linker_debug.h index 6031850a4..738ff6f58 100644 --- a/linker/linker_debug.h +++ b/linker/linker_debug.h @@ -52,31 +52,33 @@ * To enable/disable specific debug options, change the defines above *********************************************************************/ +#include <stdarg.h> #include <unistd.h> #include <async_safe/log.h> #include <async_safe/CHECK.h> +#define LINKER_VERBOSITY_PRINT -1 +#define LINKER_VERBOSITY_INFO 0 +#define LINKER_VERBOSITY_TRACE 1 +#define LINKER_VERBOSITY_DEBUG 2 + __LIBC_HIDDEN__ extern int g_ld_debug_verbosity; -#if LINKER_DEBUG_TO_LOG -#define _PRINTVF(v, x...) \ - do { \ - if (g_ld_debug_verbosity > (v)) async_safe_format_log(5-(v), "linker", x); \ - } while (0) -#else /* !LINKER_DEBUG_TO_LOG */ +__LIBC_HIDDEN__ void linker_log_va_list(int prio, const char* fmt, va_list ap); +__LIBC_HIDDEN__ void linker_log(int prio, const char* fmt, ...) __printflike(2, 3); + #define _PRINTVF(v, x...) \ do { \ - if (g_ld_debug_verbosity > (v)) { async_safe_format_fd(1, x); write(1, "\n", 1); } \ + if (g_ld_debug_verbosity > (v)) linker_log((v), x); \ } while (0) -#endif /* !LINKER_DEBUG_TO_LOG */ -#define PRINT(x...) _PRINTVF(-1, x) -#define INFO(x...) _PRINTVF(0, x) -#define TRACE(x...) _PRINTVF(1, x) +#define PRINT(x...) _PRINTVF(LINKER_VERBOSITY_PRINT, x) +#define INFO(x...) _PRINTVF(LINKER_VERBOSITY_INFO, x) +#define TRACE(x...) _PRINTVF(LINKER_VERBOSITY_TRACE, x) #if TRACE_DEBUG -#define DEBUG(x...) _PRINTVF(2, "DEBUG: " x) +#define DEBUG(x...) _PRINTVF(LINKER_VERBOSITY_DEBUG, "DEBUG: " x) #else /* !TRACE_DEBUG */ #define DEBUG(x...) do {} while (0) #endif /* TRACE_DEBUG */ |