ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-12 01:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

test-pre.sh: remove old uses of afl-clang, afl-cc.c: add missing env.var. AFL_LLVM_LAF_ALL

Browse Source
This commit is contained in:
hexcoder-
2020-11-24 19:38:55 +01:00
parent ed2f82eaf4
commit 27c3423fb6
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/afl-cc.c
View File

@ -686,7 +686,7 @@ static void edit_params(u32 argc, char **argv, char **envp) {
} }
if (getenv("AFL_NO_BUILTIN") || getenv("AFL_LLVM_LAF_TRANSFORM_COMPARES") || if (getenv("AFL_NO_BUILTIN") || getenv("AFL_LLVM_LAF_TRANSFORM_COMPARES") ||
getenv("LAF_TRANSFORM_COMPARES") || lto_mode) { getenv("LAF_TRANSFORM_COMPARES") || getenv("AFL_LLVM_LAF_ALL") || lto_mode) {
cc_params[cc_par_cnt++] = "-fno-builtin-strcmp"; cc_params[cc_par_cnt++] = "-fno-builtin-strcmp";
cc_params[cc_par_cnt++] = "-fno-builtin-strncmp"; cc_params[cc_par_cnt++] = "-fno-builtin-strncmp";
@ -1030,7 +1030,7 @@ int main(int argc, char **argv, char **envp) {
if (instrument_mode == 0) if (instrument_mode == 0)
instrument_mode = INSTRUMENT_PCGUARD; instrument_mode = INSTRUMENT_PCGUARD;
else if (instrument_mode != INSTRUMENT_PCGUARD) else if (instrument_mode != INSTRUMENT_PCGUARD)
FATAL("you can not set AFL_LLVM_INSTRUMENT and AFL_TRACE_PC together"); FATAL("you cannot set AFL_LLVM_INSTRUMENT and AFL_TRACE_PC together");
} }
@ -1049,7 +1049,7 @@ int main(int argc, char **argv, char **envp) {
instrument_mode = INSTRUMENT_CFG; instrument_mode = INSTRUMENT_CFG;
else if (instrument_mode != INSTRUMENT_CFG) else if (instrument_mode != INSTRUMENT_CFG)
FATAL( FATAL(
"you can not set AFL_LLVM_INSTRUMENT and AFL_LLVM_INSTRIM together"); "you cannot set AFL_LLVM_INSTRUMENT and AFL_LLVM_INSTRIM together");
} }

11
test/test-pre.sh
View File

@ -106,14 +106,7 @@ export AFL_LLVM_INSTRUMENT=AFL
test -e /usr/local/bin/opt && { test -e /usr/local/bin/opt && {
export PATH="/usr/local/bin:${PATH}" export PATH="/usr/local/bin:${PATH}"
} }
# on MacOS X we prefer afl-clang over afl-gcc, because AFL_GCC=afl-gcc
# afl-gcc does not work there
test `uname -s` = 'Darwin' -o `uname -s` = 'FreeBSD' && {
AFL_GCC=afl-clang
} || {
AFL_GCC=afl-gcc
}
command -v gcc >/dev/null 2>&1 || AFL_GCC=afl-clang
SYS=`uname -m` SYS=`uname -m`
@ -135,4 +128,4 @@ test -z "$SYS" && $ECHO "$YELLOW[-] uname -m did not succeed"
CODE=0 CODE=0
INCOMPLETE=0 INCOMPLETE=0
fi fi