Page MenuHomePhabricator

D62048.id.diff
No OneTemporary

File Metadata

Created
Tue, Apr 7, 6:08 AM

D62048.id.diff

Index: lib/gwp_asan/CMakeLists.txt
===================================================================
--- lib/gwp_asan/CMakeLists.txt
+++ lib/gwp_asan/CMakeLists.txt
@@ -10,10 +10,10 @@
random.h
)
-# Disable RTTI and exception support, as we want these libraries to be
-# C-compatible. Regular C source files can be linked against the generated
-# GwpAsan libraries using the Clang C compiler.
-set(GWP_ASAN_CFLAGS -fno-rtti -fno-exceptions)
+# Ensure that GWP-ASan meets the delegated requirements of some supporting
+# allocators. Some supporting allocators (e.g. scudo standalone) cannot use any
+# parts of the C++ standard library.
+set(GWP_ASAN_CFLAGS -fno-rtti -fno-exceptions -nostdinc++)
if (COMPILER_RT_HAS_GWP_ASAN)
foreach(arch ${GWP_ASAN_SUPPORTED_ARCH})
Index: lib/gwp_asan/random.h
===================================================================
--- lib/gwp_asan/random.h
+++ lib/gwp_asan/random.h
@@ -9,7 +9,7 @@
#ifndef GWP_ASAN_RANDOM_H_
#define GWP_ASAN_RANDOM_H_
-#include <cstdint>
+#include <stdint.h>
namespace gwp_asan {
// xorshift (32-bit output), extremely fast PRNG that uses arithmetic operations
Index: lib/gwp_asan/random.cpp
===================================================================
--- lib/gwp_asan/random.cpp
+++ lib/gwp_asan/random.cpp
@@ -8,7 +8,7 @@
#include "gwp_asan/random.h"
-#include <ctime>
+#include <time.h>
namespace gwp_asan {
uint32_t getRandomUnsigned32() {

Event Timeline