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

Commit 5c2c70de authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Gerrit Code Review
Browse files

Merge "Add -latomic to all target builds"

parents 2a2ba735 4c952d72

core/combo/TARGET_linux-arm.mk

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),) 
# 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)

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

        -print-file-name=libgcov.a)

endif
@@ -240,6 +242,7 @@ $(hide) $(PRIVATE_CXX) \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -266,6 +269,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -288,6 +292,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	$(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 \

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

core/combo/TARGET_linux-arm64.mk

+5 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ libstdc++_root := bionic/libstdc++ 


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)



KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
@@ -178,6 +180,7 @@ $(hide) $(PRIVATE_CXX) \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -204,6 +207,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

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

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

core/combo/TARGET_linux-mips.mk

+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),) 
# 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)
@@ -231,6 +233,7 @@ $(hide) $(PRIVATE_CXX) \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -257,6 +260,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -279,6 +283,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	$(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 \

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

core/combo/TARGET_linux-mips64.mk

+5 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ ifneq ($(wildcard $(TARGET_CC)),) 
# 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)
@@ -240,6 +242,7 @@ $(hide) $(PRIVATE_CXX) \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -266,6 +269,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -288,6 +292,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	$(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 \

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

core/combo/TARGET_linux-x86.mk

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ $(combo_2nd_arch_prefix)TARGET_STRIP := $($(combo_2nd_arch_prefix)TARGET_TOOLS_P 
ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),)

$(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
@@ -195,6 +197,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -221,6 +224,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-o $@ \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

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

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

	$(PRIVATE_LDLIBS)
@@ -241,6 +245,7 @@ $(hide) $(PRIVATE_CXX) \ 
	-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 \

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