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

Commit e223965f authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Enforce linker version-scripts are valid"

parents 7884a637 da9c00da

core/combo/HOST_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ $(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host 


# We expect SSE3 floating point math.

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -msse3 -mfpmath=sse -m32 -Wa,--noexecstack -march=prescott

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -m32 -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -m32 -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--no-undefined-version



ifneq ($(strip $(BUILD_HOST_static)),)

# Statically-linked binaries are desirable for sandboxed environment

core/combo/HOST_linux-x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ endef 
HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8



HOST_GLOBAL_CFLAGS += -m64 -Wa,--noexecstack

HOST_GLOBAL_LDFLAGS += -m64 -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now

HOST_GLOBAL_LDFLAGS += -m64 -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--no-undefined-version



ifneq ($(strip $(BUILD_HOST_static)),)

# Statically-linked binaries are desirable for sandboxed environment

core/combo/TARGET_linux-arm.mk

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \ 
			-Wl,--fatal-warnings \

			-Wl,--icf=safe \

			-Wl,--hash-style=gnu \

			-Wl,--no-undefined-version \

			$(arch_variant_ldflags)



$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -mthumb-interwork

core/combo/TARGET_linux-arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ TARGET_GLOBAL_LDFLAGS += \ 
			-Wl,-maarch64linux \

			-Wl,--hash-style=gnu \

			-Wl,--fix-cortex-a53-843419 \

			-Wl,--no-undefined-version \

			$(arch_variant_ldflags)



# Disable transitive dependency library symbol resolving.

core/combo/TARGET_linux-mips.mk

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \ 
			-Wl,--build-id=md5 \

			-Wl,--warn-shared-textrel \

			-Wl,--fatal-warnings \

			-Wl,--no-undefined-version \

			$(arch_variant_ldflags)



# Disable transitive dependency library symbol resolving.