ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-08-05 12:54:52 +02:00
parent 19631851f6 f30ca1476c
commit 2d650f8c22
9 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
llvm_mode/afl-clang-fast.c
View File

@ -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__