added 2 changesets to branch 'refs/remotes/mmu_man-github/sam460ex' old head: 2441f3ed909b7c670beb461f400235fef2b332af new head: 6e809753b1678305bcdef617e820be6353791e0f overview: https://github.com/mmuman/haiku/compare/2441f3e...6e80975 ---------------------------------------------------------------------------- 80859e4: PPC: Comment out cpu-specific compile flags for Sam460ex Userland and even kernel shouldn't require this anyway, cpu-specific code can still be compiled with those flags separately. 6e80975: U-Boot: PPC: Include asm macros header Use the macros from the header instead of hardcoding. Add FUNCTION_END() call to help gdb. [ François Revol <revol@xxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 9 insertions(+), 7 deletions(-) build/jam/board/sam460ex/BoardSetup | 12 ++++++------ .../boot/platform/u-boot/arch/ppc/arch_start_kernel.S | 4 +++- ############################################################################ Commit: 80859e45b49c470b57723693ece6cc4a65cce901 Author: François Revol <revol@xxxxxxx> Date: Sat Mar 9 02:20:12 2013 UTC PPC: Comment out cpu-specific compile flags for Sam460ex Userland and even kernel shouldn't require this anyway, cpu-specific code can still be compiled with those flags separately. ---------------------------------------------------------------------------- diff --git a/build/jam/board/sam460ex/BoardSetup b/build/jam/board/sam460ex/BoardSetup index 1f0b336..1ab1d3e 100644 --- a/build/jam/board/sam460ex/BoardSetup +++ b/build/jam/board/sam460ex/BoardSetup @@ -30,10 +30,10 @@ HAIKU_BOARD_LOADER_STACK_BASE = 0x02000000 ; # gcc flags for the specific cpu # -HAIKU_KERNEL_PIC_CCFLAGS += -mcpu=440fp -mtune=440fp ; -HAIKU_KERNEL_PIC_C++FLAGS += -mcpu=440fp -mtune=440fp ; -HAIKU_KERNEL_CCFLAGS += -mcpu=440fp -mtune=440fp ; -HAIKU_KERNEL_C++FLAGS += -mcpu=440fp -mtune=440fp ; -HAIKU_CCFLAGS += -mcpu=440fp -mtune=440fp ; -HAIKU_C++FLAGS += -mcpu=440fp -mtune=440fp ; +#HAIKU_KERNEL_PIC_CCFLAGS += -mcpu=440fp -mtune=440fp ; +#HAIKU_KERNEL_PIC_C++FLAGS += -mcpu=440fp -mtune=440fp ; +#HAIKU_KERNEL_CCFLAGS += -mcpu=440fp -mtune=440fp ; +#HAIKU_KERNEL_C++FLAGS += -mcpu=440fp -mtune=440fp ; +#HAIKU_CCFLAGS += -mcpu=440fp -mtune=440fp ; +#HAIKU_C++FLAGS += -mcpu=440fp -mtune=440fp ; ############################################################################ Commit: 6e809753b1678305bcdef617e820be6353791e0f Author: François Revol <revol@xxxxxxx> Date: Sat Mar 9 02:22:41 2013 UTC U-Boot: PPC: Include asm macros header Use the macros from the header instead of hardcoding. Add FUNCTION_END() call to help gdb. ---------------------------------------------------------------------------- diff --git a/src/system/boot/platform/u-boot/arch/ppc/arch_start_kernel.S b/src/system/boot/platform/u-boot/arch/ppc/arch_start_kernel.S index 2156e1d..59d16fe 100644 --- a/src/system/boot/platform/u-boot/arch/ppc/arch_start_kernel.S +++ b/src/system/boot/platform/u-boot/arch/ppc/arch_start_kernel.S @@ -3,7 +3,8 @@ * All rights reserved. Distributed under the terms of the MIT License. */ -#define FUNCTION(x) .global x; .type x,@function; x +#include <asm_defs.h> + /* status_t arch_start_kernel(struct kernel_args *kernelArgs, addr_t kernelEntry, addr_t kernelStackTop); @@ -46,4 +47,5 @@ FUNCTION(arch_start_kernel): mtlr %r0 addi %r1, %r1, 32 blr +FUNCTION_END(arch_start_kernel)