eb847bc866
The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
115 lines
4.1 KiB
C
115 lines
4.1 KiB
C
/*
|
|
* Copyright (C) 2009 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* Contains declarations of types and constants used by malloc leak
|
|
* detection code in both, libc and libc_malloc_debug libraries.
|
|
*/
|
|
#ifndef MALLOC_DEBUG_COMMON_H
|
|
#define MALLOC_DEBUG_COMMON_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "private/libc_logging.h"
|
|
|
|
#define HASHTABLE_SIZE 1543
|
|
#define BACKTRACE_SIZE 32
|
|
/* flag definitions, currently sharing storage with "size" */
|
|
#define SIZE_FLAG_ZYGOTE_CHILD (1<<31)
|
|
#define SIZE_FLAG_MASK (SIZE_FLAG_ZYGOTE_CHILD)
|
|
|
|
#define MAX_SIZE_T (~(size_t)0)
|
|
|
|
// This must match the alignment used by dlmalloc.
|
|
#ifndef MALLOC_ALIGNMENT
|
|
#define MALLOC_ALIGNMENT ((size_t)(2 * sizeof(void *)))
|
|
#endif
|
|
|
|
// =============================================================================
|
|
// Structures
|
|
// =============================================================================
|
|
|
|
struct HashEntry {
|
|
size_t slot;
|
|
HashEntry* prev;
|
|
HashEntry* next;
|
|
size_t numEntries;
|
|
// fields above "size" are NOT sent to the host
|
|
size_t size;
|
|
size_t allocations;
|
|
uintptr_t backtrace[0];
|
|
};
|
|
|
|
struct HashTable {
|
|
size_t count;
|
|
HashEntry* slots[HASHTABLE_SIZE];
|
|
};
|
|
|
|
/* Entry in malloc dispatch table. */
|
|
typedef void* (*MallocDebugMalloc)(size_t);
|
|
typedef void (*MallocDebugFree)(void*);
|
|
typedef void* (*MallocDebugCalloc)(size_t, size_t);
|
|
typedef void* (*MallocDebugRealloc)(void*, size_t);
|
|
typedef void* (*MallocDebugMemalign)(size_t, size_t);
|
|
typedef size_t (*MallocDebugMallocUsableSize)(const void*);
|
|
struct MallocDebug {
|
|
MallocDebugMalloc malloc;
|
|
MallocDebugFree free;
|
|
MallocDebugCalloc calloc;
|
|
MallocDebugRealloc realloc;
|
|
MallocDebugMemalign memalign;
|
|
MallocDebugMallocUsableSize malloc_usable_size;
|
|
};
|
|
|
|
/* Malloc debugging initialization and finalization routines.
|
|
*
|
|
* These routines must be implemented in .so modules that implement malloc
|
|
* debugging. The are is called once per process from malloc_init_impl and
|
|
* malloc_fini_impl respectively.
|
|
*
|
|
* They are implemented in bionic/libc/bionic/malloc_debug_common.c when malloc
|
|
* debugging gets initialized for the process.
|
|
*
|
|
* MallocDebugInit returns:
|
|
* 0 on success, -1 on failure.
|
|
*/
|
|
typedef int (*MallocDebugInit)();
|
|
typedef void (*MallocDebugFini)();
|
|
|
|
// =============================================================================
|
|
// log functions
|
|
// =============================================================================
|
|
|
|
#define debug_log(format, ...) \
|
|
__libc_format_log(ANDROID_LOG_DEBUG, "malloc_leak_check", (format), ##__VA_ARGS__ )
|
|
#define error_log(format, ...) \
|
|
__libc_format_log(ANDROID_LOG_ERROR, "malloc_leak_check", (format), ##__VA_ARGS__ )
|
|
#define info_log(format, ...) \
|
|
__libc_format_log(ANDROID_LOG_INFO, "malloc_leak_check", (format), ##__VA_ARGS__ )
|
|
|
|
#endif // MALLOC_DEBUG_COMMON_H
|