Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 15:28:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ArchitectureRules: Cleanup and adjustments for Clang.

Browse Source 
* Clang -target *haiku* now properly sets -fPIC and -shared.

 * Clang now understands -fno-semantic-interposition.

 * Add necessary LINKFLAGS for the kernel to get only 2 LOAD segments.

 * Remove workaround to remove -fPIC from the BOOT flags now that
   we don't inject it.

It is now possible (with a few minor hacks) to build a full system
image with Clang + LLD. The BIOS loader crashes on startup however, but
using a GCC-built BIOS loader, the system can boot all the way to the
desktop.
This commit is contained in:
Augustin Cavalier 2024-08-24 12:38:04 -04:00
parent 77d89de0ad
commit 90b84ff209
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build/jam/ArchitectureRules
View File

@ -45,10 +45,6 @@ rule ArchitectureSetup architecture
case riscv64 : archFlags += -march=rv64gc ;
}
if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
# TODO: These should be included in Clang's compiler specs.
ccBaseFlags += -fPIC ;
HAIKU_LINKFLAGS_$(architecture) += -shared ;
# lld doesn't currently implement R_RISCV_ALIGN relaxation
if $(cpu) = riscv64 {
ccBaseFlags += -mno-relax ;
@ -353,12 +349,7 @@ rule KernelArchitectureSetup architecture
local ccBaseFlags = -finline -fno-builtin -Wno-main ;
if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) != 1 {
if $(HAIKU_CC_IS_CLANG_$(architecture)) != 1 {
# Clang does not yet understand this flag.
ccBaseFlags += -fno-semantic-interposition ;
}
ccBaseFlags += -ffreestanding ;
ccBaseFlags += -ffreestanding -fno-semantic-interposition ;
# Since GCC 13, autovectorization generates code which causes problems
# in various virtual machines (bare metal is apparently unaffected.)
@ -379,32 +370,18 @@ rule KernelArchitectureSetup architecture
HAIKU_KERNEL_PIC_LINKFLAGS = ;
HAIKU_KERNEL_ADDON_LINKFLAGS = ;
# Common boot-related cflags which apply to all loaders
if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
HAIKU_KERNEL_PIC_LINKFLAGS += -z noseparate-code -z norelro --no-rosegment ;
HAIKU_KERNEL_ADDON_LINKFLAGS += -z noseparate-code -z norelro -Wl,--no-rosegment ;
}
# Common boot-related flags which apply to all loaders.
HAIKU_BOOT_CCFLAGS = $(HAIKU_CCFLAGS_$(architecture)) $(ccBaseFlags) ;
HAIKU_BOOT_C++FLAGS = $(HAIKU_C++FLAGS_$(architecture)) $(c++BaseFlags) ;
HAIKU_BOOT_OPTIM = -Os ;
HAIKU_BOOT_LINKFLAGS = ;
HAIKU_BOOT_LDFLAGS = -Bstatic ;
# Remove -fPIC and other unwanted options from the BOOT flags (they are sometimes
# added to force PIC in general.)
local fixedBootCCFlags ;
local fixedBootC++Flags ;
for flag in $(HAIKU_BOOT_CCFLAGS) {
if $(flag) = "-fpic" || $(flag) = "-fPIC" {
continue ;
}
fixedBootCCFlags += $(flag) ;
}
for flag in $(HAIKU_BOOT_C++FLAGS) {
if $(flag) = "-fpic" || $(flag) = "-fPIC" {
continue ;
}
fixedBootC++Flags += $(flag) ;
}
HAIKU_BOOT_CCFLAGS = $(fixedBootCCFlags) ;
HAIKU_BOOT_C++FLAGS = $(fixedBootC++Flags) ;
# Any special kernel base addresses
if $(HAIKU_BOOT_LOADER_BASE) {
HAIKU_BOOT_LDFLAGS +=