From 2f4c34887bce1f9ca4759c09070f34d15f9219e5 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 28 Dec 2018 22:58:28 +1030 Subject: [PATCH] powerpc: Use ALIGN instead of BLOCK To: linuxppc-dev@lists.ozlabs.org Cc: Segher Boessenkool , Alan Modra , Nick Desaulniers , Martell Malone In the ld documentation under Builtin Functions: BLOCK(exp) This is a synonym for ALIGN, for compatibility with older linker scripts. Clang's linker (lld) doesn't know about BLOCK so remove this use of it. Link: https://github.com/ClangBuiltLinux/linux/issues/253 Signed-off-by: Joel Stanley --- arch/powerpc/kernel/vmlinux.lds.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index ad1c77f71f54..3ae4c959f95b 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -86,11 +86,11 @@ SECTIONS #ifdef CONFIG_PPC64 /* - * BLOCK(0) overrides the default output section alignment because + * ALIGN(0) overrides the default output section alignment because * this needs to start right after .head.text in order for fixed * section placement to work. */ - .text BLOCK(0) : AT(ADDR(.text) - LOAD_OFFSET) { + .text ALIGN(0) : AT(ADDR(.text) - LOAD_OFFSET) { #ifdef CONFIG_LD_HEAD_STUB_CATCH KEEP(*(.linker_stub_catch)); . = . ; -- 2.19.1