Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-01 02:05:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oss-fuzz/build: remove LIB_FUZZING_ENGINE

Browse Source 
Meson build scripts will only include qemu-fuzz-TARGET rules if configured
with --enable-fuzzing, and that takes care of adding -fsanitize=fuzzer.
Therefore we can just specify the configure option and stop modifying
the CFLAGS and CONFIG_FUZZ options in the "make" invocation.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-08-09 17:17:00 +02:00
parent 1d806cef0e
commit 77afc75f69
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/oss-fuzz/build.sh
View File

@ -20,7 +20,7 @@
# e.g. # e.g.
# $CXX $CXXFLAGS -std=c++11 -Iinclude \ # $CXX $CXXFLAGS -std=c++11 -Iinclude \
# /path/to/name_of_fuzzer.cc -o $OUT/name_of_fuzzer \ # /path/to/name_of_fuzzer.cc -o $OUT/name_of_fuzzer \
# $LIB_FUZZING_ENGINE /path/to/library.a # -fsanitize=fuzzer /path/to/library.a
fatal () { fatal () {
echo "Error : ${*}, exiting." echo "Error : ${*}, exiting."
@ -54,10 +54,6 @@ mkdir -p $OSS_FUZZ_BUILD_DIR || fatal "mkdir $OSS_FUZZ_BUILD_DIR failed"
cd $OSS_FUZZ_BUILD_DIR || fatal "cd $OSS_FUZZ_BUILD_DIR failed" cd $OSS_FUZZ_BUILD_DIR || fatal "cd $OSS_FUZZ_BUILD_DIR failed"
if [ -z ${LIB_FUZZING_ENGINE+x} ]; then
LIB_FUZZING_ENGINE="-fsanitize=fuzzer"
fi
if [ -z ${OUT+x} ]; then if [ -z ${OUT+x} ]; then
DEST_DIR=$(realpath "./DEST_DIR") DEST_DIR=$(realpath "./DEST_DIR")
else else
@ -67,14 +63,12 @@ fi
mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here
# Build once to get the list of dynamic lib paths, and copy them over # Build once to get the list of dynamic lib paths, and copy them over
../configure --disable-werror --cc="$CC" --cxx="$CXX" \ ../configure --disable-werror --cc="$CC" --cxx="$CXX" --enable-fuzzing \
--extra-cflags="$EXTRA_CFLAGS" --target-list="i386-softmmu" --extra-cflags="$EXTRA_CFLAGS" --target-list="i386-softmmu"
if ! make CONFIG_FUZZ=y CFLAGS="$LIB_FUZZING_ENGINE" "-j$(nproc)" \ if ! make "-j$(nproc)" i386-softmmu/fuzz; then
i386-softmmu/fuzz; then
fatal "Build failed. Please specify a compiler with fuzzing support"\ fatal "Build failed. Please specify a compiler with fuzzing support"\
"using the \$CC and \$CXX environemnt variables, or specify a"\ "using the \$CC and \$CXX environemnt variables"\
"\$LIB_FUZZING_ENGINE compatible with your compiler"\
"\nFor example: CC=clang CXX=clang++ $0" "\nFor example: CC=clang CXX=clang++ $0"
fi fi
@ -87,7 +81,7 @@ rm ./i386-softmmu/qemu-fuzz-i386
../configure --bindir="$DEST_DIR" --datadir="$DEST_DIR/data/" --disable-werror \ ../configure --bindir="$DEST_DIR" --datadir="$DEST_DIR/data/" --disable-werror \
--cc="$CC" --cxx="$CXX" --extra-cflags="$EXTRA_CFLAGS" \ --cc="$CC" --cxx="$CXX" --extra-cflags="$EXTRA_CFLAGS" \
--extra-ldflags="-Wl,-rpath,'\$\$ORIGIN/lib'" --extra-ldflags="-Wl,-rpath,'\$\$ORIGIN/lib'"
make CONFIG_FUZZ=y CFLAGS="$LIB_FUZZING_ENGINE" "-j$(nproc)" i386-softmmu/fuzz make "-j$(nproc)" i386-softmmu/fuzz
# Copy over the datadir # Copy over the datadir
cp -r ../pc-bios/ "$DEST_DIR/pc-bios" cp -r ../pc-bios/ "$DEST_DIR/pc-bios"