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

Commit 4a1addef authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs 

Merge commit '90b1d3dc' into gingerbread-plus-aosp

* commit '90b1d3dc':
  Keep the crt start/end var name of sh consistent with other archs
parents 90cf34c7 90b1d3dc

core/combo/TARGET_linux-sh.mk

+4 −4
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ TARGET_C_INCLUDES := \ 
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o

TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o

TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o

TARGET_SOBEGIN := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o

TARGET_SOEND := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o

TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o

TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o



TARGET_STRIP_MODULE:=true
@@ -119,7 +119,7 @@ $(TARGET_CXX) \ 
	-Wl,--gc-sections -Wl,-z,norelro \

	-Wl,-shared,-Bsymbolic \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_SOBEGIN) \

	$(PRIVATE_TARGET_CRTBEGIN_SO_O) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@@ -130,7 +130,7 @@ $(TARGET_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(subst -lrt,, $(subst -lpthread,,$(PRIVATE_LDLIBS))) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_SOEND)

	$(PRIVATE_TARGET_CRTEND_SO_O)

endef



define transform-o-to-executable-inner