diff options
| author | van Hauser <vh@thc.org> | 2020-06-29 18:19:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 18:19:35 +0200 |
| commit | 8f1b78f49e8efef8ec089230d732cdee7b37fa9a (patch) | |
| tree | 4cb5e6e59f24f488e58fbb1aced2dbc0e6550c15 /llvm_mode/afl-clang-fast.c | |
| parent | 12bdefe00e38cdc3dd8cb028eeac325ab2e94e16 (diff) | |
| parent | 3a0c91b86205bfebb8ec7e62a2e7b0bfcec2e407 (diff) | |
| download | afl++-8f1b78f49e8efef8ec089230d732cdee7b37fa9a.tar.gz | |
Merge pull request #426 from AFLplusplus/dev
Dev
Diffstat (limited to 'llvm_mode/afl-clang-fast.c')
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index 75504ea5..3b0225c2 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -39,6 +39,8 @@ #include <limits.h> #include <assert.h> +#include "llvm/Config/llvm-config.h" + static u8 * obj_path; /* Path to runtime libraries */ static u8 **cc_params; /* Parameters passed to the real CC */ static u32 cc_par_cnt = 1; /* Param count, including argv0 */ @@ -464,7 +466,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { } -#ifdef USEMMAP +#if defined(USEMMAP) && !defined(__HAIKU__) cc_params[cc_par_cnt++] = "-lrt"; #endif @@ -500,7 +502,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { "unsigned char *__afl_fuzz_alt_ptr;"; cc_params[cc_par_cnt++] = "-D__AFL_FUZZ_TESTCASE_BUF=(__afl_fuzz_ptr ? __afl_fuzz_ptr : " - "(__afl_fuzz_alt_ptr = malloc(1 * 1024 * 1024)))"; + "(__afl_fuzz_alt_ptr = (unsigned char *) malloc(1 * 1024 * 1024)))"; cc_params[cc_par_cnt++] = "-D__AFL_FUZZ_TESTCASE_LEN=(__afl_fuzz_ptr ? *__afl_fuzz_len : read(0, " "__afl_fuzz_alt_ptr, 1 * 1024 * 1024))"; @@ -757,12 +759,14 @@ int main(int argc, char **argv, char **envp) { if (instrument_mode == 0) { -#ifndef USE_TRACE_PC +#if LLVM_VERSION_MAJOR <= 6 + instrument_mode = INSTRUMENT_AFL; +#else if (getenv("AFL_LLVM_WHITELIST")) instrument_mode = INSTRUMENT_AFL; else -#endif instrument_mode = INSTRUMENT_PCGUARD; +#endif } |