generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a separate config.h for config like defines.

Browse Source 
This allows an easier way to share config parameters between unit tests
and the bionic code.

It also fixes a problem where the 32 bit bionic tests based on glibc, or
the cts list executable did not have the pvalloc,valloc tests.

Change-Id: Ib47942cb8a278252faa7498a6ef23e9578db544f
This commit is contained in:
Christopher Ferris 2014-06-16 23:35:53 -07:00
parent a217a0cdb3
commit 6361964381
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/bionic/malloc_debug_common.h
View File

@ -37,6 +37,7 @@
#include <stdint.h>
#include <stdlib.h>
#include "private/bionic_config.h"
#include "private/libc_logging.h"
#define HASHTABLE_SIZE 1543
@ -61,12 +62,6 @@
#define Malloc(function) dl ## function
#endif
// valloc(3) and pvalloc(3) were removed from POSIX 2004. We do not include them
// for LP64, but the symbols remain in LP32 for binary compatibility.
#ifndef __LP64__
#define HAVE_DEPRECATED_MALLOC_FUNCS 1
#endif
// =============================================================================
// Structures
// =============================================================================

26
libc/private/bionic_config.h Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright (C) 2014 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.
*/
#ifndef _BIONIC_CONFIG_H_
#define _BIONIC_CONFIG_H_
// valloc(3) and pvalloc(3) were removed from POSIX 2004. We do not include them
// for LP64, but the symbols remain in LP32 for binary compatibility.
#if !defined(__LP64__)
#define HAVE_DEPRECATED_MALLOC_FUNCS 1
#endif
#endif // _BIONIC_CONFIG_H_

4
tests/malloc_test.cpp
View File

@ -22,9 +22,7 @@
#include <malloc.h>
#include <unistd.h>
#if defined(__BIONIC__)
#include <libc/bionic/malloc_debug_common.h>
#endif
#include "private/bionic_config.h"
TEST(malloc, malloc_std) {
// Simple malloc test.