i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m68k: make sure boot & kernel code can run on 020-060

Browse Source 
Change-Id: I5830085fcd6120600ff3be85a2fdd2602e1935fe
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2221
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
François Revol
2020-08-19 13:35:41 +00:00
committed by Alex von Gluck IV
parent ec5a799719
commit 5c9d51ef00
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+13 -2
View File
@@ -432,8 +432,8 @@ rule KernelArchitectureSetup architecture
case m68k : case m68k :
# We don't want to have to handle emulating missing FPU opcodes for # We don't want to have to handle emulating missing FPU opcodes for
# 040 and 060 in the kernel. # 040 and 060 in the kernel.
HAIKU_KERNEL_CCFLAGS += -mtune=68020-60 ; HAIKU_KERNEL_CCFLAGS += -m68020-60 ;
HAIKU_KERNEL_C++FLAGS += -mtune=68020-60 ; HAIKU_KERNEL_C++FLAGS += -m68020-60 ;
case riscv64 : case riscv64 :
# Kernel lives within any single 2 GiB address space. # Kernel lives within any single 2 GiB address space.
@@ -518,6 +518,17 @@ rule KernelArchitectureSetup architecture
HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -Wno-error=main -m32 ; HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -Wno-error=main -m32 ;
HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -Wno-error=main -m32 ; HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -Wno-error=main -m32 ;
} }
case *_m68k :
# TODO: make sure all m68k bootloaders are non-PIC
HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -Wno-error=main ;
HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fno-pic -Wno-error=main ;
switch $(cpu) {
case m68k :
# use only common instructions by default
HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -m68020-60 ;
HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -m68020-60 ;
# TODO: coldfire (FireBee)
}
case * : case * :
# all other bootloaders are non-PIC # all other bootloaders are non-PIC
HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -Wno-error=main ; HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -Wno-error=main ;