diff options
author | Dan Liew <dan@su-root.co.uk> | 2016-06-02 05:48:02 +0000 |
---|---|---|
committer | Dan Liew <dan@su-root.co.uk> | 2016-06-02 05:48:02 +0000 |
commit | d3c33116fd1c842d8b8f603eaf04d9ae78fb6e0d (patch) | |
tree | 571949acab8a8258bb0d019e3b4da3044bf11117 /llvm/lib/Fuzzer/FuzzerMain.cpp | |
parent | 9ded49e8a776ff5a044539f45723e501491f1b4b (diff) | |
download | bcm5719-llvm-d3c33116fd1c842d8b8f603eaf04d9ae78fb6e0d.tar.gz bcm5719-llvm-d3c33116fd1c842d8b8f603eaf04d9ae78fb6e0d.zip |
[LibFuzzer] Reimplement how the optional user functions are called.
The motivation for this change is to fix linking issues on OSX.
However this only partially fixes linking issues (the uninstrumented
tests and a few others won't succesfully link yet).
This change introduces a struct of function pointers
(``fuzzer::ExternalFuntions``) which when initialised will point to the
optional functions if they are available. Currently these
``LLVMFuzzerInitialize`` and ``LLVMFuzzerCustomMutator`` functions.
Two implementations of ``fuzzer::ExternalFunctions`` constructor are
provided one for Linux and one for OSX.
The OSX implementation uses ``dlsym()`` because the prior implementation
using weak symbols does not work unless the additional flags are passed
to the linker.
The Linux implementation continues to use weak symbols because the
``dlsym()`` approach does not work unless additional flags are passed
to the linker.
Differential Revision: http://reviews.llvm.org/D20741
llvm-svn: 271491
Diffstat (limited to 'llvm/lib/Fuzzer/FuzzerMain.cpp')
-rw-r--r-- | llvm/lib/Fuzzer/FuzzerMain.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerMain.cpp b/llvm/lib/Fuzzer/FuzzerMain.cpp index 0d5c1132ea5..55f1687b5f0 100644 --- a/llvm/lib/Fuzzer/FuzzerMain.cpp +++ b/llvm/lib/Fuzzer/FuzzerMain.cpp @@ -15,12 +15,8 @@ extern "C" { // This function should be defined by the user. int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size); -// This function may optionally be defined by the user. -__attribute__((weak)) int LLVMFuzzerInitialize(int *argc, char ***argv); } // extern "C" int main(int argc, char **argv) { - if (LLVMFuzzerInitialize) - LLVMFuzzerInitialize(&argc, &argv); - return fuzzer::FuzzerDriver(argc, argv, LLVMFuzzerTestOneInput); + return fuzzer::FuzzerDriver(&argc, &argv, LLVMFuzzerTestOneInput); } |