Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system/boot: Don't borrow libroot objects

Browse Source 
* kernel + bootloader get differing compiler flags
* Trying to reuse libroot objects makes what objects
  are being built with which flags slightly confusing.

Change-Id: Ic8ac7255db99d6825ca022afc3f4fd416c57c12d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4876
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Alexander von Gluck IV 2022-01-19 17:13:07 -06:00 committed by Alex von Gluck IV
parent c749333b59
commit 4ac99e3932
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/system/boot/arch/riscv64/Jamfile
View File

@ -8,11 +8,16 @@ SubDir HAIKU_TOP src system boot arch riscv64 ;
SubDirC++Flags $(defines) -fno-rtti ; SubDirC++Flags $(defines) -fno-rtti ;
} }
# Optimizations create infinite recursion otherwise.
SubDirCcFlags -fno-builtin ;
local kernelLibArchObjects = local librootArchSources =
<src!system!kernel!lib!arch!$(TARGET_ARCH)>byteorder.o byteorder.S
<src!system!kernel!lib!arch!$(TARGET_ARCH)>memcpy.o ;
<src!system!kernel!lib!arch!$(TARGET_ARCH)>memset.o
local librootGenericSources =
memcpy.c
memset.c
; ;
local kernelArchDriverSources = local kernelArchDriverSources =
@ -33,13 +38,21 @@ for platform in [ MultiBootSubDirSetup u-boot efi riscv ] {
BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] : BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
$(kernelArchDriverSources) $(kernelArchDriverSources)
$(kernelGenericDriverSources) $(kernelGenericDriverSources)
$(librootArchSources)
$(librootGenericSources)
arch_cpu.cpp arch_cpu.cpp
: # additional flags : # additional flags
: :
$(kernelArchObjects) $(kernelArchObjects)
$(kernelLibArchObjects)
; ;
SEARCH on [ FGristFiles $(librootArchSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot os arch riscv64 ] ;
SEARCH on [ FGristFiles $(librootGenericSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot posix string arch generic ] ;
SEARCH on [ FGristFiles $(kernelArchDriverSources) ] SEARCH on [ FGristFiles $(kernelArchDriverSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH_DIR) ] ;
SEARCH on [ FGristFiles $(kernelGenericDriverSources) ] SEARCH on [ FGristFiles $(kernelGenericDriverSources) ]