diff options
author | van Hauser <vh@thc.org> | 2020-05-10 12:09:37 +0200 |
---|---|---|
committer | van Hauser <vh@thc.org> | 2020-05-10 12:09:37 +0200 |
commit | 30bfd44dfd9f442d5514a7100d76d1fd3d9deb74 (patch) | |
tree | 86d3b0b14103fd2bbc01f25c40e7d55694a4701b /llvm_mode | |
parent | 26f8708fede1b15e6a93709d0baa2e5f481e082d (diff) | |
download | afl++-30bfd44dfd9f442d5514a7100d76d1fd3d9deb74.tar.gz |
indenting preprocessor directives breaks compilation and cant be fixed, reverting ... :-(
Diffstat (limited to 'llvm_mode')
-rw-r--r-- | llvm_mode/LLVMInsTrim.so.cc | 20 | ||||
-rw-r--r-- | llvm_mode/MarkNodes.cc | 4 | ||||
-rw-r--r-- | llvm_mode/afl-llvm-common.h | 8 | ||||
-rw-r--r-- | llvm_mode/afl-llvm-pass.so.cc | 16 | ||||
-rw-r--r-- | llvm_mode/afl-llvm-rt.o.c | 24 | ||||
-rw-r--r-- | llvm_mode/cmplog-instructions-pass.cc | 10 | ||||
-rw-r--r-- | llvm_mode/cmplog-routines-pass.cc | 10 | ||||
-rw-r--r-- | llvm_mode/compare-transform-pass.so.cc | 10 | ||||
-rw-r--r-- | llvm_mode/split-compares-pass.so.cc | 10 | ||||
-rw-r--r-- | llvm_mode/split-switches-pass.so.cc | 10 |
10 files changed, 61 insertions, 61 deletions
diff --git a/llvm_mode/LLVMInsTrim.so.cc b/llvm_mode/LLVMInsTrim.so.cc index a072ae55..837b093a 100644 --- a/llvm_mode/LLVMInsTrim.so.cc +++ b/llvm_mode/LLVMInsTrim.so.cc @@ -12,13 +12,13 @@ typedef long double max_align_t; #include "llvm/ADT/DenseSet.h" #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/CFG.h" -# include "llvm/IR/Dominators.h" -# include "llvm/IR/DebugInfo.h" +#include "llvm/IR/CFG.h" +#include "llvm/IR/Dominators.h" +#include "llvm/IR/DebugInfo.h" #else -# include "llvm/Support/CFG.h" -# include "llvm/Analysis/Dominators.h" -# include "llvm/DebugInfo.h" +#include "llvm/Support/CFG.h" +#include "llvm/Analysis/Dominators.h" +#include "llvm/DebugInfo.h" #endif #include "llvm/IR/IRBuilder.h" #include "llvm/IR/Instructions.h" @@ -97,7 +97,7 @@ struct InsTrim : public ModulePass { #if LLVM_VERSION_MAJOR >= 4 || \ (LLVM_VERSION_MAJOR == 4 && LLVM_VERSION_PATCH >= 1) -# define AFL_HAVE_VECTOR_INTRINSICS 1 +#define AFL_HAVE_VECTOR_INTRINSICS 1 #endif bool runOnModule(Module &M) override { @@ -196,17 +196,17 @@ struct InsTrim : public ModulePass { #ifdef AFL_HAVE_VECTOR_INTRINSICS if (ngram_size) -# ifdef __ANDROID__ +#ifdef __ANDROID__ AFLPrevLoc = new GlobalVariable( M, PrevLocTy, /* isConstant */ false, GlobalValue::ExternalLinkage, /* Initializer */ nullptr, "__afl_prev_loc"); -# else +#else AFLPrevLoc = new GlobalVariable( M, PrevLocTy, /* isConstant */ false, GlobalValue::ExternalLinkage, /* Initializer */ nullptr, "__afl_prev_loc", /* InsertBefore */ nullptr, GlobalVariable::GeneralDynamicTLSModel, /* AddressSpace */ 0, /* IsExternallyInitialized */ false); -# endif +#endif else #endif #ifdef __ANDROID__ diff --git a/llvm_mode/MarkNodes.cc b/llvm_mode/MarkNodes.cc index 66e6a728..cff6c90a 100644 --- a/llvm_mode/MarkNodes.cc +++ b/llvm_mode/MarkNodes.cc @@ -15,9 +15,9 @@ typedef long double max_align_t; #include "llvm/IR/BasicBlock.h" #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/CFG.h" +#include "llvm/IR/CFG.h" #else -# include "llvm/Support/CFG.h" +#include "llvm/Support/CFG.h" #endif #include "llvm/IR/Constants.h" #include "llvm/IR/Function.h" diff --git a/llvm_mode/afl-llvm-common.h b/llvm_mode/afl-llvm-common.h index c0982e10..cf14d2e1 100644 --- a/llvm_mode/afl-llvm-common.h +++ b/llvm_mode/afl-llvm-common.h @@ -25,11 +25,11 @@ typedef long double max_align_t; #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/DebugInfo.h" -# include "llvm/IR/CFG.h" +#include "llvm/IR/DebugInfo.h" +#include "llvm/IR/CFG.h" #else -# include "llvm/DebugInfo.h" -# include "llvm/Support/CFG.h" +#include "llvm/DebugInfo.h" +#include "llvm/Support/CFG.h" #endif char * getBBName(const llvm::BasicBlock *BB); diff --git a/llvm_mode/afl-llvm-pass.so.cc b/llvm_mode/afl-llvm-pass.so.cc index 2bcd661b..2d23ad21 100644 --- a/llvm_mode/afl-llvm-pass.so.cc +++ b/llvm_mode/afl-llvm-pass.so.cc @@ -54,11 +54,11 @@ typedef long double max_align_t; #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/DebugInfo.h" -# include "llvm/IR/CFG.h" +#include "llvm/IR/DebugInfo.h" +#include "llvm/IR/CFG.h" #else -# include "llvm/DebugInfo.h" -# include "llvm/Support/CFG.h" +#include "llvm/DebugInfo.h" +#include "llvm/Support/CFG.h" #endif #include "afl-llvm-common.h" @@ -115,7 +115,7 @@ uint64_t PowerOf2Ceil(unsigned in) { /* #if LLVM_VERSION_STRING >= "4.0.1" */ #if LLVM_VERSION_MAJOR >= 4 || \ (LLVM_VERSION_MAJOR == 4 && LLVM_VERSION_PATCH >= 1) -# define AFL_HAVE_VECTOR_INTRINSICS 1 +#define AFL_HAVE_VECTOR_INTRINSICS 1 #endif bool AFLCoverage::runOnModule(Module &M) { @@ -242,17 +242,17 @@ bool AFLCoverage::runOnModule(Module &M) { #ifdef AFL_HAVE_VECTOR_INTRINSICS if (ngram_size) -# ifdef __ANDROID__ +#ifdef __ANDROID__ AFLPrevLoc = new GlobalVariable( M, PrevLocTy, /* isConstant */ false, GlobalValue::ExternalLinkage, /* Initializer */ nullptr, "__afl_prev_loc"); -# else +#else AFLPrevLoc = new GlobalVariable( M, PrevLocTy, /* isConstant */ false, GlobalValue::ExternalLinkage, /* Initializer */ nullptr, "__afl_prev_loc", /* InsertBefore */ nullptr, GlobalVariable::GeneralDynamicTLSModel, /* AddressSpace */ 0, /* IsExternallyInitialized */ false); -# endif +#endif else #endif #ifdef __ANDROID__ diff --git a/llvm_mode/afl-llvm-rt.o.c b/llvm_mode/afl-llvm-rt.o.c index 6306ae30..56038f7a 100644 --- a/llvm_mode/afl-llvm-rt.o.c +++ b/llvm_mode/afl-llvm-rt.o.c @@ -21,7 +21,7 @@ */ #ifdef __ANDROID__ -# include "android-ashmem.h" +#include "android-ashmem.h" #endif #include "config.h" #include "types.h" @@ -43,7 +43,7 @@ #include <sys/types.h> #ifdef __linux__ -# include "snapshot-inl.h" +#include "snapshot-inl.h" #endif /* This is a somewhat ugly hack for the experimental 'trace-pc-guard' mode. @@ -53,7 +53,7 @@ #define CONST_PRIO 5 #ifndef MAP_FIXED_NOREPLACE -# define MAP_FIXED_NOREPLACE MAP_FIXED +#define MAP_FIXED_NOREPLACE MAP_FIXED #endif #include <sys/mman.h> @@ -822,15 +822,15 @@ void __cmplog_ins_hook8(uint64_t arg1, uint64_t arg2) { } #if defined(__APPLE__) -# pragma weak __sanitizer_cov_trace_const_cmp1 = __cmplog_ins_hook1 -# pragma weak __sanitizer_cov_trace_const_cmp2 = __cmplog_ins_hook2 -# pragma weak __sanitizer_cov_trace_const_cmp4 = __cmplog_ins_hook4 -# pragma weak __sanitizer_cov_trace_const_cmp8 = __cmplog_ins_hook8 - -# pragma weak __sanitizer_cov_trace_cmp1 = __cmplog_ins_hook1 -# pragma weak __sanitizer_cov_trace_cmp2 = __cmplog_ins_hook2 -# pragma weak __sanitizer_cov_trace_cmp4 = __cmplog_ins_hook4 -# pragma weak __sanitizer_cov_trace_cmp8 = __cmplog_ins_hook8 +#pragma weak __sanitizer_cov_trace_const_cmp1 = __cmplog_ins_hook1 +#pragma weak __sanitizer_cov_trace_const_cmp2 = __cmplog_ins_hook2 +#pragma weak __sanitizer_cov_trace_const_cmp4 = __cmplog_ins_hook4 +#pragma weak __sanitizer_cov_trace_const_cmp8 = __cmplog_ins_hook8 + +#pragma weak __sanitizer_cov_trace_cmp1 = __cmplog_ins_hook1 +#pragma weak __sanitizer_cov_trace_cmp2 = __cmplog_ins_hook2 +#pragma weak __sanitizer_cov_trace_cmp4 = __cmplog_ins_hook4 +#pragma weak __sanitizer_cov_trace_cmp8 = __cmplog_ins_hook8 #else void __sanitizer_cov_trace_const_cmp1(uint8_t arg1, uint8_t arg2) __attribute__((alias("__cmplog_ins_hook1"))); diff --git a/llvm_mode/cmplog-instructions-pass.cc b/llvm_mode/cmplog-instructions-pass.cc index 61ff58b7..628151c6 100644 --- a/llvm_mode/cmplog-instructions-pass.cc +++ b/llvm_mode/cmplog-instructions-pass.cc @@ -38,12 +38,12 @@ #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/Verifier.h" -# include "llvm/IR/DebugInfo.h" +#include "llvm/IR/Verifier.h" +#include "llvm/IR/DebugInfo.h" #else -# include "llvm/Analysis/Verifier.h" -# include "llvm/DebugInfo.h" -# define nullptr 0 +#include "llvm/Analysis/Verifier.h" +#include "llvm/DebugInfo.h" +#define nullptr 0 #endif #include <set> diff --git a/llvm_mode/cmplog-routines-pass.cc b/llvm_mode/cmplog-routines-pass.cc index c61374a7..b74fb712 100644 --- a/llvm_mode/cmplog-routines-pass.cc +++ b/llvm_mode/cmplog-routines-pass.cc @@ -38,12 +38,12 @@ #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/Verifier.h" -# include "llvm/IR/DebugInfo.h" +#include "llvm/IR/Verifier.h" +#include "llvm/IR/DebugInfo.h" #else -# include "llvm/Analysis/Verifier.h" -# include "llvm/DebugInfo.h" -# define nullptr 0 +#include "llvm/Analysis/Verifier.h" +#include "llvm/DebugInfo.h" +#define nullptr 0 #endif #include <set> diff --git a/llvm_mode/compare-transform-pass.so.cc b/llvm_mode/compare-transform-pass.so.cc index 5fe0d908..00732dbc 100644 --- a/llvm_mode/compare-transform-pass.so.cc +++ b/llvm_mode/compare-transform-pass.so.cc @@ -38,12 +38,12 @@ #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/Verifier.h" -# include "llvm/IR/DebugInfo.h" +#include "llvm/IR/Verifier.h" +#include "llvm/IR/DebugInfo.h" #else -# include "llvm/Analysis/Verifier.h" -# include "llvm/DebugInfo.h" -# define nullptr 0 +#include "llvm/Analysis/Verifier.h" +#include "llvm/DebugInfo.h" +#define nullptr 0 #endif #include <set> diff --git a/llvm_mode/split-compares-pass.so.cc b/llvm_mode/split-compares-pass.so.cc index 190b0717..9c91e44f 100644 --- a/llvm_mode/split-compares-pass.so.cc +++ b/llvm_mode/split-compares-pass.so.cc @@ -37,12 +37,12 @@ #include "llvm/IR/IRBuilder.h" #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/Verifier.h" -# include "llvm/IR/DebugInfo.h" +#include "llvm/IR/Verifier.h" +#include "llvm/IR/DebugInfo.h" #else -# include "llvm/Analysis/Verifier.h" -# include "llvm/DebugInfo.h" -# define nullptr 0 +#include "llvm/Analysis/Verifier.h" +#include "llvm/DebugInfo.h" +#define nullptr 0 #endif using namespace llvm; diff --git a/llvm_mode/split-switches-pass.so.cc b/llvm_mode/split-switches-pass.so.cc index f0b26fce..e8639347 100644 --- a/llvm_mode/split-switches-pass.so.cc +++ b/llvm_mode/split-switches-pass.so.cc @@ -40,12 +40,12 @@ #include "llvm/IR/IRBuilder.h" #if LLVM_VERSION_MAJOR > 3 || \ (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4) -# include "llvm/IR/Verifier.h" -# include "llvm/IR/DebugInfo.h" +#include "llvm/IR/Verifier.h" +#include "llvm/IR/DebugInfo.h" #else -# include "llvm/Analysis/Verifier.h" -# include "llvm/DebugInfo.h" -# define nullptr 0 +#include "llvm/Analysis/Verifier.h" +#include "llvm/DebugInfo.h" +#define nullptr 0 #endif #include <set> |