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

Commit db16dd23 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV 

Instead, use the libgcc/libatomic/libgcov from the static libraries dir,
which is provided by Soong. Copy the libraries using the Soong script if
Soong is disabled - this can be removed once USE_SOONG is removed.

Change-Id: Iad2ad20ad5c3cfc48bf1e46e594a482609098d7a
parent 094caf99

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ endif 
ifeq ($(my_clang),true)

    my_coverage_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBPROFILE_RT)

else

    my_coverage_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCOV)

    my_coverage_lib := $(call intermediates-dir-for,STATIC_LIBRARIES,libgcov,,,$(LOCAL_2ND_ARCH_VAR_PREFIX))/libgcov.a

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_COVERAGE_LIB := $(my_coverage_lib)

core/combo/TARGET_linux-arm.mk

+0 −14
Original line number Diff line number Diff line
@@ -146,20 +146,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ 


libc_root := bionic/libc





## on some hosts, the target cross-compiler is not available so do not run this command

ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),)

# We compile with the global cflags to ensure that

# any flags which affect libgcc are correctly taken

# into account.

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

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

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

KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_$(combo_2nd_arch_prefix)ARCH)

core/combo/TARGET_linux-arm64.mk

+0 −7
Original line number Diff line number Diff line
@@ -126,13 +126,6 @@ TARGET_RELEASE_CFLAGS := \ 


libc_root := bionic/libc



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

	-print-libgcc-file-name)

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

	-print-file-name=libatomic.a)

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

	-print-file-name=libgcov.a)



KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)

core/combo/TARGET_linux-mips.mk

+0 −18
Original line number Diff line number Diff line
@@ -127,24 +127,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ 


libc_root := bionic/libc





## on some hosts, the target cross-compiler is not available so do not run this command

ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),)

# We compile with the global cflags to ensure that

# any flags which affect libgcc are correctly taken

# into account.

$(combo_2nd_arch_prefix)TARGET_LIBGCC := \

  $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc.a)

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

LIBGCC_EH := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc_eh.a)

ifneq ($(LIBGCC_EH),libgcc_eh.a)

  $(combo_2nd_arch_prefix)TARGET_LIBGCC += $(LIBGCC_EH)

endif

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

KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-mips # mips covers both mips and mips64.

core/combo/TARGET_linux-mips64.mk

+0 −18
Original line number Diff line number Diff line
@@ -133,24 +133,6 @@ TARGET_RELEASE_CFLAGS := \ 


libc_root := bionic/libc





## on some hosts, the target cross-compiler is not available so do not run this command

ifneq ($(wildcard $(TARGET_CC)),)

# We compile with the global cflags to ensure that

# any flags which affect libgcc are correctly taken

# into account.

TARGET_LIBGCC := \

  $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc.a)

TARGET_LIBATOMIC := \

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

LIBGCC_EH := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc_eh.a)

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

KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-mips