Bug 1877478 - Update AFL++ toolchain to latest dev r=firefox-build-sy…

…stem-reviewers,glandium

Differential Revision: https://phabricator.services.mozilla.com/D200027

taskcluster/ci/build/linux.yml

@@ -1101,6 +1101,7 @@ linux64-asan-fuzzing-nyx/opt:
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
             AFL_CC: /builds/worker/fetches/clang/bin/clang
             AFL_CXX: /builds/worker/fetches/clang/bin/clang++
+            AFL_LLVM_NO_RPATH: "1"
         max-run-time: 7200
     run:
         using: mozharness

taskcluster/ci/fetch/toolchains.yml

@@ -607,7 +607,7 @@ afl-plus-plus-4.0:
     fetch:
         type: git
         repo: https://github.com/AFLplusplus/AFLplusplus
-        revision: d09950f4bb98431576b872436f0fbf773ab895db
+        revision: 0d164e4c1811c4d05f940f78e90fc56b661fb3b4
 
 cargo-vet:
     description: cargo-vet source

taskcluster/scripts/misc/afl-nyx.patch

@@ -1,37 +1,3 @@
-commit 5609c7644b5a6e400549b01510031eb8d4e27b1c
-Author: Jesse Schwartzentruber <[email protected]>
-Date:   Fri Jul 14 13:20:02 2023 -0400
-
-    Don't set rpath to mozfetch
-
-diff --git a/src/afl-cc.c b/src/afl-cc.c
-index 037a5c30..eef15fee 100644
---- a/src/afl-cc.c
-+++ b/src/afl-cc.c
-@@ -1144,22 +1144,6 @@ static void edit_params(u32 argc, char **argv, char **envp) {
-
-   if (!have_pic) { cc_params[cc_par_cnt++] = "-fPIC"; }
-
--  // in case LLVM is installed not via a package manager or "make install"
--  // e.g. compiled download or compiled from github then its ./lib directory
--  // might not be in the search path. Add it if so.
--  u8 *libdir = strdup(LLVM_LIBDIR);
--  if (plusplus_mode && strlen(libdir) && strncmp(libdir, "/usr", 4) &&
--      strncmp(libdir, "/lib", 4)) {
--
--    cc_params[cc_par_cnt++] = "-Wl,-rpath";
--    cc_params[cc_par_cnt++] = libdir;
--
--  } else {
--
--    free(libdir);
--
--  }
--
-   if (getenv("AFL_HARDEN")) {
-
-     cc_params[cc_par_cnt++] = "-fstack-protector-all";
-
 commit 1e1e67d0a7d16db0a4331702af713a163c40b87f
 Author: Jesse Schwartzentruber <[email protected]>
 Date:   Fri Jul 14 11:04:04 2023 -0400

taskcluster/scripts/misc/build-afl.sh

@@ -11,6 +11,7 @@ patch -p1 -i "$scripts/afl-nyx.patch"
 make -f GNUmakefile afl-showmap \
     CC="$MOZ_FETCHES_DIR/clang/bin/clang"
 make -f GNUmakefile.llvm install \
+    CODE_COVERAGE=1 \
     CPPFLAGS="--sysroot $MOZ_FETCHES_DIR/sysroot" \
     DESTDIR="$dir" \
     LLVM_CONFIG="$MOZ_FETCHES_DIR/clang/bin/llvm-config" \