From 13480221336e68db760e7972172254eb6bbb9743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 24 May 2012 21:53:38 +0200 Subject: [PATCH] PPC: Move asm helpers to U-Boot arch Jamfile * the OpenFirmware arch/ppc/Jamfile already has it, so move it to avoid duplicated symbols. --- src/system/boot/arch/ppc/Jamfile | 3 +-- src/system/boot/platform/u-boot/arch/ppc/Jamfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/system/boot/arch/ppc/Jamfile b/src/system/boot/arch/ppc/Jamfile index 62c625ed71..c2b817b54c 100644 --- a/src/system/boot/arch/ppc/Jamfile +++ b/src/system/boot/arch/ppc/Jamfile @@ -19,14 +19,13 @@ KernelMergeObject boot_arch_$(TARGET_ARCH).o : debug_uart_8250.cpp arch_uart_8250.cpp arch_elf.cpp - arch_cpu_asm.S : # additional flags : $(kernelArchObjects) $(kernelLibArchObjects) ; -SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp arch_cpu_asm.S ] +SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp ] = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; SEARCH on [ FGristFiles debug_uart_8250.cpp ] diff --git a/src/system/boot/platform/u-boot/arch/ppc/Jamfile b/src/system/boot/platform/u-boot/arch/ppc/Jamfile index 793ca7796f..c8c7e1b791 100644 --- a/src/system/boot/platform/u-boot/arch/ppc/Jamfile +++ b/src/system/boot/platform/u-boot/arch/ppc/Jamfile @@ -13,7 +13,7 @@ KernelMergeObject boot_platform_u-boot_ppc.o : shell.S #arch_mmu.cpp - #arch_cpu_asm.S + arch_cpu_asm.S arch_start_kernel.S arch_cpu.cpp #mmu.cpp