pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Use trivial types to avoid calls to new for globals"

This commit is contained in:
Dimitry Ivanov 2016-07-13 18:45:00 +00:00 committed by Gerrit Code Review
parent c8d5d2a524 f857211675
commit cc55bd8313
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linker/linker_allocator.cpp
View File

@ -15,6 +15,7 @@
*/ */
#include "linker_allocator.h" #include "linker_allocator.h"
#include "linker_debug.h"
#include "linker.h" #include "linker.h"
#include <algorithm> #include <algorithm>
@ -73,6 +74,8 @@ LinkerSmallObjectAllocator::LinkerSmallObjectAllocator()
: type_(0), block_size_(0), free_pages_cnt_(0), free_blocks_list_(nullptr) {} : type_(0), block_size_(0), free_pages_cnt_(0), free_blocks_list_(nullptr) {}
void* LinkerSmallObjectAllocator::alloc() { void* LinkerSmallObjectAllocator::alloc() {
CHECK(block_size_ != 0);
if (free_blocks_list_ == nullptr) { if (free_blocks_list_ == nullptr) {
alloc_page(); alloc_page();
} }

2
linker/linker_logger.cpp
View File

@ -41,7 +41,7 @@
LinkerLogger g_linker_logger; LinkerLogger g_linker_logger;
static const char* kSystemLdDebugProperty = "debug.ld.all"; static const char* kSystemLdDebugProperty = "debug.ld.all";
static const std::string kLdDebugPropertyPrefix = "debug.ld.app."; static const char* kLdDebugPropertyPrefix = "debug.ld.app.";
static const char* kOptionErrors = "dlerror"; static const char* kOptionErrors = "dlerror";
static const char* kOptionDlopen = "dlopen"; static const char* kOptionDlopen = "dlopen";