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

Commit 7d5fe242 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am a05a04cc: Merge "Refactor transform-o-to-* definitions." 

* commit 'a05a04cc':
  Refactor transform-o-to-* definitions.
parents 11b4800b a05a04cc

core/combo/TARGET_linux-arm.mk

+1 −78
Original line number Original line Diff line number Diff line
@@ -191,81 +191,4 @@ $(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true 




$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm

$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm





$(combo_2nd_arch_prefix)TARGET_CUSTOM_LD_COMMAND := true

$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
 


define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner

$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define $(combo_2nd_arch_prefix)transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \

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

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-Wl,--gc-sections \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(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))) \

	$(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))

endef

core/combo/TARGET_linux-arm64.mk

+1 −78
Original line number Original line Diff line number Diff line
@@ -157,81 +157,4 @@ TARGET_STRIP_MODULE:=true 




TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm

TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm





TARGET_CUSTOM_LD_COMMAND := true

TARGET_LINKER := /system/bin/linker64
 


define transform-o-to-shared-lib-inner

$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \

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

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-Wl,--gc-sections \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(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))) \

	$(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))

endef

core/combo/TARGET_linux-mips.mk

+1 −78
Original line number Original line Diff line number Diff line
@@ -162,81 +162,4 @@ $(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true 




$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm

$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm





$(combo_2nd_arch_prefix)TARGET_CUSTOM_LD_COMMAND := true

$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
 


define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner

$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define $(combo_2nd_arch_prefix)transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \

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

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-Wl,--gc-sections \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(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))) \

	$(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))

endef

core/combo/TARGET_linux-mips64.mk

+1 −78
Original line number Original line Diff line number Diff line
@@ -166,81 +166,4 @@ TARGET_STRIP_MODULE:=true 




TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm

TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm





TARGET_CUSTOM_LD_COMMAND := true

TARGET_LINKER := /system/bin/linker64
 


define transform-o-to-shared-lib-inner

$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \

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

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-Wl,--gc-sections \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(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))) \

	$(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))

endef

core/combo/TARGET_linux-x86.mk

+1 −76
Original line number Original line Diff line number Diff line
@@ -145,79 +145,4 @@ $(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true 




$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm

$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm





$(combo_2nd_arch_prefix)TARGET_CUSTOM_LD_COMMAND := true

$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
 
define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner

$(hide) $(PRIVATE_CXX) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	 -nostdlib -Wl,-soname,$(notdir $@) \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define $(combo_2nd_arch_prefix)transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	-nostdlib -Bdynamic \

	-Wl,-z,nocopyreloc \

	-pie \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

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

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

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

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

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

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

endef



define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	-nostdlib -Bstatic \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

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

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

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

	-Wl,--no-whole-archive \

	-Wl,--start-group \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \

	$(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))

endef