Merge "build: disable RWX segment warnings for the EL3 payload"
diff --git a/el3_payload/Makefile b/el3_payload/Makefile
index 188731c..3ea39fb 100644
--- a/el3_payload/Makefile
+++ b/el3_payload/Makefile
@@ -4,6 +4,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+include ../make_helpers/build_macros.mk
+
 # Default number of threads per CPU on FVP
 FVP_MAX_PE_PER_CPU	:= 1
 
@@ -31,6 +33,8 @@
 ASFLAGS		:=	-nostdinc -ffreestanding -Wa,--fatal-warnings -Werror
 ASFLAGS		+=	-Iplat/${PLAT}/ -I.
 
+LDFLAGS		+=	$(call ld_option,--no-warn-rwx-segments)
+
 PLAT_BUILD_DIR	:=	build/${PLAT}
 SOURCES		:=	entrypoint.S spin.S uart.S plat/${PLAT}/platform.S
 OBJS		:=	$(patsubst %,$(PLAT_BUILD_DIR)/%,$(notdir $(SOURCES:.S=.o)))