forked from openembedded/meta-openembedded
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mongodb: Fix aarch64 build with gcc12
Signed-off-by: Khem Raj <[email protected]>
- Loading branch information
Showing
2 changed files
with
38 additions
and
0 deletions.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
...thon/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 5c9e0d0fc9188bab0ae09c9c33df01938b0c1b6c Mon Sep 17 00:00:00 2001 | ||
From: Khem Raj <[email protected]> | ||
Date: Thu, 14 Apr 2022 09:25:33 -0700 | ||
Subject: [PATCH] server: Adjust the cache alignment assumptions | ||
|
||
aarch64 has 256 for hardware_destructive_interference_size and gcc 12 | ||
has added a warning to complain about mismatches which results in | ||
static_assert failures | ||
|
||
In file included from src/mongo/s/commands/cluster_find_cmd.cpp:39: | ||
src/mongo/db/stats/counters.h:185:47: error: static assertion failed: cache line spill | ||
185 | static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
||
The structure need to ensure true sharing for both the elements | ||
so align it to hardware_constructive_interference_size instead | ||
|
||
Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664] | ||
|
||
Signed-off-by: Khem Raj <[email protected]> | ||
--- | ||
src/mongo/db/stats/counters.h | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
||
--- a/src/mongo/db/stats/counters.h | ||
+++ b/src/mongo/db/stats/counters.h | ||
@@ -182,8 +182,8 @@ private: | ||
AtomicWord<long long> requests{0}; | ||
}; | ||
CacheAligned<Together> _together{}; | ||
- static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, | ||
- "cache line spill"); | ||
+ static_assert(sizeof(Together) <= stdx::hardware_constructive_interference_size, | ||
+ "cache line spill"); | ||
|
||
CacheAligned<AtomicWord<long long>> _logicalBytesOut{0}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters