From dced088ff53dae4c8005f445e71a555c0c72d1b4 Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Tue, 11 Apr 2017 13:07:11 -0600
Subject: [PATCH] Fix LLVM libc++ undefined reference to __cxa_guard_*

---
 libxx/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libxx/Makefile b/libxx/Makefile
index 766bd5d62d..9f5ba9c9ac 100644
--- a/libxx/Makefile
+++ b/libxx/Makefile
@@ -50,13 +50,19 @@ endif
 
 ifeq (,$(findstring y,$(CONFIG_UCLIBCXX) $(CONFIG_LIBCXX)))
 CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx
-CXXSRCS += libxx_stdthrow.cxx libxx_cxa_guard.cxx
+CXXSRCS += libxx_stdthrow.cxx
 else
 ifeq (,$(findstring y,$(CONFIG_UCLIBCXX_EXCEPTION) $(CONFIG_LIBCXX_EXCEPTION)))
 CXXSRCS += libxx_stdthrow.cxx
 endif
 endif
 
+# uClibc++ doesn't need this file
+
+ifneq ($(CONFIG_UCLIBCXX),y)
+CXXSRCS += libxx_cxa_guard.cxx
+endif
+
 # Paths
 
 DEPPATH = --dep-path .