Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

malloc_debug: Set default alignment to max_align_t if available.

Browse Source 
For it to be available we build malloc_debug in C++11 mode when not
using GCC2. Note that max_align_t is not in the std namespace in GCC4
versions prior to GCC 4.9. The extra "using namespace std" is there to
be forward compatible once we update.
This commit is contained in:
Michael Lotz 2015-04-08 12:26:30 +02:00
parent e25776bd83
commit abf230a9ac
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/libroot/posix/malloc_debug/Jamfile
View File

@ -7,6 +7,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
if $(architecture) != x86_gcc2 {
SubDirC++Flags -std=gnu++11 ;
}
UsePrivateSystemHeaders ;
MergeObject <$(architecture)>posix_malloc_debug.o :

9
src/system/libroot/posix/malloc_debug/guarded_heap.cpp
View File

@ -19,7 +19,14 @@
static bool sDebuggerCalls = true;
#if __cplusplus >= 201103L
#include <cstddef>
using namespace std;
static size_t sDefaultAlignment = alignof(max_align_t);
#else
static size_t sDefaultAlignment = 0;
#endif
static void
@ -950,7 +957,7 @@ __init_heap_post_env(void)
const char *argument = strchr(mode, 'a');
if (argument != NULL
&& sscanf(argument, "a%" B_SCNuSIZE, &defaultAlignment) == 1
&& defaultAlignment > 0) {
&& defaultAlignment >= 0) {
heap_debug_set_default_alignment(defaultAlignment);
}
}

11
src/system/libroot/posix/malloc_debug/heap.cpp
View File

@ -44,7 +44,14 @@ static bool sParanoidValidation = false;
static thread_id sWallCheckThread = -1;
static bool sStopWallChecking = false;
static bool sUseGuardPage = false;
static bool sDefaultAlignment = 0;
#if __cplusplus >= 201103L
#include <cstddef>
using namespace std;
static size_t sDefaultAlignment = alignof(max_align_t);
#else
static size_t sDefaultAlignment = 0;
#endif
void
@ -1852,7 +1859,7 @@ __init_heap_post_env(void)
const char *argument = strchr(mode, 'a');
if (argument != NULL
&& sscanf(argument, "a%" B_SCNuSIZE, &defaultAlignment) == 1
&& defaultAlignment > 0) {
&& defaultAlignment >= 0) {
heap_debug_set_default_alignment(defaultAlignment);
}
}