]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc: Use ALIGN instead of BLOCK
authorJoel Stanley <joel@jms.id.au>
Fri, 11 Jan 2019 23:50:56 +0000 (10:50 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 15 Jan 2019 00:12:10 +0000 (11:12 +1100)
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 <grimar@accesssoftek.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/vmlinux.lds.S

index ad1c77f71f5474e91219c36fa827b5079b60be62..3ae4c959f95b3e7b6b6739e1e7b82ab3e7fd6f9f 100644 (file)
@@ -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));
                . = . ;