diff options
| author | van Hauser <vh@thc.org> | 2021-01-20 14:00:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 14:00:26 +0100 |
| commit | b9e855b7b5ef3d7f367b32ee03459a9f5b21360f (patch) | |
| tree | 4689cb46e0d543af889609e260b1ff03455a2701 /src/afl-cc.c | |
| parent | 2cd3010f824fe35b68fbdfbba832357e952bf9d6 (diff) | |
| parent | 02079d8ef9c1661e4badd464ebcd7668e88118fc (diff) | |
| download | afl++-b9e855b7b5ef3d7f367b32ee03459a9f5b21360f.tar.gz | |
Merge pull request #695 from joeyjiaojg/dev
Fix Porting of AFLplusplus for Android
Diffstat (limited to 'src/afl-cc.c')
| -rw-r--r-- | src/afl-cc.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/afl-cc.c b/src/afl-cc.c index 1379488e..f3dfd49f 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -586,6 +586,9 @@ static void edit_params(u32 argc, char **argv, char **envp) { if (instrument_mode == INSTRUMENT_PCGUARD) { #if LLVM_MAJOR > 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0) +#ifdef __ANDROID__ + cc_params[cc_par_cnt++] = "-fsanitize-coverage=trace-pc-guard"; +#else if (have_instr_list) { if (!be_quiet) @@ -605,6 +608,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { } +#endif #else #if LLVM_MAJOR >= 4 if (!be_quiet) @@ -1034,6 +1038,10 @@ int main(int argc, char **argv, char **envp) { #endif +#ifdef __ANDROID__ + have_llvm = 1; +#endif + if ((ptr = find_object("afl-gcc-pass.so", argv[0])) != NULL) { have_gcc_plugin = 1; @@ -1807,11 +1815,8 @@ int main(int argc, char **argv, char **envp) { if (!be_quiet && cmplog_mode) printf("CmpLog mode by <andreafioraldi@gmail.com>\n"); -#ifdef __ANDROID__ - ptr = find_object("afl-compiler-rt.so", argv[0]); -#else +#ifndef __ANDROID__ ptr = find_object("afl-compiler-rt.o", argv[0]); -#endif if (!ptr) { @@ -1824,6 +1829,7 @@ int main(int argc, char **argv, char **envp) { if (debug) { DEBUGF("rt=%s obj_path=%s\n", ptr, obj_path); } ck_free(ptr); +#endif edit_params(argc, argv, envp); |