From 4303e367b27c7e3120ad6d31e62e49990df2311f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 28 Oct 2004 16:03:12 +0000 Subject: [PATCH] Now we need to explicitly disable RTTI in the boot loader, since it is generally enabled in the kernel. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9565 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/loader/Jamfile | 2 +- src/kernel/boot/loader/file_systems/amiga_ffs/Jamfile | 2 ++ src/kernel/boot/loader/file_systems/bfs/Jamfile | 2 ++ src/kernel/boot/platform/bios_ia32/Jamfile | 2 ++ src/kernel/boot/platform/openfirmware/Jamfile | 2 ++ src/kernel/boot/platform/openfirmware/arch/ppc/Jamfile | 2 ++ 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/kernel/boot/loader/Jamfile b/src/kernel/boot/loader/Jamfile index 32c930f120..55ae686087 100644 --- a/src/kernel/boot/loader/Jamfile +++ b/src/kernel/boot/loader/Jamfile @@ -22,7 +22,7 @@ UsePrivateHeaders [ FDirName storage ] ; defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) -Wall -Wno-multichar ; - SubDirC++Flags $(defines) -Wall -Wno-multichar ; + SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ; } KernelStaticLibrary boot_loader : diff --git a/src/kernel/boot/loader/file_systems/amiga_ffs/Jamfile b/src/kernel/boot/loader/file_systems/amiga_ffs/Jamfile index 56cde20219..9219657e85 100644 --- a/src/kernel/boot/loader/file_systems/amiga_ffs/Jamfile +++ b/src/kernel/boot/loader/file_systems/amiga_ffs/Jamfile @@ -6,6 +6,8 @@ UsePrivateHeaders [ FDirName storage ] ; #SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems amiga_ffs ; +SubDirC++Flags -fno-rtti ; + KernelStaticLibrary boot_amiga_ffs : amiga_ffs.cpp Volume.cpp diff --git a/src/kernel/boot/loader/file_systems/bfs/Jamfile b/src/kernel/boot/loader/file_systems/bfs/Jamfile index 42b48eb13c..5754c51a3b 100644 --- a/src/kernel/boot/loader/file_systems/bfs/Jamfile +++ b/src/kernel/boot/loader/file_systems/bfs/Jamfile @@ -6,6 +6,8 @@ UsePrivateHeaders [ FDirName storage ] ; SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ; +SubDirC++Flags -fno-rtti ; + KernelStaticLibrary boot_bfs : bfs.cpp Directory.cpp diff --git a/src/kernel/boot/platform/bios_ia32/Jamfile b/src/kernel/boot/platform/bios_ia32/Jamfile index fdd528d6f1..9ace82e181 100644 --- a/src/kernel/boot/platform/bios_ia32/Jamfile +++ b/src/kernel/boot/platform/bios_ia32/Jamfile @@ -5,6 +5,8 @@ SubDirHdrs $(OBOS_TOP) headers private kernel boot platform $(OBOS_BOOT_PLATFORM UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName storage ] ; +SubDirC++Flags -fno-rtti ; + KernelMergeObject boot_platform_bios_ia32.o : <$(SOURCE_GRIST)>shell.S <$(SOURCE_GRIST)>start.c diff --git a/src/kernel/boot/platform/openfirmware/Jamfile b/src/kernel/boot/platform/openfirmware/Jamfile index f6d3b02554..a4521bbae7 100644 --- a/src/kernel/boot/platform/openfirmware/Jamfile +++ b/src/kernel/boot/platform/openfirmware/Jamfile @@ -1,5 +1,7 @@ SubDir OBOS_TOP src kernel boot platform openfirmware ; +SubDirC++Flags -fno-rtti ; + KernelMergeObject boot_platform_openfirmware.o : <$(SOURCE_GRIST)>start.c <$(SOURCE_GRIST)>openfirmware.c diff --git a/src/kernel/boot/platform/openfirmware/arch/ppc/Jamfile b/src/kernel/boot/platform/openfirmware/arch/ppc/Jamfile index 13bce5c677..c4e311209d 100644 --- a/src/kernel/boot/platform/openfirmware/arch/ppc/Jamfile +++ b/src/kernel/boot/platform/openfirmware/arch/ppc/Jamfile @@ -2,6 +2,8 @@ SubDir OBOS_TOP src kernel boot platform openfirmware arch ppc ; SubDirHdrs $(OBOS_TOP) src kernel boot platform $(OBOS_BOOT_PLATFORM) ; +SubDirC++Flags -fno-rtti ; + KernelStaticLibrary boot_platform_openfirmware_ppc : arch_mmu.cpp arch_cpu_asm.S