diff options
| author | van Hauser <vh@thc.org> | 2019-11-11 23:50:31 +0100 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2019-11-11 23:50:31 +0100 |
| commit | 760d4991f331c1a6719ce82df9b612e94c9a387c (patch) | |
| tree | 5a4817dd720ae791927a3305131196ef63cca0e4 /include | |
| parent | 613ab3ba2a9dcf70839e69ab2c4b32fc4b4a8a7f (diff) | |
| download | afl++-760d4991f331c1a6719ce82df9b612e94c9a387c.tar.gz | |
Android PR integration
Diffstat (limited to 'include')
| -rw-r--r-- | include/afl-fuzz.h | 2 | ||||
| -rw-r--r-- | include/android-ashmem.h | 4 | ||||
| -rw-r--r-- | include/config.h | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 342205df..8717519b 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -552,7 +552,7 @@ u8 has_new_bits(u8*); u32 count_bits(u8*); u32 count_bytes(u8*); u32 count_non_255_bytes(u8*); -#ifdef __x86_64__ +#ifdef WORD_SIZE_64 void simplify_trace(u64*); void classify_counts(u64*); #else diff --git a/include/android-ashmem.h b/include/android-ashmem.h index f4d31739..984df4d4 100644 --- a/include/android-ashmem.h +++ b/include/android-ashmem.h @@ -63,7 +63,7 @@ static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf) { } static inline int shmget(key_t __key, size_t __size, int __shmflg) { - + (void) __shmflg; int fd, ret; char ourkey[11]; @@ -86,7 +86,7 @@ error: } static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg) { - + (void) __shmflg; int size; void *ptr; diff --git a/include/config.h b/include/config.h index 144d3810..9c90155f 100644 --- a/include/config.h +++ b/include/config.h @@ -52,13 +52,18 @@ #define EXEC_TM_ROUND 20 +/* 64bit arch MACRO */ +#if (defined (__x86_64__) || defined (__arm64__) || defined (__aarch64__)) +#define WORD_SIZE_64 1 +#endif + /* Default memory limit for child process (MB): */ -#ifndef __x86_64__ +#ifndef WORD_SIZE_64 #define MEM_LIMIT 25 #else #define MEM_LIMIT 50 -#endif /* ^!__x86_64__ */ +#endif /* ^!WORD_SIZE_64 */ /* Default memory limit when running in QEMU mode (MB): */ |