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

Preparation for merge of x86 and x86_64 kernel sources.

Browse Source 
Since x86 and x86_64 share a lot of common code, x86_64 kernel sources/headers
are going to reside under headers/private/kernel/arch/x86 and
src/system/kernel/arch/x86 along with the existing x86 code. This commit
changes the build system to handle this. A new variable, TARGET_KERNEL_ARCH,
has been added. This is the name of the kernel/boot architecture directory
name, set to x86 on both x86 and x86_64. This is now used in all places where
TARGET_ARCH was used to get to kernel arch sources/headers (I've changed
everything necessary as far as I can tell). Kernel won't build for x86_64
at the moment as the sources have not been merged, loader does.
This commit is contained in:
Alex Smith
2012-07-02 14:07:49 +01:00
parent 4f78437c0d
commit da80a0500c
28 changed files with 68 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+7 -2
View File
@@ -252,11 +252,15 @@ switch $(HAIKU_CPU) {
} }
case x86_64 : case x86_64 :
{ {
# x86_64 completely shares the x86 bootloader.
HAIKU_BOOT_PLATFORM = bios_ia32 ; HAIKU_BOOT_PLATFORM = bios_ia32 ;
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader)) # offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
# x86_64 kernel source is under arch/x86.
HAIKU_KERNEL_ARCH = x86 ;
# yasm is required for target arch x86_64 # yasm is required for target arch x86_64
if ! $(HAIKU_YASM) { if ! $(HAIKU_YASM) {
Exit "HAIKU_YASM not set. Please re-run configure." ; Exit "HAIKU_YASM not set. Please re-run configure." ;
@@ -306,6 +310,7 @@ HAIKU_ARCH ?= $(HAIKU_CPU) ;
HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ; HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ;
HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ;
HAIKU_DEFINES += BOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ; HAIKU_DEFINES += BOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
HAIKU_KERNEL_ARCH ?= $(HAIKU_ARCH) ;
HAIKU_ATA_STACK ?= 1 ; HAIKU_ATA_STACK ?= 1 ;
# directories # directories
@@ -457,7 +462,7 @@ HAIKU_PRIVATE_SYSTEM_HEADERS =
HAIKU_PRIVATE_KERNEL_HEADERS = HAIKU_PRIVATE_KERNEL_HEADERS =
[ PrivateHeaders $(DOT) kernel libroot shared [ PrivateHeaders $(DOT) kernel libroot shared
kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ] kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ]
[ ArchHeaders $(HAIKU_ARCH) ] [ ArchHeaders $(HAIKU_KERNEL_ARCH) ]
[ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) system kernel ] [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) system kernel ]
$(HAIKU_PRIVATE_SYSTEM_HEADERS) $(HAIKU_PRIVATE_SYSTEM_HEADERS)
; ;
@@ -968,7 +973,7 @@ if $(TARGET_PLATFORM) != haiku {
# specified TARGET_PLATFORM. # specified TARGET_PLATFORM.
local buildVars = local buildVars =
ARCH CPU GCC_VERSION ARCH CPU GCC_VERSION KERNEL_ARCH
AR CC C++ LD OBJCOPY RANLIB AR CC C++ LD OBJCOPY RANLIB
src/add-ons/kernel/bluetooth/btCoreData/Jamfile
+1 -1
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel bluetooth btCoreData ; SubDir HAIKU_TOP src add-ons kernel bluetooth btCoreData ;
UsePrivateHeaders kernel net bluetooth ; UsePrivateHeaders kernel net bluetooth ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
# disable debug output, if debugging is disabled # disable debug output, if debugging is disabled
src/add-ons/kernel/bluetooth/hci/Jamfile
+1 -1
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel bluetooth hci ;
UsePrivateKernelHeaders ; UsePrivateKernelHeaders ;
UsePrivateHeaders net bluetooth ; UsePrivateHeaders net bluetooth ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
# disable debug output, if debugging is disabled # disable debug output, if debugging is disabled
src/add-ons/kernel/busses/agp_gart/Jamfile
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel busses agp_gart ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
UsePrivateHeaders [ FDirName graphics intel_extreme ] ; UsePrivateHeaders [ FDirName graphics intel_extreme ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders drivers graphics kernel ; UsePrivateHeaders drivers graphics kernel ;
src/add-ons/kernel/console/vga_text/Jamfile
+1 -1
View File
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel console vga_text ; SubDir HAIKU_TOP src add-ons kernel console vga_text ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
KernelAddon vga_text : KernelAddon vga_text :
src/add-ons/kernel/file_cache/Jamfile
+1 -1
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel file_cache ; SubDir HAIKU_TOP src add-ons kernel file_cache ;
UsePrivateKernelHeaders ; UsePrivateKernelHeaders ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
KernelAddon log : KernelAddon log :
src/system/boot/Jamfile
+2 -2
View File
@@ -43,7 +43,7 @@ AddResources haiku_loader : boot_loader.rdef ;
BootLd boot_loader_$(TARGET_BOOT_PLATFORM) : BootLd boot_loader_$(TARGET_BOOT_PLATFORM) :
boot_platform_$(TARGET_BOOT_PLATFORM).o boot_platform_$(TARGET_BOOT_PLATFORM).o
boot_arch_$(TARGET_ARCH).o boot_arch_$(TARGET_KERNEL_ARCH).o
boot_loader.a boot_loader.a
boot_net.a boot_net.a
boot_partitions.a boot_partitions.a
@@ -109,6 +109,6 @@ BuildBiosLoader haiku_loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
# different target for PXE, to be build with TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku-loader # different target for PXE, to be build with TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku-loader
BuildBiosLoader pxehaiku-loader : boot_loader_$(TARGET_BOOT_PLATFORM) ; BuildBiosLoader pxehaiku-loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
SubInclude HAIKU_TOP src system boot arch $(TARGET_ARCH) ; SubInclude HAIKU_TOP src system boot arch $(TARGET_KERNEL_ARCH) ;
SubInclude HAIKU_TOP src system boot loader ; SubInclude HAIKU_TOP src system boot loader ;
SubInclude HAIKU_TOP src system boot platform ; SubInclude HAIKU_TOP src system boot platform ;
src/system/boot/arch/arm/Jamfile
+3 -3
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src system boot arch arm ; SubDir HAIKU_TOP src system boot arch arm ;
#XXX: should not be needed here #XXX: should not be needed here
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
{ {
local defines = _BOOT_MODE ; local defines = _BOOT_MODE ;
@@ -22,7 +22,7 @@ local kernelLibArchObjects =
<src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o <src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o
; ;
BootMergeObject boot_arch_$(TARGET_ARCH).o : BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
debug_uart_8250.cpp debug_uart_8250.cpp
arch_uart_8250.cpp arch_uart_8250.cpp
arch_uart_pl011.cpp arch_uart_pl011.cpp
@@ -38,7 +38,7 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o :
; ;
SEARCH on [ FGristFiles arch_elf.cpp uart.cpp arch_uart_8250.cpp arch_uart_pl011.cpp ] SEARCH on [ FGristFiles arch_elf.cpp uart.cpp arch_uart_8250.cpp arch_uart_pl011.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
SEARCH on [ FGristFiles debug_uart_8250.cpp ] SEARCH on [ FGristFiles debug_uart_8250.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ;
src/system/boot/arch/m68k/Jamfile
+5 -5
View File
@@ -13,7 +13,7 @@ local kernelLibArchObjects =
<src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o <src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o
; ;
BootMergeObject boot_arch_$(TARGET_ARCH).o : BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
arch_elf.cpp arch_elf.cpp
$(librootArchObjects) $(librootArchObjects)
: -fno-pic : -fno-pic
@@ -21,23 +21,23 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o :
$(kernelLibArchObjects) $(kernelLibArchObjects)
; ;
BootMergeObject boot_arch_$(TARGET_ARCH)_030.o : BootMergeObject boot_arch_m68k_030.o :
mmu_030.cpp mmu_030.cpp
: -fno-pic -Wno-unused -m68030 : -fno-pic -Wno-unused -m68030
; ;
BootMergeObject boot_arch_$(TARGET_ARCH)_040.o : BootMergeObject boot_arch_m68k_040.o :
mmu_040.cpp mmu_040.cpp
: -fno-pic -Wno-unused -m68040 : -fno-pic -Wno-unused -m68040
; ;
BootMergeObject boot_arch_$(TARGET_ARCH)_060.o : BootMergeObject boot_arch_m68k_060.o :
mmu_060.cpp mmu_060.cpp
: -fno-pic -Wno-unused -m68060 : -fno-pic -Wno-unused -m68060
; ;
SEARCH on [ FGristFiles arch_elf.cpp ] SEARCH on [ FGristFiles arch_elf.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
SEARCH on [ FGristFiles $(librootArchObjects) ] SEARCH on [ FGristFiles $(librootArchObjects) ]
= [ FDirName $(HAIKU_TOP) src system libroot posix string arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system libroot posix string arch $(TARGET_ARCH) ] ;
src/system/boot/arch/mipsel/Jamfile
+2 -2
View File
@@ -8,7 +8,7 @@ local kernelLibArchObjects =
<src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o <src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o
; ;
BootMergeObject boot_arch_$(TARGET_ARCH).o : BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
arch_elf.cpp arch_elf.cpp
: # additional flags : # additional flags
: :
@@ -17,5 +17,5 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o :
; ;
SEARCH on [ FGristFiles arch_elf.cpp ] SEARCH on [ FGristFiles arch_elf.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
src/system/boot/arch/ppc/Jamfile
+2 -2
View File
@@ -15,7 +15,7 @@ local kernelLibArchObjects =
<src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o <src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o
; ;
BootMergeObject boot_arch_$(TARGET_ARCH).o : BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
debug_uart_8250.cpp debug_uart_8250.cpp
arch_uart_8250.cpp arch_uart_8250.cpp
arch_elf.cpp arch_elf.cpp
@@ -26,7 +26,7 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o :
; ;
SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp ] SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
SEARCH on [ FGristFiles debug_uart_8250.cpp ] SEARCH on [ FGristFiles debug_uart_8250.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ;
src/system/boot/arch/x86/Jamfile
+16 -13
View File
@@ -2,33 +2,36 @@ SubDir HAIKU_TOP src system boot arch x86 ;
DEFINES += _BOOT_MODE ; DEFINES += _BOOT_MODE ;
local kernelArchSources = local bootArchSources =
arch_elf.cpp arch_elf64.cpp
; ;
local kernelArchObjects = local kernelArchSources =
<src!system!kernel!arch!$(TARGET_ARCH)>cpuid.o arch_elf.cpp
cpuid.S
; ;
local kernelLibArchSources = local kernelLibArchSources =
arch_string.S arch_string.S
; ;
local kernelLibArchObjects = local librootOsArchSources =
<src!system!kernel!lib!arch!$(TARGET_ARCH)>byteorder.o byteorder.S
; ;
BootMergeObject boot_arch_$(TARGET_ARCH).o : BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
arch_elf64.cpp $(bootArchSources)
$(kernelArchSources) $(kernelArchSources)
$(kernelLibArchSources) $(kernelLibArchSources)
$(librootOsArchSources)
: # additional flags : # additional flags
:
$(kernelArchObjects)
$(kernelLibArchObjects)
; ;
SEARCH on [ FGristFiles $(bootArchSources) ]
= [ FDirName $(HAIKU_TOP) src system boot arch x86 ] ;
SEARCH on [ FGristFiles $(kernelArchSources) ] SEARCH on [ FGristFiles $(kernelArchSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch x86 ] ;
SEARCH on [ FGristFiles $(kernelLibArchSources) ] SEARCH on [ FGristFiles $(kernelLibArchSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel lib arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel lib arch x86 ] ;
SEARCH on [ FGristFiles $(librootOsArchSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot os arch x86 ] ;
src/system/boot/arch/x86_64/Jamfile
-37
View File
@@ -1,37 +0,0 @@
SubDir HAIKU_TOP src system boot arch x86_64 ;
DEFINES += _BOOT_MODE ;
local bootArchSources =
arch_elf64.cpp
;
local kernelArchSources =
arch_elf.cpp
cpuid.S
;
local kernelLibArchSources =
arch_string.S
;
local librootOsArchSources =
byteorder.S
;
BootMergeObject boot_arch_$(TARGET_ARCH).o :
$(bootArchSources)
$(kernelArchSources)
$(kernelLibArchSources)
$(librootOsArchSources)
: # additional flags
;
SEARCH on [ FGristFiles $(bootArchSources) ]
= [ FDirName $(HAIKU_TOP) src system boot arch x86 ] ;
SEARCH on [ FGristFiles $(kernelArchSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch x86 ] ;
SEARCH on [ FGristFiles $(kernelLibArchSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel lib arch x86 ] ;
SEARCH on [ FGristFiles $(librootOsArchSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot os arch x86 ] ;
src/system/boot/loader/Jamfile
+3 -14
View File
@@ -12,7 +12,7 @@ UsePrivateHeaders shared storage ;
{ {
local defines = local defines =
_BOOT_MODE _BOOT_MODE
BOOT_ARCH=\\\"$(TARGET_ARCH)\\\" BOOT_ARCH=\\\"$(TARGET_KERNEL_ARCH)\\\"
KMESSAGE_CONTAINER_ONLY KMESSAGE_CONTAINER_ONLY
BOOT_SUPPORT_PARTITION_INTEL BOOT_SUPPORT_PARTITION_INTEL
@@ -25,7 +25,7 @@ UsePrivateHeaders shared storage ;
# Add architecture specific partition/file system modules # Add architecture specific partition/file system modules
switch $(TARGET_ARCH) { switch $(TARGET_KERNEL_ARCH) {
case "ppc" : case "ppc" :
{ {
defines += defines +=
@@ -43,17 +43,6 @@ UsePrivateHeaders shared storage ;
BOOT_SUPPORT_PARTITION_EFI BOOT_SUPPORT_PARTITION_EFI
#BOOT_SUPPORT_FILE_SYSTEM_FAT
;
}
case "x86_64" :
{
defines +=
ALTERNATE_BOOT_ARCH=\\\"x86\\\"
BOOT_SUPPORT_ELF64
BOOT_SUPPORT_PARTITION_EFI
#BOOT_SUPPORT_FILE_SYSTEM_FAT #BOOT_SUPPORT_FILE_SYSTEM_FAT
; ;
} }
@@ -132,7 +121,7 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ]
= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ; = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ;
SEARCH on [ FGristFiles stage2_crt0.S ] SEARCH on [ FGristFiles stage2_crt0.S ]
= [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ] ;
SubInclude HAIKU_TOP src system boot loader file_systems ; SubInclude HAIKU_TOP src system boot loader file_systems ;
src/system/boot/platform/cfe/arch/ppc/Jamfile
+2 -2
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform cfe arch ppc ;
SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
@@ -16,4 +16,4 @@ BootStaticLibrary boot_platform_cfe_ppc :
; ;
SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
src/system/boot/platform/openfirmware/arch/ppc/Jamfile
+2 -2
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform openfirmware arch ppc ;
SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
@@ -16,4 +16,4 @@ BootStaticLibrary boot_platform_openfirmware_ppc :
; ;
SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
src/system/boot/platform/raspberrypi_arm/Jamfile
+1 -1
View File
@@ -7,7 +7,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ; UsePrivateHeaders [ FDirName graphics vesa ] ;
UsePrivateHeaders [ FDirName storage ] ; UsePrivateHeaders [ FDirName storage ] ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
{ {
local defines = _BOOT_MODE ; local defines = _BOOT_MODE ;
src/system/boot/platform/u-boot/Jamfile
+2 -2
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform u-boot ;
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ; SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
@@ -12,7 +12,7 @@ UsePrivateHeaders [ FDirName kernel arch generic ] ;
# TODO: move this to arch/arm ! # TODO: move this to arch/arm !
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
{ {
local defines = _BOOT_MODE ; local defines = _BOOT_MODE ;
src/system/boot/platform/u-boot/arch/arm/Jamfile
+3 -3
View File
@@ -2,9 +2,9 @@ SubDir HAIKU_TOP src system boot platform u-boot arch arm ;
SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
@@ -21,4 +21,4 @@ BootMergeObject boot_platform_u-boot_arm.o :
; ;
#SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] #SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ]
# = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; # = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
src/system/boot/platform/u-boot/arch/ppc/Jamfile
+3 -3
View File
@@ -2,9 +2,9 @@ SubDir HAIKU_TOP src system boot platform u-boot arch ppc ;
SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
SubDirC++Flags -fno-rtti ; SubDirC++Flags -fno-rtti ;
@@ -21,4 +21,4 @@ BootMergeObject boot_platform_u-boot_ppc.o :
; ;
SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
src/system/kernel/Jamfile
+2 -2
View File
@@ -114,7 +114,7 @@ KernelLd kernel_$(TARGET_ARCH) :
kernel_util.o kernel_util.o
kernel_vm.o kernel_vm.o
kernel_arch_$(TARGET_ARCH).o kernel_arch_$(TARGET_KERNEL_ARCH).o
kernel_platform_$(TARGET_BOOT_PLATFORM).o kernel_platform_$(TARGET_BOOT_PLATFORM).o
linkhack.so linkhack.so
@@ -147,7 +147,7 @@ KernelLd kernel.so :
kernel_util.o kernel_util.o
kernel_vm.o kernel_vm.o
kernel_arch_$(TARGET_ARCH).o kernel_arch_$(TARGET_KERNEL_ARCH).o
kernel_platform_$(TARGET_BOOT_PLATFORM).o kernel_platform_$(TARGET_BOOT_PLATFORM).o
linkhack.so linkhack.so
src/system/kernel/arch/Jamfile
+1 -1
View File
@@ -1,3 +1,3 @@
SubDir HAIKU_TOP src system kernel arch ; SubDir HAIKU_TOP src system kernel arch ;
SubInclude HAIKU_TOP src system kernel arch $(TARGET_ARCH) ; SubInclude HAIKU_TOP src system kernel arch $(TARGET_KERNEL_ARCH) ;
src/system/kernel/arch/arm/Jamfile
+1 -1
View File
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system kernel arch arm ;
SubDirHdrs $(SUBDIR) $(DOTDOT) generic ; SubDirHdrs $(SUBDIR) $(DOTDOT) generic ;
UsePrivateKernelHeaders ; UsePrivateKernelHeaders ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) paging ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) paging ] ;
src/tests/servers/registrar/Jamfile
+1 -1
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src tests servers registrar ; SubDir HAIKU_TOP src tests servers registrar ;
UsePublicHeaders [ FDirName add-ons registrar ] ; UsePublicHeaders [ FDirName add-ons registrar ] ;
UseArchHeaders $(TARGET_ARCH) ; UseArchHeaders $(TARGET_KERNEL_ARCH) ;
# some test programs # some test programs
src/tests/system/boot/loader/Jamfile
+1 -1
View File
@@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;
UsePrivateHeaders kernel shared storage system ; UsePrivateHeaders kernel shared storage system ;
SubDirSysHdrs $(HAIKU_TOP) headers private kernel arch $(TARGET_ARCH) ; SubDirSysHdrs $(HAIKU_TOP) headers private kernel arch $(TARGET_KERNEL_ARCH) ;
SubDirSysHdrs $(HAIKU_TOP) headers private system arch $(TARGET_ARCH) ; SubDirSysHdrs $(HAIKU_TOP) headers private system arch $(TARGET_ARCH) ;
SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ; SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
SubDirHdrs $(HAIKU_TOP) src system boot loader ; SubDirHdrs $(HAIKU_TOP) src system boot loader ;
src/tests/system/kernel/disk_device_manager/Jamfile
+1 -1
View File
@@ -10,7 +10,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
UsePrivateHeaders [ FDirName kernel fs ] ; UsePrivateHeaders [ FDirName kernel fs ] ;
UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel ] ;
UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders [ FDirName kernel util ] ;
src/tests/system/kernel/scheduler/Jamfile
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src tests system kernel scheduler ;
#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel util ] ; #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel util ] ;
UsePrivateHeaders kernel ; UsePrivateHeaders kernel ;
UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
#UseHeaders [ FDirName $(HAIKU_TOP) src system kernel cache ] ; #UseHeaders [ FDirName $(HAIKU_TOP) src system kernel cache ] ;
src/tools/gensyscalls/Jamfile
+1 -1
View File
@@ -42,7 +42,7 @@ rule PreprocessSyscalls
local headers = [ on $(1) return $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ] ; local headers = [ on $(1) return $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ] ;
local sysHeaders = local sysHeaders =
$(TARGET_PRIVATE_SYSTEM_HEADERS) $(TARGET_PRIVATE_SYSTEM_HEADERS)
[ ArchHeaders $(TARGET_ARCH) ] [ ArchHeaders $(TARGET_KERNEL_ARCH) ]
[ on $(1) return $(SUBDIRSYSHDRS) $(SYSHDRS) ] [ on $(1) return $(SUBDIRSYSHDRS) $(SYSHDRS) ]
$(HAIKU_HDRS) ; $(HAIKU_HDRS) ;