applied patches from Freescale and Ka-Ro

[karo-tx-uboot.git] / lib_arm / Makefile

diff --git a/lib_arm/Makefile b/lib_arm/Makefile
index c37e2e0d8a989802dfef2b9b7b0efb43f07d1b4f..6b1561be980e50b2a17aaec24905efe37253de84 100644 (file)
--- a/lib_arm/Makefile
+++ b/lib_arm/Makefile
@@ -39,9 +39,6 @@ GLCOBJS       += div0.o
 COBJS-y        += board.o
 COBJS-y        += bootm.o
 COBJS-y        += cache.o
-ifndef CONFIG_SYS_NO_CP15_CACHE
-COBJS-y        += cache-cp15.o
-endif
 COBJS-y        += interrupts.o
 COBJS-y        += reset.o
 
@@ -51,12 +48,21 @@ OBJS        := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 LGOBJS := $(addprefix $(obj),$(GLSOBJS)) \
           $(addprefix $(obj),$(GLCOBJS))
 
+# Always build libarm.a
+TARGETS        := $(LIB)
+
+# Build private libgcc only when asked for
 ifdef USE_PRIVATE_LIBGCC
-all:   $(LIB) $(LIBGCC)
-else
-all:   $(LIB)
+TARGETS        += $(LIBGCC)
 endif
 
+# For EABI conformant tool chains, provide eabi_compat()
+ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
+TARGETS        += $(obj)eabi_compat.o
+endif
+
+all:   $(TARGETS)
+
 $(LIB):        $(obj).depend $(OBJS)
        $(AR) $(ARFLAGS) $@ $(OBJS)