diff options
| author | Joel Stanley <[email protected]> | 2019-01-12 10:50:56 +1100 |
|---|---|---|
| committer | Michael Ellerman <[email protected]> | 2019-01-15 11:12:10 +1100 |
| commit | a652758ac1475f69d28d11b3528c4f489416c877 (patch) | |
| tree | 19dc7a29df4010453926b486877c60ce2f057446 | |
| parent | acef5e0165912c459a9ae98a25f0f87908ced0f9 (diff) | |
powerpc: Use ALIGN instead of BLOCK
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.
Suggested-by: George Rimar <[email protected]>
Signed-off-by: Joel Stanley <[email protected]>
Reviewed-by: Nick Desaulniers <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 4 |
1 files 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)); . = . ; |