From c4eec9f1e83039370316bce40ff4e0ce37e135c3 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 1 Oct 2021 16:26:45 -0400 Subject: [PATCH] Distinguish KERNEL_ARCH_DIR from KERNEL_ARCH. On x86_64, the KERNEL_ARCH should really be "x86_64", but it was "x86" as the architecture sources/headers directory is shared between 32 and 64 bit. Should not be a functional change on any platform outside x86_64. --- build/jam/ArchitectureRules | 5 +++-- build/jam/BuildSetup | 2 +- src/add-ons/kernel/bluetooth/btCoreData/Jamfile | 2 +- src/add-ons/kernel/bluetooth/hci/Jamfile | 2 +- src/add-ons/kernel/bus_managers/config_manager/Jamfile | 2 +- src/add-ons/kernel/bus_managers/isa/Jamfile | 2 +- src/add-ons/kernel/bus_managers/pci/Jamfile | 4 ++-- src/add-ons/kernel/busses/agp_gart/Jamfile | 4 ++-- src/add-ons/kernel/console/vga_text/Jamfile | 2 +- src/add-ons/kernel/cpu/Jamfile | 2 +- src/add-ons/kernel/debugger/disasm/Jamfile | 2 +- src/add-ons/kernel/debugger/disasm/x86/Jamfile | 2 +- src/add-ons/kernel/file_cache/Jamfile | 2 +- src/data/Jamfile | 2 +- src/system/boot/Jamfile | 6 +++--- src/system/boot/arch/arm/Jamfile | 4 ++-- src/system/boot/arch/ppc/Jamfile | 2 +- src/system/boot/arch/riscv64/Jamfile | 2 +- src/system/boot/arch/sparc/Jamfile | 2 +- src/system/boot/loader/Jamfile | 6 +++--- src/system/boot/platform/efi/Jamfile | 2 +- src/system/boot/platform/openfirmware/arch/ppc/Jamfile | 4 ++-- src/system/boot/platform/openfirmware/arch/sparc/Jamfile | 4 ++-- src/system/boot/platform/u-boot/Jamfile | 4 ++-- src/system/boot/platform/u-boot/arch/arm/Jamfile | 8 ++++---- src/system/boot/platform/u-boot/arch/ppc/Jamfile | 6 +++--- src/system/kernel/arch/Jamfile | 2 +- src/system/kernel/arch/x86/Jamfile | 2 +- src/system/kernel/lib/arch/x86_64/Jamfile | 2 +- src/tests/servers/registrar/Jamfile | 2 +- src/tests/system/boot/loader/Jamfile | 2 +- src/tests/system/kernel/disk_device_manager/Jamfile | 2 +- src/tests/system/kernel/scheduler/Jamfile | 2 +- 33 files changed, 50 insertions(+), 49 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index dde2df420b..aab38d5dd5 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -217,6 +217,7 @@ rule KernelArchitectureSetup architecture # packaging architecture (supplied for convenience). HAIKU_KERNEL_ARCH = $(HAIKU_ARCH) ; + HAIKU_KERNEL_ARCH_DIR = $(HAIKU_KERNEL_ARCH) ; local cpu = $(HAIKU_CPU_$(architecture)) ; @@ -295,7 +296,7 @@ rule KernelArchitectureSetup architecture HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB # x86_64 kernel source is under arch/x86. - HAIKU_KERNEL_ARCH = x86 ; + HAIKU_KERNEL_ARCH_DIR = x86 ; # nasm is required for target arch x86_64 if ! $(HAIKU_NASM) { @@ -333,7 +334,7 @@ rule KernelArchitectureSetup architecture HAIKU_PRIVATE_KERNEL_HEADERS = [ PrivateHeaders $(DOT) kernel libroot shared kernel/boot/platform/$(HAIKU_KERNEL_PLATFORM) ] - [ ArchHeaders $(HAIKU_KERNEL_ARCH) ] + [ ArchHeaders $(HAIKU_KERNEL_ARCH_DIR) ] [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR_$(architecture)) system kernel ] $(HAIKU_PRIVATE_SYSTEM_HEADERS_$(architecture)) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index c8b8c9d16a..db069edf36 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -565,7 +565,7 @@ if $(HAIKU_HOST_BUILD_ONLY) = 1 { # for all architectures (e.g. TARGET_DEFINES). local buildVars = - ARCH ARCHS KERNEL_ARCH PACKAGING_ARCH PACKAGING_ARCHS + ARCH ARCHS KERNEL_ARCH KERNEL_ARCH_DIR PACKAGING_ARCH PACKAGING_ARCHS DEFINES KERNEL_DEFINES diff --git a/src/add-ons/kernel/bluetooth/btCoreData/Jamfile b/src/add-ons/kernel/bluetooth/btCoreData/Jamfile index dade358f01..62c839977e 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_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; #UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_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 e34ca4fbb8..39d2721daf 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_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; #UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_PLATFORM) ] ; # disable debug output, if debugging is disabled diff --git a/src/add-ons/kernel/bus_managers/config_manager/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/Jamfile index e88370ef0b..dc747dd000 100644 --- a/src/add-ons/kernel/bus_managers/config_manager/Jamfile +++ b/src/add-ons/kernel/bus_managers/config_manager/Jamfile @@ -8,4 +8,4 @@ KernelAddon config_manager : ; SubInclude HAIKU_TOP src add-ons kernel bus_managers config_manager arch - $(TARGET_KERNEL_ARCH) ; + $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/add-ons/kernel/bus_managers/isa/Jamfile b/src/add-ons/kernel/bus_managers/isa/Jamfile index 77719db55a..ed179866c7 100644 --- a/src/add-ons/kernel/bus_managers/isa/Jamfile +++ b/src/add-ons/kernel/bus_managers/isa/Jamfile @@ -8,4 +8,4 @@ KernelAddon isa : ; SubInclude HAIKU_TOP src add-ons kernel bus_managers isa arch - $(TARGET_KERNEL_ARCH) ; + $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/add-ons/kernel/bus_managers/pci/Jamfile b/src/add-ons/kernel/bus_managers/pci/Jamfile index 2e3e1f4bf3..8694903957 100644 --- a/src/add-ons/kernel/bus_managers/pci/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers pci ; UsePrivateKernelHeaders ; UsePrivateHeaders shared ; UsePrivateHeaders [ FDirName kernel util ] ; -UseHeaders [ FDirName $(SUBDIR) arch $(TARGET_KERNEL_ARCH) ] ; +UseHeaders [ FDirName $(SUBDIR) arch $(TARGET_KERNEL_ARCH_DIR) ] ; KernelAddon pci : pci.cpp @@ -22,4 +22,4 @@ ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ] Includes [ FGristFiles pci_info.cpp ] : pcihdr.h ; SubInclude HAIKU_TOP src add-ons kernel bus_managers pci arch - $(TARGET_KERNEL_ARCH) ; + $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/add-ons/kernel/busses/agp_gart/Jamfile b/src/add-ons/kernel/busses/agp_gart/Jamfile index f4ddc81e6a..52c40cb4b3 100644 --- a/src/add-ons/kernel/busses/agp_gart/Jamfile +++ b/src/add-ons/kernel/busses/agp_gart/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel busses agp_gart ; SubDirC++Flags -fno-rtti ; -UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; UsePrivateHeaders [ FDirName graphics intel_extreme ] ; UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders drivers graphics kernel ; @@ -15,6 +15,6 @@ KernelAddon intel : ; SEARCH on [ FGristFiles - kernel_cpp.cpp + kernel_cpp.cpp ] = [ FDirName $(HAIKU_TOP) src system kernel util ] ; diff --git a/src/add-ons/kernel/console/vga_text/Jamfile b/src/add-ons/kernel/console/vga_text/Jamfile index 8deb5694a4..adfe49d292 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_KERNEL_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; KernelAddon vga_text : diff --git a/src/add-ons/kernel/cpu/Jamfile b/src/add-ons/kernel/cpu/Jamfile index 89decfdb70..2717b93c62 100644 --- a/src/add-ons/kernel/cpu/Jamfile +++ b/src/add-ons/kernel/cpu/Jamfile @@ -1,3 +1,3 @@ SubDir HAIKU_TOP src add-ons kernel cpu ; -SubInclude HAIKU_TOP src add-ons kernel cpu $(TARGET_KERNEL_ARCH) ; +SubInclude HAIKU_TOP src add-ons kernel cpu $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/add-ons/kernel/debugger/disasm/Jamfile b/src/add-ons/kernel/debugger/disasm/Jamfile index 408f61a510..0c1f3d20a2 100644 --- a/src/add-ons/kernel/debugger/disasm/Jamfile +++ b/src/add-ons/kernel/debugger/disasm/Jamfile @@ -7,4 +7,4 @@ KernelAddon disasm : : disasm_arch.a ; -SubInclude HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_KERNEL_ARCH) ; +SubInclude HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/add-ons/kernel/debugger/disasm/x86/Jamfile b/src/add-ons/kernel/debugger/disasm/x86/Jamfile index d1fa382ef8..925db8b073 100644 --- a/src/add-ons/kernel/debugger/disasm/x86/Jamfile +++ b/src/add-ons/kernel/debugger/disasm/x86/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_KERNEL_ARCH) ; +SubDir HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_KERNEL_ARCH_DIR) ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; UseHeaders [ LibraryHeaders udis86 ] ; diff --git a/src/add-ons/kernel/file_cache/Jamfile b/src/add-ons/kernel/file_cache/Jamfile index 7632f2cda1..94c10f2878 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_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; KernelAddon log : log.cpp diff --git a/src/data/Jamfile b/src/data/Jamfile index d54ec7d4a7..f6293263be 100644 --- a/src/data/Jamfile +++ b/src/data/Jamfile @@ -9,5 +9,5 @@ HaikuSubInclude settings ; # Known device trees if $(TARGET_ARCH) = "arm" { - HaikuSubInclude dts arch $(TARGET_KERNEL_ARCH) ; + HaikuSubInclude dts arch $(TARGET_KERNEL_ARCH_DIR) ; } diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index e60554f0d9..4bddd373b9 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -261,7 +261,7 @@ for platform in [ MultiBootSubDirSetup ] { x86_64 ] ; } else { SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot os arch - $(TARGET_KERNEL_ARCH) ] ; + $(TARGET_KERNEL_ARCH_DIR) ] ; } SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot posix string ] ; @@ -299,7 +299,7 @@ for platform in [ MultiBootSubDirSetup ] { AddResources haiku_loader.$(TARGET_BOOT_PLATFORM) : boot_loader.rdef ; - local archGrist = [ FGrist src system boot arch $(TARGET_KERNEL_ARCH) $(platform:G=) ] ; + local archGrist = [ FGrist src system boot arch $(TARGET_KERNEL_ARCH_DIR) $(platform:G=) ] ; local archObject = boot_arch_$(TARGET_KERNEL_ARCH).o ; local ldflags = $(HAIKU_BOOT_LDFLAGS) $(HAIKU_BOOT_$(platform:G=:U)_LDFLAGS) ; ldflags ?= $(TARGET_BOOT_LDFLAGS) ; @@ -400,6 +400,6 @@ for platform in [ MultiBootSubDirSetup ] { } } -SubInclude HAIKU_TOP src system boot arch $(TARGET_KERNEL_ARCH) ; +SubInclude HAIKU_TOP src system boot arch $(TARGET_KERNEL_ARCH_DIR) ; 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 f8541e5b13..f7f4d3766a 100644 --- a/src/system/boot/arch/arm/Jamfile +++ b/src/system/boot/arch/arm/Jamfile @@ -55,10 +55,10 @@ for platform in [ MultiBootSubDirSetup u-boot efi ] { ; SEARCH on [ FGristFiles $(kernelGenericSources) ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH on [ FGristFiles $(kernelArchSources) ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH on [ FGristFiles $(kernelGenericDriverSources) ] = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; diff --git a/src/system/boot/arch/ppc/Jamfile b/src/system/boot/arch/ppc/Jamfile index 44f81cb40b..498bb2300f 100644 --- a/src/system/boot/arch/ppc/Jamfile +++ b/src/system/boot/arch/ppc/Jamfile @@ -26,7 +26,7 @@ for platform in [ MultiBootSubDirSetup openfirmware ] { ; SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH on [ FGristFiles $(kernelGenericDriverSources) ] = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; diff --git a/src/system/boot/arch/riscv64/Jamfile b/src/system/boot/arch/riscv64/Jamfile index 313ed2b57e..7c9ce7ecb1 100644 --- a/src/system/boot/arch/riscv64/Jamfile +++ b/src/system/boot/arch/riscv64/Jamfile @@ -42,7 +42,7 @@ for platform in [ MultiBootSubDirSetup u-boot efi riscv ] { ; SEARCH on [ FGristFiles $(kernelArchDriverSources) ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH on [ FGristFiles $(kernelGenericDriverSources) ] = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; SEARCH on [ FGristFiles $(kernelDebugSources) ] diff --git a/src/system/boot/arch/sparc/Jamfile b/src/system/boot/arch/sparc/Jamfile index c423d14463..68b9de3e83 100644 --- a/src/system/boot/arch/sparc/Jamfile +++ b/src/system/boot/arch/sparc/Jamfile @@ -25,7 +25,7 @@ for platform in [ MultiBootSubDirSetup openfirmware ] { ; SEARCH on [ FGristFiles arch_elf.cpp arch_uart_8250.cpp ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH on [ FGristFiles $(kernelGenericDriverSources) ] = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile index b82a08e59d..7aa6a1f7ca 100644 --- a/src/system/boot/loader/Jamfile +++ b/src/system/boot/loader/Jamfile @@ -19,7 +19,7 @@ for platform in [ MultiBootSubDirSetup ] { DEFINES += _BOOT_MODE - BOOT_ARCH=\\\"$(TARGET_KERNEL_ARCH)\\\" + BOOT_ARCH=\\\"$(TARGET_KERNEL_ARCH_DIR)\\\" KMESSAGE_CONTAINER_ONLY BOOT_SUPPORT_PARTITION_INTEL @@ -39,7 +39,7 @@ for platform in [ MultiBootSubDirSetup ] { # Add architecture specific partition/file system modules - switch $(TARGET_KERNEL_ARCH) { + switch $(TARGET_KERNEL_ARCH_DIR) { case "ppc" : { DEFINES += @@ -172,7 +172,7 @@ for platform in [ MultiBootSubDirSetup ] { = [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ; SEARCH on [ FGristFiles stage2_crt0.S ] - = [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH on [ FGristFiles DataIO.cpp Referenceable.cpp ] = [ FDirName $(HAIKU_TOP) src kits support ] ; diff --git a/src/system/boot/platform/efi/Jamfile b/src/system/boot/platform/efi/Jamfile index 258784d0d3..f195556b89 100644 --- a/src/system/boot/platform/efi/Jamfile +++ b/src/system/boot/platform/efi/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src system boot platform efi ; UsePrivateHeaders [ FDirName kernel boot ] ; UsePrivateHeaders [ FDirName kernel platform ] ; UsePrivateHeaders [ FDirName kernel boot platform efi ] ; -UsePrivateHeaders [ FDirName kernel boot arch $(TARGET_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel boot arch $(TARGET_KERNEL_ARCH_DIR) ] ; if $(TARGET_ARCH) != x86_64 && $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != arm64 { UseLibraryHeaders [ FDirName libfdt ] ; diff --git a/src/system/boot/platform/openfirmware/arch/ppc/Jamfile b/src/system/boot/platform/openfirmware/arch/ppc/Jamfile index d0df294dce..514d3d49f5 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 openfirmware ; UsePrivateSystemHeaders ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] [ FDirName kernel boot platform $(HAIKU_KERNEL_PLATFORM) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; @@ -21,7 +21,7 @@ for platform in [ MultiBootSubDirSetup openfirmware ] { start.cpp ; SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; } } diff --git a/src/system/boot/platform/openfirmware/arch/sparc/Jamfile b/src/system/boot/platform/openfirmware/arch/sparc/Jamfile index 4b0d6c618e..cfba1f3a0f 100644 --- a/src/system/boot/platform/openfirmware/arch/sparc/Jamfile +++ b/src/system/boot/platform/openfirmware/arch/sparc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot platform openfirmware arch sparc ; SubDirHdrs $(HAIKU_TOP) src system boot platform openfirmware ; UsePrivateSystemHeaders ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] [ FDirName kernel boot platform $(HAIKU_KERNEL_PLATFORM) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; @@ -21,6 +21,6 @@ for platform in [ MultiBootSubDirSetup openfirmware ] { ; SEARCH on [ FGristFiles arch_cpu_asm.S arch_mmu.cpp ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; } } diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile index 587f274cb5..d0c3fdcb92 100644 --- a/src/system/boot/platform/u-boot/Jamfile +++ b/src/system/boot/platform/u-boot/Jamfile @@ -4,8 +4,8 @@ SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATF SubDirHdrs $(HAIKU_TOP) headers private kernel platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers fdt ; -SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH) ; -SubDirHdrs $(HAIKU_TOP) src system boot platform u-boot arch $(TARGET_KERNEL_ARCH) ; +SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH_DIR) ; +SubDirHdrs $(HAIKU_TOP) src system boot platform u-boot arch $(TARGET_KERNEL_ARCH_DIR) ; UseLibraryHeaders [ FDirName libfdt ] ; diff --git a/src/system/boot/platform/u-boot/arch/arm/Jamfile b/src/system/boot/platform/u-boot/arch/arm/Jamfile index cd25834de6..6ce1f5cef7 100644 --- a/src/system/boot/platform/u-boot/arch/arm/Jamfile +++ b/src/system/boot/platform/u-boot/arch/arm/Jamfile @@ -1,14 +1,14 @@ 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 arch $(TARGET_KERNEL_ARCH) ; +SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_KERNEL_ARCH_DIR) ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers fdt ; UseLibraryHeaders [ FDirName libfdt ] ; UsePrivateSystemHeaders ; UsePrivateHeaders kernel [ FDirName kernel platform u-boot ] ; -UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; SubDirC++Flags -fno-rtti ; @@ -43,6 +43,6 @@ BootMergeObject boot_platform_u-boot_arm.o : ; SEARCH on [ FGristFiles $(kernelArchDriverSources) ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; #SEARCH on [ FGristFiles arch_cpu_asm.S ] -# = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; +# = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; diff --git a/src/system/boot/platform/u-boot/arch/ppc/Jamfile b/src/system/boot/platform/u-boot/arch/ppc/Jamfile index 8c6361ef30..53f08caa55 100644 --- a/src/system/boot/platform/u-boot/arch/ppc/Jamfile +++ b/src/system/boot/platform/u-boot/arch/ppc/Jamfile @@ -2,10 +2,10 @@ 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_KERNEL_ARCH) ] +UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] [ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ; -UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) board $(TARGET_BOOT_BOARD) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) board $(TARGET_BOOT_BOARD) ] ; UseLibraryHeaders [ FDirName libfdt ] ; @@ -30,4 +30,4 @@ BootMergeObject boot_platform_u-boot_ppc.o : ; SEARCH on [ FGristFiles arch_cpu_asm.S ] - = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; + = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; diff --git a/src/system/kernel/arch/Jamfile b/src/system/kernel/arch/Jamfile index 9a7dbb5696..0bdb17a5dd 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_KERNEL_ARCH) ; +SubInclude HAIKU_TOP src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ; diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile index fee9cbdd4a..45ab1375d7 100644 --- a/src/system/kernel/arch/x86/Jamfile +++ b/src/system/kernel/arch/x86/Jamfile @@ -107,7 +107,7 @@ local archGenericSources = x86_pit.cpp ; -KernelMergeObject kernel_arch_x86.o : +KernelMergeObject kernel_arch_$(TARGET_KERNEL_ARCH).o : $(archSpecificSources) $(archGenericSources) : diff --git a/src/system/kernel/lib/arch/x86_64/Jamfile b/src/system/kernel/lib/arch/x86_64/Jamfile index 67a3890ac0..a4a8feedd5 100644 --- a/src/system/kernel/lib/arch/x86_64/Jamfile +++ b/src/system/kernel/lib/arch/x86_64/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system kernel lib arch x86_64 ; # find the generated asm_offsets.h SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) - system kernel arch $(TARGET_KERNEL_ARCH) ] ; + system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ; diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile index 3f639c0e2a..adb7d665af 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_KERNEL_ARCH) ; +UseArchHeaders $(TARGET_KERNEL_ARCH_DIR) ; # some test programs diff --git a/src/tests/system/boot/loader/Jamfile b/src/tests/system/boot/loader/Jamfile index 3c7fe666b3..9f27c8c5cf 100644 --- a/src/tests/system/boot/loader/Jamfile +++ b/src/tests/system/boot/loader/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src tests system boot loader ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateHeaders kernel shared storage system ; -SubDirSysHdrs $(HAIKU_TOP) headers private kernel arch $(TARGET_KERNEL_ARCH) ; +SubDirSysHdrs $(HAIKU_TOP) headers private kernel arch $(TARGET_KERNEL_ARCH_DIR) ; 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 c044313bad..4022b1a6dc 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_KERNEL_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; -UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; 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 4463003c4c..739b998c81 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_KERNEL_ARCH) ] ; +UsePrivateHeaders [ FDirName kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_KERNEL_PLATFORM) ] ; #UseHeaders [ FDirName $(HAIKU_TOP) src system kernel cache ] ;