diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-08-05 12:54:52 +0200 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-08-05 12:54:52 +0200 |
| commit | 2d650f8c2262f99e01950d39c45f242f2e7dfbc9 (patch) | |
| tree | f4ff3ba7fb5efb862d90585e212ac82ed2d861ca /llvm_mode/afl-clang-fast.c | |
| parent | 19631851f6c7ecac42fb76ff70314f4e0777d3f3 (diff) | |
| parent | f30ca1476c2d4d08d46fe9657ad4aa1d828eb578 (diff) | |
| download | afl++-2d650f8c2262f99e01950d39c45f242f2e7dfbc9.tar.gz | |
merge conflict
Diffstat (limited to 'llvm_mode/afl-clang-fast.c')
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index 10717124..1aa42150 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -400,7 +400,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { if (lto_mode && !strncmp(cur, "-fuse-ld=", 9)) continue; if (lto_mode && !strncmp(cur, "--ld-path=", 10)) continue; - + if (!strcmp(cur, "-E")) preprocessor_only = 1; if (!strcmp(cur, "-shared")) shared_linking = 1; @@ -582,6 +582,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { runtime. We must hence avoid attaching the runtime to shared objects. */ cc_params[cc_par_cnt] = NULL; return; + } #ifndef __ANDROID__ |