resolved conflicts for merge of 5c903372 to jb-mr1-dev

Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7

diff --cc core/combo/TARGET_linux-x86.mk
index 396bc3a,f12ad3e..1f6f96d
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -188,7 -185,7 +188,6 @@@ $(hide) $(PRIVATE_CXX) 
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
  endef
  
- # Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
 -
  define transform-o-to-executable-inner
  $(hide) $(PRIVATE_CXX) \
        $(TARGET_GLOBAL_LDFLAGS) \