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

Commit e43c96c3 authored by Dehao Chen's avatar Dehao Chen Committed by Android (Google) Code Review
Browse files

Merge "Update the FDO support:" into lmp-dev

parents 4dfb5580 5f5c48f0

core/combo/TARGET_linux-arm.mk

+0 −5
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ $(combo_2nd_arch_prefix)TARGET_LIBGCC := $(shell $($(combo_2nd_arch_prefix)TARGE 
        $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-libgcc-file-name)

$(combo_2nd_arch_prefix)TARGET_LIBATOMIC := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) \

        $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libatomic.a)

target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \

        -print-file-name=libgcov.a)

endif



KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
@@ -209,7 +207,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -236,7 +233,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -263,7 +259,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	-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_FDO_LIB) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

	-Wl,--end-group \

core/combo/TARGET_linux-arm64.mk

+0 −3
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -201,7 +200,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -228,7 +226,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	-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_FDO_LIB) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

	-Wl,--end-group \

core/combo/TARGET_linux-mips.mk

+0 −5
Original line number Diff line number Diff line
@@ -156,8 +156,6 @@ LIBGCC_EH := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_pre 
ifneq ($(LIBGCC_EH),libgcc_eh.a)

  $(combo_2nd_arch_prefix)TARGET_LIBGCC += $(LIBGCC_EH)

endif

target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \

        --print-file-name=libgcov.a)

endif



KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
@@ -200,7 +198,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -227,7 +224,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -254,7 +250,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	-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_FDO_LIB) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

	-Wl,--end-group \

core/combo/TARGET_linux-mips64.mk

+0 −5
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ LIBGCC_EH := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgc 
ifneq ($(LIBGCC_EH),libgcc_eh.a)

  TARGET_LIBGCC += $(LIBGCC_EH)

endif

target_libgcov := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \

        --print-file-name=libgcov.a)

endif



KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
@@ -207,7 +205,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -234,7 +231,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
@@ -261,7 +257,6 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	-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_FDO_LIB) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

	-Wl,--end-group \

core/combo/TARGET_linux-x86.mk

+0 −5
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ $(combo_2nd_arch_prefix)TARGET_LIBGCC := \ 
	$(shell $($(combo_2nd_arch_prefix)TARGET_CC) -m32 -print-file-name=libgcc.a)

$(combo_2nd_arch_prefix)TARGET_LIBATOMIC := \

	$(shell $($(combo_2nd_arch_prefix)TARGET_CC) -m32 -print-file-name=libatomic.a)

target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \

	-print-file-name=libgcov.a)

endif



$(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
@@ -165,7 +163,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_LDFLAGS) \
@@ -192,7 +189,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	$(PRIVATE_TARGET_FDO_LIB) \

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

	-o $@ \

	$(PRIVATE_LDFLAGS) \
@@ -216,7 +212,6 @@ $(hide) $(PRIVATE_CXX) \ 
	-Wl,--no-whole-archive \

	-Wl,--start-group \

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

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

	-Wl,--end-group \