Skip to content

Commit

Permalink
Add trace-pc-guard to no-sanitize-coverage. (#114)
Browse files Browse the repository at this point in the history
This allows building libcxx and libcxxabi with the HonggFuzz fuzzer
which requires sanitize-coverage.

[0] google/oss-fuzz#7033
  • Loading branch information
bungeman committed Dec 18, 2021
1 parent eeef3bc commit e401ce2
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
From 0205f99a266c762d00c3f2fa4e3d87ec2366928f Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@chromium.org>
Date: Fri, 17 Dec 2021 23:12:05 -0500
Subject: [PATCH] Add trace-pc-guard to -fno-sanitize-coverage.

This allows libcxx, libcxxabi, and libunwind to be built with HonggFuzz.
---
libcxx/cmake/config-ix.cmake | 2 +-
libcxxabi/cmake/config-ix.cmake | 2 +-
libunwind/cmake/config-ix.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libcxx/cmake/config-ix.cmake b/libcxx/cmake/config-ix.cmake
index a2f1ff9f1a3b..91b1749c75af 100644
--- a/libcxx/cmake/config-ix.cmake
+++ b/libcxx/cmake/config-ix.cmake
@@ -73,7 +73,7 @@ if (LIBCXX_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
endif ()
if (CMAKE_C_FLAGS MATCHES -fsanitize-coverage OR CMAKE_CXX_FLAGS MATCHES -fsanitize-coverage)
- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters")
+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters")
endif ()
endif ()

diff --git a/libcxxabi/cmake/config-ix.cmake b/libcxxabi/cmake/config-ix.cmake
index 7f1cecbcd254..86370a712220 100644
--- a/libcxxabi/cmake/config-ix.cmake
+++ b/libcxxabi/cmake/config-ix.cmake
@@ -66,7 +66,7 @@ if (LIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
endif ()
if (CMAKE_C_FLAGS MATCHES -fsanitize-coverage OR CMAKE_CXX_FLAGS MATCHES -fsanitize-coverage)
- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters")
+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters")
endif ()
endif ()

diff --git a/libunwind/cmake/config-ix.cmake b/libunwind/cmake/config-ix.cmake
index 4ca6bdd8e95d..34381fbd8721 100644
--- a/libunwind/cmake/config-ix.cmake
+++ b/libunwind/cmake/config-ix.cmake
@@ -67,7 +67,7 @@ if (LIBUNWIND_SUPPORTS_NOSTDLIBXX_FLAG OR LIBUNWIND_SUPPORTS_NODEFAULTLIBS_FLAG)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
endif ()
if (CMAKE_C_FLAGS MATCHES -fsanitize-coverage OR CMAKE_CXX_FLAGS MATCHES -fsanitize-coverage)
- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters")
+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters")
endif ()
endif ()

--
2.34.1.173.g76aa8bc2d0-goog

6 changes: 5 additions & 1 deletion fuzzing/scripts/build/libcxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ set -euxo pipefail
# fully.

dir="${PWD}"
cd $( dirname $( readlink -f "${0}" ) ) # go to `/fuzzing/scripts/build'
path_to_self=$( dirname $( readlink -f "${0}" ) )
cd "${path_to_self}" # go to `/fuzzing/scripts/build'

path_to_src=$( readlink -f "../../../external/llvm-project" )
path_to_build="${path_to_src}/build"
Expand All @@ -26,6 +27,9 @@ if [[ "${#}" == "0" || "${1}" != "--no-init" ]]; then
git reset --hard
git rev-parse HEAD

# See https://github.com/google/oss-fuzz/pull/7033
git apply ${path_to_self}/0001-Add-trace-pc-guard-to-fno-sanitize-coverage.patch

mkdir "${path_to_build}" && cd "${path_to_build}"

case ${SANITIZER} in
Expand Down

0 comments on commit e401ce2

Please sign in to comment.