diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-01-06 11:46:23 +0100 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-01-06 11:46:23 +0100 |
| commit | b95cd8968d765bf71fffb13e3cdc8d13e24949d1 (patch) | |
| tree | cfcd46a3395dd091b8aa48ec665e0df57ccf8b62 /gcc_plugin | |
| parent | 67cbeeb395c7e0aa8820e79c92f5e8e1322f8be0 (diff) | |
| parent | e7fc1ef49e8c9d8fa563f321f5e5906ce8fad69d (diff) | |
| download | afl++-b95cd8968d765bf71fffb13e3cdc8d13e24949d1.tar.gz | |
Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus
Diffstat (limited to 'gcc_plugin')
| -rw-r--r-- | gcc_plugin/Makefile | 4 | ||||
| -rw-r--r-- | gcc_plugin/afl-gcc-pass.so.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc_plugin/Makefile b/gcc_plugin/Makefile index 13857eb5..156dd023 100644 --- a/gcc_plugin/Makefile +++ b/gcc_plugin/Makefile @@ -35,7 +35,7 @@ CXX ?= g++ PLUGIN_FLAGS = -fPIC -fno-rtti -I"$(shell $(CC) -print-file-name=plugin)/include" -ifeq "$(shell echo '\#include <sys/ipc.h>@\#include <sys/shm.h>@int main() { int _id = shmget(IPC_PRIVATE, 65536, IPC_CREAT | IPC_EXCL | 0600); shmctl(_id, IPC_RMID, 0); return 0;}' | tr @ '\n' | $(CC) -x c - -o .test2 2>/dev/null && echo 1 || echo 0 )" "1" +ifeq "$(shell echo '\#include <sys/ipc.h>@\#include <sys/shm.h>@int main() { int _id = shmget(IPC_PRIVATE, 65536, IPC_CREAT | IPC_EXCL | 0600); shmctl(_id, IPC_RMID, 0); return 0;}' | tr @ '\n' | $(CC) -x c - -o .test2 2>/dev/null && echo 1 || echo 0 ; rm -f .test2 )" "1" SHMAT_OK=1 else SHMAT_OK=0 @@ -126,5 +126,5 @@ vpath % .. ln -sf afl-gcc-fast.8 ../afl-g++-fast.8 clean: - rm -f *.o *.so *~ a.out core core.[1-9][0-9]* test-instr .test-instr0 .test-instr1 + rm -f *.o *.so *~ a.out core core.[1-9][0-9]* test-instr .test-instr0 .test-instr1 .test2 rm -f $(PROGS) ../afl-g++-fast ../afl-g*-fast.8 diff --git a/gcc_plugin/afl-gcc-pass.so.cc b/gcc_plugin/afl-gcc-pass.so.cc index f46579a3..f77af5fa 100644 --- a/gcc_plugin/afl-gcc-pass.so.cc +++ b/gcc_plugin/afl-gcc-pass.so.cc @@ -14,7 +14,7 @@ Written by Austin Seipp <aseipp@pobox.com> with bits from Emese Revfy <re.emese@gmail.com> - Fixed by Heiko Eißfeldt 2019 for AFL++ + Fixed by Heiko Eißfeldt 2019-2020 for AFL++ GCC integration design is based on the LLVM design, which comes from Laszlo Szekeres. Some of the boilerplate code below for |