qemu_mode: make building warning free
MODIFY
include/types.h
include/types.h
@@ -154,8 +154,12 @@ typedef int64_t s64;
#define MEM_BARRIER() __asm__ volatile("" ::: "memory")
#if __GNUC__ < 6
+# ifndef likely
# define likely(_x) (_x)
+# endif
+# ifndef unlikely
# define unlikely(_x) (_x)
+# endif
#else
# ifndef likely
# define likely(_x) __builtin_expect(!!(_x), 1)

MODIFY
qemu_mode/patches/afl-qemu-cpu-inl.h
qemu_mode/patches/afl-qemu-cpu-inl.h
@@ -123,12 +123,11 @@ struct afl_chain {
/* Some forward decls: */
-TranslationBlock *tb_htable_lookup(CPUState *, target_ulong, target_ulong,
- uint32_t, uint32_t);
static inline TranslationBlock *tb_find(CPUState *, TranslationBlock *, int,
uint32_t);
static inline void tb_add_jump(TranslationBlock *tb, int n,
TranslationBlock *tb_next);
+int open_self_maps(void *cpu_env, int fd);
/*************************
* ACTUAL IMPLEMENTATION *

MODIFY
qemu_mode/patches/afl-qemu-cpu-translate-inl.h
qemu_mode/patches/afl-qemu-cpu-translate-inl.h
#include "tcg.h"
#include "tcg-op.h"
-#if TCG_TARGET_LONG_BITS == 64
+#if TCG_TARGET_REG_BITS == 64
#define _DEFAULT_MO MO_64
#else
#define _DEFAULT_MO MO_32

MODIFY
qemu_mode/patches/syscall.diff
qemu_mode/patches/syscall.diff
@@ -43,16 +43,17 @@ index b13a170e..3f5cc902 100644
ts = (TaskState *)cpu->opaque;
if (flags & CLONE_SETTLS)
cpu_set_tls (env, newtls);
-@@ -6554,7 +6558,7 @@ static int open_self_cmdline(void *cpu_env, int fd)
+@@ -6554,7 +6558,8 @@ static int open_self_cmdline(void *cpu_env, int fd)
return 0;
}
-static int open_self_maps(void *cpu_env, int fd)
++int open_self_maps(void *cpu_env, int fd);
+int open_self_maps(void *cpu_env, int fd)
{
CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
TaskState *ts = cpu->opaque;
-@@ -7324,10 +7328,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
+@@ -7324,10 +7329,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
#ifdef TARGET_NR_stime /* not on alpha */
case TARGET_NR_stime:
{
@@ -68,7 +69,7 @@ index b13a170e..3f5cc902 100644
}
#endif
#ifdef TARGET_NR_alarm /* not on alpha */
-@@ -10529,7 +10535,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
+@@ -10529,7 +10536,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
return TARGET_PAGE_SIZE;
#endif
case TARGET_NR_gettid:
@@ -77,7 +78,7 @@ index b13a170e..3f5cc902 100644
#ifdef TARGET_NR_readahead
case TARGET_NR_readahead:
#if TARGET_ABI_BITS == 32
-@@ -10813,8 +10819,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
+@@ -10813,8 +10820,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
return get_errno(safe_tkill((int)arg1, target_to_host_signal(arg2)));
case TARGET_NR_tgkill:

qemu_mode: make building warning free