From acd1a57bd17495f0859013bd61bb5aa4829e7a6b Mon Sep 17 00:00:00 2001
From: zhangyuan7 <zhangyuan7@pinecone.net>
Date: Tue, 19 Mar 2019 10:10:29 -0600
Subject: [PATCH] libs/libxx/Makefile:  Always add libxx_cxa_guard.cxx for
 uclibcxx.

---
 libs/libxx/Makefile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/libs/libxx/Makefile b/libs/libxx/Makefile
index 172d1468d8..e5360c3f53 100644
--- a/libs/libxx/Makefile
+++ b/libs/libxx/Makefile
@@ -46,7 +46,8 @@ endif
 ASRCS =
 CSRCS =
 
-CXXSRCS  = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx  libxx_cxa_atexit.cxx
+CXXSRCS  = libxx_cxapurevirtual.cxx libxx_eabi_atexit.cxx libxx_cxa_atexit.cxx
+CXXSRCS += libxx_cxa_guard.cxx
 ifeq ($(CONFIG_CXX_EXCEPTION),y)
 CXXSRCS += libxx__gnu_unwind_find_exidx.cxx
 endif
@@ -60,12 +61,6 @@ CXXSRCS += libxx_deletea_sized.cxx libxx_new.cxx libxx_newa.cxx
 CXXSRCS += libxx_stdthrow.cxx
 endif
 
-# uClibc++ doesn't need this file
-
-ifneq ($(CONFIG_UCLIBCXX),y)
-CXXSRCS += libxx_cxa_guard.cxx
-endif
-
 # Paths
 
 DEPPATH = --dep-path .