Commit 53ab112a authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch to bring in the linker script fixes for older
toolchains.
parents 88603b6d be5f95c8

arch/powerpc/kernel/vmlinux.lds.S

+5 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define BSS_FIRST_SECTIONS *(.bss.prominit)

#define EMITS_PT_NOTE

#define RO_EXCEPTION_TABLE_ALIGN	0

#define RUNTIME_DISCARD_EXIT



#define SOFT_MASK_TABLE(align)						\

	. = ALIGN(align);						\
@@ -410,9 +411,12 @@ SECTIONS 
	DISCARDS

	/DISCARD/ : {

		*(*.EMB.apuinfo)

		*(.glink .iplt .plt .rela* .comment)

		*(.glink .iplt .plt)

		*(.gnu.version*)

		*(.gnu.attributes)

		*(.eh_frame)

#ifndef CONFIG_RELOCATABLE

		*(.rela*)

#endif

	}

}