From 6612f5e4cf8cafdb0597bbd6ff28945c0bf21a85 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 8 Nov 2002 22:06:28 +1100
Subject: [PATCH] ppc64: small fixes for updates in BK

---
 arch/ppc64/Makefile     | 2 +-
 include/asm-ppc64/elf.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index fec39790a667..c99f35340b93 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -16,9 +16,9 @@
 KERNELLOAD	=0xc000000000000000
 
 LDFLAGS		:= -m elf64ppc
-ARCHBLOBLFLAGS	:= -I binary -O elf64-powerpc -B powerpc
 LDFLAGS_vmlinux	= -Bstatic \
 		-e $(KERNELLOAD) -Ttext $(KERNELLOAD)
+LDFLAGS_BLOB	:= --format binary --oformat elf64-powerpc
 CFLAGS		:= $(CFLAGS) -msoft-float -pipe \
 		-Wno-uninitialized -mminimal-toc -mtraceback=full \
 		-finline-limit-2000 -mcpu=power4
diff --git a/include/asm-ppc64/elf.h b/include/asm-ppc64/elf.h
index 75d0775f3f8e..9ad9fd1eea7e 100644
--- a/include/asm-ppc64/elf.h
+++ b/include/asm-ppc64/elf.h
@@ -57,9 +57,9 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_ET_DYN_BASE         (0x08000000)
 
 /* Common routine for both 32-bit and 64-bit processes */
-#define ELF_CORE_COPY_REGS(gregs, regs) elf_core_copy_regs(gregs, regs);
+#define ELF_CORE_COPY_REGS(gregs, regs) ppc64_elf_core_copy_regs(gregs, regs);
 static inline void
-elf_core_copy_regs(elf_gregset_t dstRegs, struct pt_regs* srcRegs)
+ppc64_elf_core_copy_regs(elf_gregset_t dstRegs, struct pt_regs* srcRegs)
 {
 	int i;
 
-- 
2.39.5