hrev52191 adds 1 changeset to branch 'master'
old head: 572030aca6ccded110e8a95a6bc3a0c30e82e148
new head: a0f72928029460a1d655f8e91e912223561d4ada
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=a0f729280294+%5E572030aca6cc
----------------------------------------------------------------------------
a0f729280294: efi: no-red-zone and accumulate-outgoing-args only x86
Change-Id: Ic9d94298d21e55beb2829be8dbd09f4b3d5db99a
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52191
Commit: a0f72928029460a1d655f8e91e912223561d4ada
URL: https://git.haiku-os.org/haiku/commit/?id=a0f729280294
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Aug 8 15:10:37 2018 UTC
----------------------------------------------------------------------------
1 file changed, 16 insertions(+), 4 deletions(-)
build/jam/ArchitectureRules | 20 ++++++++++++++++----
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 4ff33d91f2..38ff33e53a 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -376,6 +376,12 @@ rule KernelArchitectureSetup architecture
HAIKU_KERNEL_CCFLAGS += -march=pentium ;
HAIKU_KERNEL_C++FLAGS += -march=pentium ;
+ # EFI Bootloader
+ if $(HAIKU_BOOT_PLATFORM) = efi {
+ HAIKU_BOOT_CCFLAGS += -mno-red-zone
-maccumulate-outgoing-args ;
+ HAIKU_BOOT_C++FLAGS += -mno-red-zone
-maccumulate-outgoing-args ;
+ }
+
case x86_64 :
# Kernel lives in the top 2GB of the address space, use
kernel code
# model.
@@ -396,6 +402,12 @@ rule KernelArchitectureSetup architecture
HAIKU_BOOT_C++FLAGS += -m32 -march=pentium ;
}
+ # EFI Bootloader
+ if $(HAIKU_BOOT_PLATFORM) = efi {
+ HAIKU_BOOT_CCFLAGS += -mno-red-zone
-maccumulate-outgoing-args ;
+ HAIKU_BOOT_C++FLAGS += -mno-red-zone
-maccumulate-outgoing-args ;
+ }
+
if x86 in $(HAIKU_ARCHS[2-]) || x86_gcc2 in
$(HAIKU_ARCHS[2-]) {
Echo "Enable kernel ia32 compatibility" ;
HAIKU_KERNEL_DEFINES += _COMPAT_MODE ;
@@ -404,10 +416,10 @@ rule KernelArchitectureSetup architecture
}
if $(HAIKU_BOOT_PLATFORM) = efi {
- HAIKU_BOOT_CCFLAGS += -fpic -fno-stack-protector -fPIC
-fshort-wchar -mno-red-zone
- -maccumulate-outgoing-args -Wno-error=unused-variable ;
- HAIKU_BOOT_C++FLAGS += -fpic -fno-stack-protector -fPIC
-fshort-wchar -mno-red-zone
- -maccumulate-outgoing-args -Wno-error=unused-variable ;
+ HAIKU_BOOT_CCFLAGS += -fpic -fno-stack-protector -fPIC
-fshort-wchar
+ -Wno-error=unused-variable ;
+ HAIKU_BOOT_C++FLAGS += -fpic -fno-stack-protector -fPIC
-fshort-wchar
+ -Wno-error=unused-variable ;
HAIKU_BOOT_LDFLAGS = -Bstatic -Bsymbolic -shared -nostdlib
-znocombreloc -nostartfiles -no-undefined ;
} else {
HAIKU_BOOT_CCFLAGS += -fno-pic ;
