Merge "Group needed libraries together to solve the cyclic dependence between libc, libc_nomalloc and libgcc. When building with upcoming arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a and defined by libc.a or libc_nomalloc.a.which."

This commit is contained in:
Jing Yu 2010-07-28 14:47:15 -07:00 committed by Android (Google) Code Review
commit 8e06aa9bd6
1 changed files with 5 additions and 1 deletions

View File

@ -278,8 +278,12 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \
$(TARGET_GLOBAL_LDFLAGS) \
$(PRIVATE_LDFLAGS) \
$(PRIVATE_ALL_OBJECTS) \
$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
$(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \
-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))) \
$(TARGET_FDO_LIB) \
$(TARGET_LIBGCC) \
-Wl,--end-group \
$(TARGET_CRTEND_O)
endef