projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
malloc.h
diff --git
a/include/malloc.h
b/include/malloc.h
index
5df6348
..
8175c75
100644
(file)
--- a/
include/malloc.h
+++ b/
include/malloc.h
@@
-872,7
+872,7
@@
extern Void_t* sbrk();
#else
#else
-#if
def CONFIG_SYS_MALLOC_SIMPLE
+#if
CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
#define malloc malloc_simple
#define realloc realloc_simple
#define memalign memalign_simple
#define malloc malloc_simple
#define realloc realloc_simple
#define memalign memalign_simple
@@
-906,11
+906,15
@@
void *realloc_simple(void *ptr, size_t size);
#endif
#endif
+/* Set up pre-relocation malloc() ready for use */
+int initf_malloc(void);
+
/* Public routines */
/* Simple versions which can be used when space is tight */
void *malloc_simple(size_t size);
/* Public routines */
/* Simple versions which can be used when space is tight */
void *malloc_simple(size_t size);
+#pragma GCC visibility push(hidden)
# if __STD_C
Void_t* mALLOc(size_t);
# if __STD_C
Void_t* mALLOc(size_t);
@@
-942,6
+946,7
@@
int mALLOPt();
struct mallinfo mALLINFo();
# endif
#endif
struct mallinfo mALLINFo();
# endif
#endif
+#pragma GCC visibility pop
/*
* Begin and End of memory area for malloc(), and current "brk"
/*
* Begin and End of memory area for malloc(), and current "brk"