resolved conflicts for merge of 1a08100f to gingerbread

Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7

diff --cc core/clear_vars.mk
Simple merge

diff --cc core/combo/TARGET_linux-arm.mk
index aa53767,df6770e..ae1997c
--- 1/core/combo/TARGET_linux-arm.mk
--- 2/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@@ -230,20 -214,18 +230,20 @@@ $(TARGET_CXX) 
        -nostdlib -Wl,-soname,$(notdir $@) -Wl,-T,$(BUILD_SYSTEM)/armelf.xsc \
        -Wl,--gc-sections \
        -Wl,-shared,-Bsymbolic \
-       $(TARGET_GLOBAL_LD_DIRS) \
+       $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
        $(PRIVATE_ALL_OBJECTS) \
-       $(TARGET_CRTBEGIN_SO_O) \
++      $(PRIVATE_TARGET_CRTBEGIN_SO_O) \
        -Wl,--whole-archive \
        $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
        -Wl,--no-whole-archive \
        $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
        $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
        -o $@ \
-       $(TARGET_GLOBAL_LDFLAGS) \
 -      $(PRIVATE_LDFLAGS) \
+       $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
 +      $(PRIVATE_LDFLAGS) \
-       $(TARGET_FDO_LIB) \
-       $(TARGET_LIBGCC) \
-       $(TARGET_CRTEND_SO_O)
+       $(PRIVATE_TARGET_FDO_LIB) \
 -      $(PRIVATE_TARGET_LIBGCC)
++      $(PRIVATE_TARGET_LIBGCC) \
++      $(PRIVATE_TARGET_CRTEND_SO_O)
  endef
  
  define transform-o-to-executable-inner

diff --cc core/config.mk
Simple merge

diff --cc core/definitions.mk
Simple merge