Commit 53f58c3f authored by Jesse Schwartzentruber's avatar Jesse Schwartzentruber
Browse files

Bug 1784495 - Switch AFL toolchain to original Nyx toolchain. r=decoder,glandium 

Differential Revision: https://phabricator.services.mozilla.com/D154555
parent b1c9edc1

taskcluster/ci/build/linux.yml

+3 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,9 @@ linux64-asan-fuzzing-nyx/opt: 
        env:

            PERFHERDER_EXTRA_OPTIONS: asan-fuzzing-nyx

            MOZ_AUTOMATION_PACKAGE_TESTS: "1"

        max-run-time: 5400

            AFL_CC: /builds/worker/fetches/clang/bin/clang

            AFL_CXX: /builds/worker/fetches/clang/bin/clang++

        max-run-time: 7200

    run:

        using: mozharness

        actions: [get-secrets, build]

taskcluster/ci/fetch/toolchains.yml

+4 −4
Original line number Diff line number Diff line
@@ -595,12 +595,12 @@ pkgconf: 
        strip-components: 1

        add-prefix: pkgconf/



aflplusplus-4.0:

    description: AFL++ 4.00 source

afl-2.5:

    description: AFL 2.5x source

    fetch:

        type: git

        repo: https://github.com/AFLplusplus/AFLplusplus

        revision: ba3c7bfe40f9b17a691958e3525828385127ad25

        repo: https://github.com/google/AFL

        revision: e75894a889fe854c02b9435186bd1e2927d6d490



cargo-vet:

    description: cargo-vet source

taskcluster/ci/toolchain/misc.yml

+6 −4
Original line number Diff line number Diff line
@@ -360,18 +360,20 @@ win64-vs2019: 
            - build/vs/vs2019.yaml

        toolchain-artifact: project/gecko/vs/vs.tar.zst



linux64-afl-instrumentation-4.0:

    description: "AFL++ instrumentation toolchain build"

linux64-afl-instrumentation-2.5:

    description: "AFL instrumentation toolchain build"

    treeherder:

        symbol: TL(afl++)

        symbol: TL(afl)

    worker:

        max-run-time: 3600

    run:

        script: build-afl.sh

        resources:

            - taskcluster/scripts/misc/afl-nyx.patch

        toolchain-artifact: public/build/afl-instrumentation.tar.zst

        toolchain-alias: linux64-afl-instrumentation

    fetches:

        fetch:

            - aflplusplus-4.0

            - afl-2.5

        toolchain:

            - linux64-clang

taskcluster/scripts/misc/afl-nyx.patch

0 → 100644
+791 −0

File added.

Preview size limit exceeded, changes collapsed.

taskcluster/scripts/misc/build-afl.sh

+6 −6
Original line number Diff line number Diff line
@@ -3,17 +3,17 @@ 
set -e -x



artifact=$(basename "$TOOLCHAIN_ARTIFACT")

dir=${artifact%.tar.*}

dir="${artifact%.tar.*}"

scripts="$(realpath "${0%/*}")"



cd "$MOZ_FETCHES_DIR/AFLplusplus"

make -f GNUmakefile afl-showmap \

cd "$MOZ_FETCHES_DIR/AFL"

patch -p1 -i "$scripts/afl-nyx.patch"

make afl-showmap \

    CC="$MOZ_FETCHES_DIR/clang/bin/clang"

make -f GNUmakefile.llvm install \

    DESTDIR="$dir" \

make -C llvm_mode install \

    DESTDIR="../$dir" \

    PREFIX=/ \

    LLVM_CONFIG="$MOZ_FETCHES_DIR/clang/bin/llvm-config"

rm -rf "$dir/share"



tar caf "$artifact" "$dir"