9397bdd13f
We can sometimes fail to link a static executable because of duplicate definitions of std::nothrow in bionic/libc/bionic/new.cpp and external/libcxx/src/new.cpp. Fix it by making our definition weak since it doesn't matter which one ends up being chosen. Change-Id: Iec02ae89f4a3d2ffe298817240f404e54b109a52
64 lines
1.6 KiB
C++
64 lines
1.6 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <new>
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <async_safe/log.h>
|
|
|
|
__attribute__((weak)) const std::nothrow_t std::nothrow = {};
|
|
|
|
void* operator new(std::size_t size) {
|
|
void* p = malloc(size);
|
|
if (p == nullptr) {
|
|
async_safe_fatal("new failed to allocate %zu bytes", size);
|
|
}
|
|
return p;
|
|
}
|
|
|
|
void* operator new[](std::size_t size) {
|
|
void* p = malloc(size);
|
|
if (p == nullptr) {
|
|
async_safe_fatal("new[] failed to allocate %zu bytes", size);
|
|
}
|
|
return p;
|
|
}
|
|
|
|
void operator delete(void* ptr) throw() {
|
|
free(ptr);
|
|
}
|
|
|
|
void operator delete[](void* ptr) throw() {
|
|
free(ptr);
|
|
}
|
|
|
|
void* operator new(std::size_t size, const std::nothrow_t&) {
|
|
return malloc(size);
|
|
}
|
|
|
|
void* operator new[](std::size_t size, const std::nothrow_t&) {
|
|
return malloc(size);
|
|
}
|
|
|
|
void operator delete(void* ptr, const std::nothrow_t&) throw() {
|
|
free(ptr);
|
|
}
|
|
|
|
void operator delete[](void* ptr, const std::nothrow_t&) throw() {
|
|
free(ptr);
|
|
}
|