From 3e9caf7a3d26690f1a5b5f47d384e57237598bbe Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 15 Sep 2017 16:09:29 +0800
Subject: [PATCH] tools/sdk: remove conflicting time.o from libmain.a

---
 tools/sdk/lib/README.md |  27 +++++++++++++++------------
 tools/sdk/lib/libmain.a | Bin 206954 -> 199606 bytes
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/tools/sdk/lib/README.md b/tools/sdk/lib/README.md
index 595916701..dee6b37c2 100644
--- a/tools/sdk/lib/README.md
+++ b/tools/sdk/lib/README.md
@@ -3,22 +3,25 @@
 After updating SDK libraries to a new version, do the following changes.
 
 
-1. Remove mem_manager.o from libmain.a to use custom heap implementation
+Remove mem_manager.o from libmain.a to use custom heap implementation, and time.o to fix redefinition of time-related functions:
 
-    ```bash
-    xtensa-lx106-elf-ar -d libmain.a mem_manager.o
-    ```
+```bash
+xtensa-lx106-elf-ar -d libmain.a mem_manager.o
+xtensa-lx106-elf-ar -d libmain.a time.o
+```
 
 ## Updating libstdc++
 
 After building gcc using crosstool-NG, get compiled libstdc++ and remove some objects:
 
-    xtensa-lx106-elf-ar d libstdc++.a pure.o
-    xtensa-lx106-elf-ar d libstdc++.a vterminate.o
-    xtensa-lx106-elf-ar d libstdc++.a guard.o
-    xtensa-lx106-elf-ar d libstdc++.a functexcept.o
-    xtensa-lx106-elf-ar d libstdc++.a del_op.o
-    xtensa-lx106-elf-ar d libstdc++.a del_opv.o
-    xtensa-lx106-elf-ar d libstdc++.a new_op.o
-    xtensa-lx106-elf-ar d libstdc++.a new_opv.o
+```bash
+xtensa-lx106-elf-ar d libstdc++.a pure.o
+xtensa-lx106-elf-ar d libstdc++.a vterminate.o
+xtensa-lx106-elf-ar d libstdc++.a guard.o
+xtensa-lx106-elf-ar d libstdc++.a functexcept.o
+xtensa-lx106-elf-ar d libstdc++.a del_op.o
+xtensa-lx106-elf-ar d libstdc++.a del_opv.o
+xtensa-lx106-elf-ar d libstdc++.a new_op.o
+xtensa-lx106-elf-ar d libstdc++.a new_opv.o
+```
 
diff --git a/tools/sdk/lib/libmain.a b/tools/sdk/lib/libmain.a
index fdc93e024bfd6a802d812be086c6b82fead7b5c8..29a9aa493669f039e462fbd0c9c8ed1bed271835 100644
GIT binary patch
delta 1059
zcmaELfoI!vo(YomrUs@aW=4ia<_Zc13Lt<?Dkzv4T0jI861W%`7(OsCNNgh?Pvm1@
zK*jaw0ucW8Weg1H_|h*124e7EEd~ZCX5`$)fFIWrQb1$*dV(&btpn=u2M=v62ijdv
zAbx1=fWZ|1Omn9(FfF>pz_db+foW|L0&o4rzy!j3{TP@IFQW#|%uCB>$SKb(*lfzu
bz|^eBzFm=>QI)wpON|kTnU-g%F*5-G{;li@

delta 6003
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