This commit is contained in:
vanhauser-thc
2023-07-04 11:34:13 +02:00
parent db96b04aba
commit da33510855
2 changed files with 11 additions and 7 deletions

View File

@ -2111,11 +2111,6 @@ int main(int argc, char **argv, char **envp) {
"-------------|\n" "-------------|\n"
"MODES: NCC PERSIST DICT LAF " "MODES: NCC PERSIST DICT LAF "
"CMPLOG SELECT\n" "CMPLOG SELECT\n"
" [LTO] LLVM LTO: %s%s\n"
" PCGUARD DEFAULT yes yes yes yes yes "
" yes\n"
" CLASSIC yes yes yes yes yes "
" yes\n"
" [LLVM] LLVM: %s%s\n" " [LLVM] LLVM: %s%s\n"
" PCGUARD %s yes yes module yes yes " " PCGUARD %s yes yes module yes yes "
"yes\n" "yes\n"
@ -2125,16 +2120,21 @@ int main(int argc, char **argv, char **envp) {
" - CALLER\n" " - CALLER\n"
" - CTX\n" " - CTX\n"
" - NGRAM-{2-16}\n" " - NGRAM-{2-16}\n"
" [LTO] LLVM LTO: %s%s\n"
" PCGUARD DEFAULT yes yes yes yes yes "
" yes\n"
" CLASSIC yes yes yes yes yes "
" yes\n"
" [GCC_PLUGIN] gcc plugin: %s%s\n" " [GCC_PLUGIN] gcc plugin: %s%s\n"
" CLASSIC DEFAULT no yes no no no " " CLASSIC DEFAULT no yes no no no "
"yes\n" "yes\n"
" [GCC/CLANG] simple gcc/clang: %s%s\n" " [GCC/CLANG] simple gcc/clang: %s%s\n"
" CLASSIC DEFAULT no no no no no " " CLASSIC DEFAULT no no no no no "
"no\n\n", "no\n\n",
have_lto ? "AVAILABLE" : "unavailable!",
compiler_mode == LTO ? " [SELECTED]" : "",
have_llvm ? "AVAILABLE" : "unavailable!", have_llvm ? "AVAILABLE" : "unavailable!",
compiler_mode == LLVM ? " [SELECTED]" : "", compiler_mode == LLVM ? " [SELECTED]" : "",
have_lto ? "AVAILABLE" : "unavailable!",
compiler_mode == LTO ? " [SELECTED]" : "",
LLVM_MAJOR >= 7 ? "DEFAULT" : " ", LLVM_MAJOR >= 7 ? "DEFAULT" : " ",
LLVM_MAJOR >= 7 ? " " : "DEFAULT", LLVM_MAJOR >= 7 ? " " : "DEFAULT",
have_gcc_plugin ? "AVAILABLE" : "unavailable!", have_gcc_plugin ? "AVAILABLE" : "unavailable!",

View File

@ -1281,6 +1281,10 @@ int main(int argc, char **argv_orig, char **envp) {
} }
WARNF(
"Note that the MOpt mode is not maintained and is not as effective "
"normal havoc mode.");
} break; } break;
case 'h': case 'h':