Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c868b66 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64: Do not link crtsaveres.o in boot 



crtsaveres.S is empty with 64-bit builds already, so just don't
build and link it to match the vmlinux build.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
[mpe: Use CONFIG_PPC64_BOOT_WRAPPER not CONFIG_PPC32 to fix BE build]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent baa25b57

arch/powerpc/boot/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -95,13 +95,16 @@ libfdtheader := fdt.h libfdt.h libfdt_internal.h 
$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o): \

	$(addprefix $(obj)/,$(libfdtheader))



src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \

src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \

		$(libfdt) libfdt-wrapper.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		uartlite.c mpc52xx-psc.c opal.c

src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S

ifndef CONFIG_PPC64_BOOT_WRAPPER

src-wlib-y += crtsavres.S

endif

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

arch/powerpc/boot/crtsavres.S

+4 −4
Original line number Diff line number Diff line
@@ -37,12 +37,13 @@ 
 *    the executable file might be covered by the GNU General Public License.

 */



#ifdef __powerpc64__

#error "On PPC64, FPR save/restore functions are provided by the linker."

#endif



	.file	"crtsavres.S"

	.section ".text"



/* On PowerPC64 Linux, these functions are provided by the linker.  */

#ifndef __powerpc64__



#define _GLOBAL(name) \

	.type name,@function; \

	.globl name; \
@@ -230,4 +231,3 @@ _GLOBAL(_rest32gpr_31_x) 
	mtlr	0

	mr	1,11

	blr
 
#endif