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

Commit ea871a06 authored by Ben Cheng's avatar Ben Cheng
Browse files

Link libgcc.a before shared libraries (especially libc.so). 

BUG: 8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
parent cdfb5bac

core/combo/TARGET_linux-arm.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -244,6 +244,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -258,10 +259,8 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-Wl,-dynamic-linker,/system/bin/linker \

	-Wl,-dynamic-linker,/system/bin/linker \

	-Wl,--gc-sections \

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	-Wl,-z,nocopyreloc \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	-Wl,--whole-archive \
@@ -270,6 +269,9 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_FDO_LIB) \