Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584f5b7a authored by Jing Yu's avatar Jing Yu
Browse files

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 patch groups libgc.a, libc_nomalloc.a and libgcc.a together, which is
a minimal group to solve this problem.

Change-Id: I27ed78c495dc53c1db7b302da8704f5e478ad893
parent c06243d1

core/combo/TARGET_linux-arm.mk

+5 −1
Original line number Diff line number Diff line
@@ -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