diff options
| author | Elliott Hughes <enh@google.com> | 2012-05-09 12:53:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-09 12:53:16 -0700 |
| commit | 58a00b4977b6fa073a8f56d94d741b1e4cb49856 (patch) | |
| tree | 738970d2e9978d20d72f405a38f9a0483eea709f | |
| parent | eab2889e66d4fe03f3c5590d7e8b14e3777179ec (diff) | |
| parent | 7eb1cc23f8976a2062ba0cf92f030216a8e64e60 (diff) | |
| download | bionic-58a00b4977b6fa073a8f56d94d741b1e4cb49856.zip bionic-58a00b4977b6fa073a8f56d94d741b1e4cb49856.tar.gz bionic-58a00b4977b6fa073a8f56d94d741b1e4cb49856.tar.bz2 | |
am 7eb1cc23: Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"
* commit '7eb1cc23f8976a2062ba0cf92f030216a8e64e60':
bionic: allow the board to customize MALLOC_ALIGNMENT
| -rw-r--r-- | libc/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 8b516ef..5e9d6777 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -465,6 +465,13 @@ ifeq ($(strip $(DEBUG_BIONIC_LIBC)),true) libc_common_cflags += -DDEBUG endif +# To customize dlmalloc's alignment, set BOARD_MALLOC_ALIGNMENT in +# the appropriate BoardConfig.mk file. +# +ifneq ($(BOARD_MALLOC_ALIGNMENT),) + libc_common_cflags += -DMALLOC_ALIGNMENT=$(BOARD_MALLOC_ALIGNMENT) +endif + ifeq ($(TARGET_ARCH),arm) libc_common_cflags += -fstrict-aliasing libc_crt_target_cflags := -mthumb-interwork |