Imported Scudo Standalone changes:
- 5595249e48ef83bae5f2e61c0190332534902051 [scudo][standalone] Add chunk ownership function by Kostya Kortchinsky <kostyak@google.com>
- 0cfe0a7bb0e10a96c3c98891961d37160a931d20 scudo: Fix the build of wrappers_c_test.cpp on Android. by Peter Collingbourne <peter@pcc.me.uk>
- c8a2882a97e2efb02934dcc279f1e3e302982762 scudo: Fix one of the C wrapper tests on Android. by Peter Collingbourne <peter@pcc.me.uk>
- 29f0a65671e2be3a5529b7429f6d6b5c5988b79e scudo: Add a basic malloc/free benchmark. by Peter Collingbourne <peter@pcc.me.uk>
- b36b16372d5f3aa0d1390eeaefd3600595b22e6d [scudo][standalone] Define hasHardwareCRC32 for other archs by Kostya Kortchinsky <kostyak@google.com>
- e966416ff15178bf982430085be9ae69e5a511fa scudo: Move getChunkFromBlock() allocated check into call... by Peter Collingbourne <peter@pcc.me.uk>
- 9fbfdd2bfe42a6d0a8e680c64a968e9cfc065fd3 scudo: Tweak how we align UserPtr. NFCI. by Peter Collingbourne <peter@pcc.me.uk>
- ed4618edb35688567fcf107785776e27028f4062 [Scudo] [GWP-ASan] Add GWP-ASan to Scudo Standalone. by Mitch Phillips <31459023+hctim@users.noreply.github.com>
- a00cd6dfea9f071c042c1eacd3ed9b587fe44feb [GWP-ASan] [Scudo] ifdef entire GWP-ASan tests. by Mitch Phillips <31459023+hctim@users.noreply.github.com>
GitOrigin-RevId: a00cd6dfea9f071c042c1eacd3ed9b587fe44feb
Change-Id: I18ceb458067da43e66ca02af60966f05098cc3cf
diff --git a/standalone/allocator_config.h b/standalone/allocator_config.h
index 1d00a5d..3a5aaae 100644
--- a/standalone/allocator_config.h
+++ b/standalone/allocator_config.h
@@ -64,6 +64,7 @@
using TSDRegistryT = TSDRegistrySharedT<A, 1U>; // Shared, only 1 TSD.
};
+#if SCUDO_CAN_USE_PRIMARY64
struct FuchsiaConfig {
// 1GB Regions
typedef SizeClassAllocator64<DefaultSizeClassMap, 30U> Primary;
@@ -71,6 +72,7 @@
template <class A>
using TSDRegistryT = TSDRegistrySharedT<A, 8U>; // Shared, max 8 TSDs.
};
+#endif
#if SCUDO_ANDROID
typedef AndroidConfig Config;