From da80a0500c33176998887bcae22828d9e997477f Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Mon, 2 Jul 2012 13:50:01 +0100 Subject: [PATCH] Preparation for merge of x86 and x86_64 kernel sources. 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. --- build/jam/BuildSetup | 11 ++++-- .../kernel/bluetooth/btCoreData/Jamfile | 2 +- src/add-ons/kernel/bluetooth/hci/Jamfile | 2 +- src/add-ons/kernel/busses/agp_gart/Jamfile | 2 +- src/add-ons/kernel/console/vga_text/Jamfile | 2 +- src/add-ons/kernel/file_cache/Jamfile | 2 +- src/system/boot/Jamfile | 4 +- src/system/boot/arch/arm/Jamfile | 6 +-- src/system/boot/arch/m68k/Jamfile | 10 ++--- src/system/boot/arch/mipsel/Jamfile | 4 +- src/system/boot/arch/ppc/Jamfile | 4 +- src/system/boot/arch/x86/Jamfile | 29 ++++++++------- src/system/boot/arch/x86_64/Jamfile | 37 ------------------- src/system/boot/loader/Jamfile | 17 ++------- src/system/boot/platform/cfe/arch/ppc/Jamfile | 4 +- .../platform/openfirmware/arch/ppc/Jamfile | 4 +- .../boot/platform/raspberrypi_arm/Jamfile | 2 +- src/system/boot/platform/u-boot/Jamfile | 4 +- .../boot/platform/u-boot/arch/arm/Jamfile | 6 +-- .../boot/platform/u-boot/arch/ppc/Jamfile | 6 +-- src/system/kernel/Jamfile | 4 +- src/system/kernel/arch/Jamfile | 2 +- src/system/kernel/arch/arm/Jamfile | 2 +- src/tests/servers/registrar/Jamfile | 2 +- src/tests/system/boot/loader/Jamfile | 2 +- .../system/kernel/disk_device_manager/Jamfile | 2 +- src/tests/system/kernel/scheduler/Jamfile | 2 +- src/tools/gensyscalls/Jamfile | 2 +- 28 files changed, 68 insertions(+), 108 deletions(-) delete mode 100644 src/system/boot/arch/x86_64/Jamfile diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 97856a8aec..1e924f0d75 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -193,7 +193,7 @@ switch $(HAIKU_DISTRO_COMPATIBILITY) { # analyze the gcc machine spec to determine HAIKU_CPU switch $(HAIKU_GCC_MACHINE) { case i?86-* : HAIKU_CPU = x86 ; - case x86_64-* : HAIKU_CPU = x86_64 ; + case x86_64-* : HAIKU_CPU = x86_64 ; case powerpc-* : HAIKU_CPU = ppc ; case m68k-* : HAIKU_CPU = m68k ; case mipsel-* : HAIKU_CPU = mipsel ; @@ -252,11 +252,15 @@ switch $(HAIKU_CPU) { } case x86_64 : { + # x86_64 completely shares the x86 bootloader. HAIKU_BOOT_PLATFORM = bios_ia32 ; HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB # offset in floppy image (>= sizeof(haiku_loader)) 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 if ! $(HAIKU_YASM) { 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_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; HAIKU_DEFINES += BOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ; +HAIKU_KERNEL_ARCH ?= $(HAIKU_ARCH) ; HAIKU_ATA_STACK ?= 1 ; # directories @@ -457,7 +462,7 @@ HAIKU_PRIVATE_SYSTEM_HEADERS = HAIKU_PRIVATE_KERNEL_HEADERS = [ PrivateHeaders $(DOT) kernel libroot shared kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ] - [ ArchHeaders $(HAIKU_ARCH) ] + [ ArchHeaders $(HAIKU_KERNEL_ARCH) ] [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) system kernel ] $(HAIKU_PRIVATE_SYSTEM_HEADERS) ; @@ -968,7 +973,7 @@ if $(TARGET_PLATFORM) != haiku { # specified TARGET_PLATFORM. local buildVars = - ARCH CPU GCC_VERSION + ARCH CPU GCC_VERSION KERNEL_ARCH AR CC C++ LD OBJCOPY RANLIB diff --git a/src/add-ons/kernel/bluetooth/btCoreData/Jamfile b/src/add-ons/kernel/bluetooth/btCoreData/Jamfile index c5ea92268b..a0f577eb33 100644 --- a/src/add-ons/kernel/bluetooth/btCoreData/Jamfile +++ b/src/add-ons/kernel/bluetooth/btCoreData/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel bluetooth btCoreData ; 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) ] ; # disable debug output, if debugging is disabled diff --git a/src/add-ons/kernel/bluetooth/hci/Jamfile b/src/add-ons/kernel/bluetooth/hci/Jamfile index 5cf637f091..4a3020cb20 100644 --- a/src/add-ons/kernel/bluetooth/hci/Jamfile +++ b/src/add-ons/kernel/bluetooth/hci/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel bluetooth hci ; UsePrivateKernelHeaders ; UsePrivateHeaders net bluetooth ; -UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; # disable debug output, if debugging is disabled diff --git a/src/add-ons/kernel/busses/agp_gart/Jamfile b/src/add-ons/kernel/busses/agp_gart/Jamfile index e7078ce150..c0177357ef 100644 --- a/src/add-ons/kernel/busses/agp_gart/Jamfile +++ b/src/add-ons/kernel/busses/agp_gart/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel busses agp_gart ; SetSubDirSupportedPlatformsBeOSCompatible ; 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 common ] ; UsePrivateHeaders drivers graphics kernel ; diff --git a/src/add-ons/kernel/console/vga_text/Jamfile b/src/add-ons/kernel/console/vga_text/Jamfile index 4e697e891a..8deb5694a4 100644 --- a/src/add-ons/kernel/console/vga_text/Jamfile +++ b/src/add-ons/kernel/console/vga_text/Jamfile @@ -1,6 +1,6 @@ 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) ] ; KernelAddon vga_text : diff --git a/src/add-ons/kernel/file_cache/Jamfile b/src/add-ons/kernel/file_cache/Jamfile index 02ccf99341..6d83c5a6d0 100644 --- a/src/add-ons/kernel/file_cache/Jamfile +++ b/src/add-ons/kernel/file_cache/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel file_cache ; UsePrivateKernelHeaders ; -UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; KernelAddon log : diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index 548883adb4..a5f5a6906e 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -43,7 +43,7 @@ AddResources haiku_loader : boot_loader.rdef ; BootLd boot_loader_$(TARGET_BOOT_PLATFORM) : boot_platform_$(TARGET_BOOT_PLATFORM).o - boot_arch_$(TARGET_ARCH).o + boot_arch_$(TARGET_KERNEL_ARCH).o boot_loader.a boot_net.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 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 platform ; diff --git a/src/system/boot/arch/arm/Jamfile b/src/system/boot/arch/arm/Jamfile index d035c41a1f..7460d4dd95 100644 --- a/src/system/boot/arch/arm/Jamfile +++ b/src/system/boot/arch/arm/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src system boot arch arm ; #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 ; @@ -22,7 +22,7 @@ local kernelLibArchObjects = memset.o ; -BootMergeObject boot_arch_$(TARGET_ARCH).o : +BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o : debug_uart_8250.cpp arch_uart_8250.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 ] - = [ 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 ] = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; diff --git a/src/system/boot/arch/m68k/Jamfile b/src/system/boot/arch/m68k/Jamfile index 349a350722..26e9d2ad52 100644 --- a/src/system/boot/arch/m68k/Jamfile +++ b/src/system/boot/arch/m68k/Jamfile @@ -13,7 +13,7 @@ local kernelLibArchObjects = memset.o ; -BootMergeObject boot_arch_$(TARGET_ARCH).o : +BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o : arch_elf.cpp $(librootArchObjects) : -fno-pic @@ -21,23 +21,23 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o : $(kernelLibArchObjects) ; -BootMergeObject boot_arch_$(TARGET_ARCH)_030.o : +BootMergeObject boot_arch_m68k_030.o : mmu_030.cpp : -fno-pic -Wno-unused -m68030 ; -BootMergeObject boot_arch_$(TARGET_ARCH)_040.o : +BootMergeObject boot_arch_m68k_040.o : mmu_040.cpp : -fno-pic -Wno-unused -m68040 ; -BootMergeObject boot_arch_$(TARGET_ARCH)_060.o : +BootMergeObject boot_arch_m68k_060.o : mmu_060.cpp : -fno-pic -Wno-unused -m68060 ; 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) ] = [ FDirName $(HAIKU_TOP) src system libroot posix string arch $(TARGET_ARCH) ] ; diff --git a/src/system/boot/arch/mipsel/Jamfile b/src/system/boot/arch/mipsel/Jamfile index 33f0198b1d..aafa31d30a 100644 --- a/src/system/boot/arch/mipsel/Jamfile +++ b/src/system/boot/arch/mipsel/Jamfile @@ -8,7 +8,7 @@ local kernelLibArchObjects = memset.o ; -BootMergeObject boot_arch_$(TARGET_ARCH).o : +BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o : arch_elf.cpp : # additional flags : @@ -17,5 +17,5 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o : ; 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) ] ; diff --git a/src/system/boot/arch/ppc/Jamfile b/src/system/boot/arch/ppc/Jamfile index 07ad229e62..ea1c5a600a 100644 --- a/src/system/boot/arch/ppc/Jamfile +++ b/src/system/boot/arch/ppc/Jamfile @@ -15,7 +15,7 @@ local kernelLibArchObjects = memset.o ; -BootMergeObject boot_arch_$(TARGET_ARCH).o : +BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o : debug_uart_8250.cpp arch_uart_8250.cpp arch_elf.cpp @@ -26,7 +26,7 @@ BootMergeObject boot_arch_$(TARGET_ARCH).o : ; 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 ] = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; diff --git a/src/system/boot/arch/x86/Jamfile b/src/system/boot/arch/x86/Jamfile index e7cff1e494..1ef6a979c5 100644 --- a/src/system/boot/arch/x86/Jamfile +++ b/src/system/boot/arch/x86/Jamfile @@ -2,33 +2,36 @@ SubDir HAIKU_TOP src system boot arch x86 ; DEFINES += _BOOT_MODE ; -local kernelArchSources = - arch_elf.cpp +local bootArchSources = + arch_elf64.cpp ; -local kernelArchObjects = - cpuid.o +local kernelArchSources = + arch_elf.cpp + cpuid.S ; local kernelLibArchSources = arch_string.S ; -local kernelLibArchObjects = - byteorder.o +local librootOsArchSources = + byteorder.S ; -BootMergeObject boot_arch_$(TARGET_ARCH).o : - arch_elf64.cpp +BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o : + $(bootArchSources) $(kernelArchSources) $(kernelLibArchSources) + $(librootOsArchSources) : # additional flags - : - $(kernelArchObjects) - $(kernelLibArchObjects) ; +SEARCH on [ FGristFiles $(bootArchSources) ] + = [ FDirName $(HAIKU_TOP) src system boot arch x86 ] ; 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) ] - = [ 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 ] ; diff --git a/src/system/boot/arch/x86_64/Jamfile b/src/system/boot/arch/x86_64/Jamfile deleted file mode 100644 index f81c3f1b41..0000000000 --- a/src/system/boot/arch/x86_64/Jamfile +++ /dev/null @@ -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 ] ; diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile index f325c3279f..089f0dedea 100644 --- a/src/system/boot/loader/Jamfile +++ b/src/system/boot/loader/Jamfile @@ -12,7 +12,7 @@ UsePrivateHeaders shared storage ; { local defines = _BOOT_MODE - BOOT_ARCH=\\\"$(TARGET_ARCH)\\\" + BOOT_ARCH=\\\"$(TARGET_KERNEL_ARCH)\\\" KMESSAGE_CONTAINER_ONLY BOOT_SUPPORT_PARTITION_INTEL @@ -25,7 +25,7 @@ UsePrivateHeaders shared storage ; # Add architecture specific partition/file system modules - switch $(TARGET_ARCH) { + switch $(TARGET_KERNEL_ARCH) { case "ppc" : { defines += @@ -43,17 +43,6 @@ UsePrivateHeaders shared storage ; 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 ; } @@ -132,7 +121,7 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ] = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ; 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 ; diff --git a/src/system/boot/platform/cfe/arch/ppc/Jamfile b/src/system/boot/platform/cfe/arch/ppc/Jamfile index f7408331d2..5bace2e838 100644 --- a/src/system/boot/platform/cfe/arch/ppc/Jamfile +++ b/src/system/boot/platform/cfe/arch/ppc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform cfe arch ppc ; SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ; UsePrivateSystemHeaders ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; SubDirC++Flags -fno-rtti ; @@ -16,4 +16,4 @@ BootStaticLibrary boot_platform_cfe_ppc : ; 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) ] ; diff --git a/src/system/boot/platform/openfirmware/arch/ppc/Jamfile b/src/system/boot/platform/openfirmware/arch/ppc/Jamfile index a82fda7594..cb053f478f 100644 --- a/src/system/boot/platform/openfirmware/arch/ppc/Jamfile +++ b/src/system/boot/platform/openfirmware/arch/ppc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform openfirmware arch ppc ; SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ; UsePrivateSystemHeaders ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; SubDirC++Flags -fno-rtti ; @@ -16,4 +16,4 @@ BootStaticLibrary boot_platform_openfirmware_ppc : ; 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) ] ; diff --git a/src/system/boot/platform/raspberrypi_arm/Jamfile b/src/system/boot/platform/raspberrypi_arm/Jamfile index 9b4b72ef39..7e35fb96f8 100644 --- a/src/system/boot/platform/raspberrypi_arm/Jamfile +++ b/src/system/boot/platform/raspberrypi_arm/Jamfile @@ -7,7 +7,7 @@ UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics vesa ] ; 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 ; diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile index 7d9ba932f0..84d3abfbc3 100644 --- a/src/system/boot/platform/u-boot/Jamfile +++ b/src/system/boot/platform/u-boot/Jamfile @@ -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) src system boot arch $(TARGET_ARCH) ; +SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName graphics common ] ; @@ -12,7 +12,7 @@ UsePrivateHeaders [ FDirName kernel arch generic ] ; # 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 ; diff --git a/src/system/boot/platform/u-boot/arch/arm/Jamfile b/src/system/boot/platform/u-boot/arch/arm/Jamfile index fdfbaa96c0..cd48629133 100644 --- a/src/system/boot/platform/u-boot/arch/arm/Jamfile +++ b/src/system/boot/platform/u-boot/arch/arm/Jamfile @@ -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) ; UsePrivateSystemHeaders ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] [ 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 ; @@ -21,4 +21,4 @@ BootMergeObject boot_platform_u-boot_arm.o : ; #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) ] ; diff --git a/src/system/boot/platform/u-boot/arch/ppc/Jamfile b/src/system/boot/platform/u-boot/arch/ppc/Jamfile index 4694565b7e..c24f3f80f2 100644 --- a/src/system/boot/platform/u-boot/arch/ppc/Jamfile +++ b/src/system/boot/platform/u-boot/arch/ppc/Jamfile @@ -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) ; UsePrivateSystemHeaders ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] [ 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 ; @@ -21,4 +21,4 @@ BootMergeObject boot_platform_u-boot_ppc.o : ; 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) ] ; diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index 04b3719298..d40862b7e9 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -114,7 +114,7 @@ KernelLd kernel_$(TARGET_ARCH) : kernel_util.o kernel_vm.o - kernel_arch_$(TARGET_ARCH).o + kernel_arch_$(TARGET_KERNEL_ARCH).o kernel_platform_$(TARGET_BOOT_PLATFORM).o linkhack.so @@ -147,7 +147,7 @@ KernelLd kernel.so : kernel_util.o kernel_vm.o - kernel_arch_$(TARGET_ARCH).o + kernel_arch_$(TARGET_KERNEL_ARCH).o kernel_platform_$(TARGET_BOOT_PLATFORM).o linkhack.so diff --git a/src/system/kernel/arch/Jamfile b/src/system/kernel/arch/Jamfile index f93fb20fd0..9a7dbb5696 100644 --- a/src/system/kernel/arch/Jamfile +++ b/src/system/kernel/arch/Jamfile @@ -1,3 +1,3 @@ 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) ; diff --git a/src/system/kernel/arch/arm/Jamfile b/src/system/kernel/arch/arm/Jamfile index 13a56e44e6..f95ef0fe32 100644 --- a/src/system/kernel/arch/arm/Jamfile +++ b/src/system/kernel/arch/arm/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system kernel arch arm ; SubDirHdrs $(SUBDIR) $(DOTDOT) generic ; 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 ] ; diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile index 5a3cf21962..925515292e 100644 --- a/src/tests/servers/registrar/Jamfile +++ b/src/tests/servers/registrar/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src tests servers registrar ; UsePublicHeaders [ FDirName add-ons registrar ] ; -UseArchHeaders $(TARGET_ARCH) ; +UseArchHeaders $(TARGET_KERNEL_ARCH) ; # some test programs diff --git a/src/tests/system/boot/loader/Jamfile b/src/tests/system/boot/loader/Jamfile index 3378873b0d..aec23cc9e7 100644 --- a/src/tests/system/boot/loader/Jamfile +++ b/src/tests/system/boot/loader/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel util ] ; 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) src tests system boot loader ; SubDirHdrs $(HAIKU_TOP) src system boot loader ; diff --git a/src/tests/system/kernel/disk_device_manager/Jamfile b/src/tests/system/kernel/disk_device_manager/Jamfile index c25c21da12..e73a79f47f 100644 --- a/src/tests/system/kernel/disk_device_manager/Jamfile +++ b/src/tests/system/kernel/disk_device_manager/Jamfile @@ -10,7 +10,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ; UsePrivateHeaders shared ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; 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 ] ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/tests/system/kernel/scheduler/Jamfile b/src/tests/system/kernel/scheduler/Jamfile index c7c4dcf295..b90549924c 100644 --- a/src/tests/system/kernel/scheduler/Jamfile +++ b/src/tests/system/kernel/scheduler/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src tests system kernel scheduler ; #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel util ] ; UsePrivateHeaders kernel ; -UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; #UseHeaders [ FDirName $(HAIKU_TOP) src system kernel cache ] ; diff --git a/src/tools/gensyscalls/Jamfile b/src/tools/gensyscalls/Jamfile index 02dbeb495b..156b9d78e3 100644 --- a/src/tools/gensyscalls/Jamfile +++ b/src/tools/gensyscalls/Jamfile @@ -42,7 +42,7 @@ rule PreprocessSyscalls local headers = [ on $(1) return $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ] ; local sysHeaders = $(TARGET_PRIVATE_SYSTEM_HEADERS) - [ ArchHeaders $(TARGET_ARCH) ] + [ ArchHeaders $(TARGET_KERNEL_ARCH) ] [ on $(1) return $(SUBDIRSYSHDRS) $(SYSHDRS) ] $(HAIKU_HDRS) ;