From 30b2a99b3f8d4cff8e44df280a2a77f96c373ba9 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Mon, 15 Feb 2016 00:24:19 +0300
Subject: [PATCH] Remove mem_manager.o from libmain.a (#1630)

---
 cores/esp8266/heap.c    |   5 +++++
 tools/sdk/lib/README.md |   7 ++-----
 tools/sdk/lib/libmain.a | Bin 177190 -> 168814 bytes
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cores/esp8266/heap.c b/cores/esp8266/heap.c
index ac79bcad9..0d02592b1 100644
--- a/cores/esp8266/heap.c
+++ b/cores/esp8266/heap.c
@@ -37,6 +37,11 @@ size_t ICACHE_RAM_ATTR xPortGetFreeHeapSize(void)
     return umm_free_heap_size();
 }
 
+size_t ICACHE_RAM_ATTR xPortWantedSizeAlign(size_t size)
+{
+    return (size + 3) & ~((size_t) 3);
+}
+
 void system_show_malloc(void)
 {
     umm_info(NULL, 1);
diff --git a/tools/sdk/lib/README.md b/tools/sdk/lib/README.md
index 5e24e1952..8f43ae620 100644
--- a/tools/sdk/lib/README.md
+++ b/tools/sdk/lib/README.md
@@ -3,11 +3,8 @@
 After updating SDK libraries to a new version, do the following changes.
 
 
-1. Weaken symbols from mem_manager.o to use custom heap implementation
+1. Remove mem_manager.o from libmain.a to use custom heap implementation
 
     ```bash
-    xtensa-lx106-elf-ar -x libmain.a mem_manager.o
-    xtensa-lx106-elf-objcopy --weaken mem_manager.o
-    xtensa-lx106-elf-ar -r libmain.a mem_manager.o
-    rm mem_manager.o
+    xtensa-lx106-elf-ar -d libmain.a mem_manager.o
     ```
diff --git a/tools/sdk/lib/libmain.a b/tools/sdk/lib/libmain.a
index e410f2404380902cde5505ea705ca1d61280b397..aec0f1756744372ae5c1560bd80b1694b78f291a 100644
GIT binary patch
delta 965
zcmZ4Xg6rKft_jlhrY06976yh23I+-wfJ`bVn3|bbfQ1zjxEL51?lLflEg~H^?PFlT
zh3k<eR)#S!pyR`r7#IlQ$6gE!#NeMmv!IxfEsg<%>tT!mqU*t~7$D1mcGp9KVZa<v
z4~>U`a=<{xzXmw|nR4S8n2HuLFqJ=JV5-$Z;MPM7Od#AVw)q3IBGYC@_T0PeOe~Ds
KnOK-qHUI!4ua`dn

delta 6573
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
O2dj?!qUwkozw=*7LJ?O0