From 6a897a6d71e418c457a5ec92fae4833eba47e1d6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 9 Sep 2014 15:45:37 -0600
Subject: [PATCH] Add logic that will permit us to build user libraries with
 different CFLAGS than kernel code.  This is needed because we need the
 -fno-common option when building ELF code to prevent SHN_COMMON relocations

---
 configs/sama5d4-ek/knsh/Make.defs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/sama5d4-ek/knsh/Make.defs b/configs/sama5d4-ek/knsh/Make.defs
index 3fbae563994..218e3f7672d 100644
--- a/configs/sama5d4-ek/knsh/Make.defs
+++ b/configs/sama5d4-ek/knsh/Make.defs
@@ -86,6 +86,11 @@ ARCHWARNINGSXX = -Wall -Wshadow
 ARCHDEFINES =
 ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
 
+ifneq ($(KERNEL),y)
+  ARCHCFLAGS += -fno-common
+  ARCHCXXFLAGS += -fno-common
+endif
+
 CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
 CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
 CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe