resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp

Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f

diff --cc core/combo/TARGET_linux-arm.mk
index d9fbd2f,d159d94..9472306
--- 1/core/combo/TARGET_linux-arm.mk
--- 2/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@@ -261,8 -263,10 +261,9 @@@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstat
        -Wl,--start-group \
        $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
 -      $(PRIVATE_TARGET_FDO_LIB) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
+       $(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
        -Wl,--end-group \
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

diff --cc core/combo/TARGET_linux-arm64.mk
index 34eb274,9bd0b90..7c44366
--- 1/core/combo/TARGET_linux-arm64.mk
--- 2/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@@ -227,8 -229,10 +227,9 @@@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstat
        -Wl,--start-group \
        $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
 -      $(PRIVATE_TARGET_FDO_LIB) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
+       $(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
        -Wl,--end-group \
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

diff --cc core/combo/TARGET_linux-mips.mk
index 9abee7a,427fa66..5963727
--- 1/core/combo/TARGET_linux-mips.mk
--- 2/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@@ -233,8 -235,10 +233,9 @@@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstat
        -Wl,--start-group \
        $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
 -      $(PRIVATE_TARGET_FDO_LIB) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
+       $(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
        -Wl,--end-group \
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

diff --cc core/combo/TARGET_linux-mips64.mk
index 2b37606,db72d0f..aef6759
--- 1/core/combo/TARGET_linux-mips64.mk
--- 2/core/combo/TARGET_linux-mips64.mk
+++ b/core/combo/TARGET_linux-mips64.mk
@@@ -237,8 -239,10 +237,9 @@@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstat
        -Wl,--start-group \
        $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
 -      $(PRIVATE_TARGET_FDO_LIB) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
+       $(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
        -Wl,--end-group \
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

diff --cc core/combo/TARGET_linux-x86.mk
index c65df54,063f525..2c29815
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -210,9 -212,13 +210,12 @@@ $(hide) $(PRIVATE_CXX) 
        $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
        -Wl,--no-whole-archive \
        -Wl,--start-group \
-       $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
+       $(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
 -      $(PRIVATE_TARGET_FDO_LIB) \
        $(PRIVATE_TARGET_LIBATOMIC) \
+       $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
+       $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
+       $(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
        -Wl,--end-group \
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

diff --cc core/combo/TARGET_linux-x86_64.mk
index 556190e,a6fa795..b371fb1
--- 1/core/combo/TARGET_linux-x86_64.mk
--- 2/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@@ -211,12 -213,15 +211,14 @@@ $(hide) $(PRIVATE_CXX) 
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_ALL_OBJECTS) \
        -Wl,--whole-archive \
-       $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
+       $(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \
        -Wl,--no-whole-archive \
        -Wl,--start-group \
-       $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
+       $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
+       $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
 -      $(PRIVATE_TARGET_FDO_LIB) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
+       $(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
        -Wl,--end-group \
        $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \