diff options
| author | Elliott Hughes <enh@google.com> | 2012-05-09 09:52:56 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-09 09:52:56 -0700 |
| commit | 7eb1cc23f8976a2062ba0cf92f030216a8e64e60 (patch) | |
| tree | 222e5cabd3f44a359cb3e05e1eb4093087bcb3a9 | |
| parent | fd95503347acba5c52d669a186ad2b161338a8a7 (diff) | |
| parent | 2fd81ef71c10aecf6583facdd79f8f60f3eed678 (diff) | |
| download | bionic-7eb1cc23f8976a2062ba0cf92f030216a8e64e60.zip bionic-7eb1cc23f8976a2062ba0cf92f030216a8e64e60.tar.gz bionic-7eb1cc23f8976a2062ba0cf92f030216a8e64e60.tar.bz2 | |
Merge "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 f7e0e8f..8e86d26 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -459,6 +459,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 |