diff options
| author | van Hauser <vh@thc.org> | 2021-04-01 12:09:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 12:09:58 +0200 |
| commit | c9a96b268b913d241abc1b590e3a55e97b838c1b (patch) | |
| tree | d1b9f0944e6fdad7cc74707d1d416c47bfcbada8 | |
| parent | e190ba1a2fee5119a7571e091a4b0caf8d3bc67f (diff) | |
| parent | 1004fb9a41df364818c5034e8b95b4c00583335f (diff) | |
| download | afl++-c9a96b268b913d241abc1b590e3a55e97b838c1b.tar.gz | |
Merge pull request #854 from joeyjiaojg/dev
fix if A == B always evalutes to true
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | utils/afl_frida/afl-frida.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 64794e19..bf37757d 100644 --- a/Android.bp +++ b/Android.bp @@ -32,7 +32,6 @@ cc_defaults { target: { android_arm64: { cflags: [ - "-D__aarch64__", "-D__ANDROID__", ], }, diff --git a/utils/afl_frida/afl-frida.c b/utils/afl_frida/afl-frida.c index 711d8f33..e49d6f42 100644 --- a/utils/afl_frida/afl-frida.c +++ b/utils/afl_frida/afl-frida.c @@ -111,7 +111,7 @@ inline static void afl_maybe_log(guint64 current_pc) { } -#if GUM_NATIVE_CPU == GUM_CPU_AMD64 +#ifdef __x86_64__ static const guint8 afl_maybe_log_code[] = { @@ -177,7 +177,7 @@ void instr_basic_block(GumStalkerIterator *iterator, GumStalkerOutput *output, if (instr->address >= range->code_start && instr->address <= range->code_end) { -#if GUM_NATIVE_CPU == GUM_CPU_AMD64 +#ifdef __x86_64__ GumX86Writer *cw = output->writer.x86; if (range->current_log_impl == 0 || !gum_x86_writer_can_branch_directly_between( |