From 2c8b410ad5b3ac5a413e741b972c147621b3d413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 28 May 2008 10:08:07 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20by=20Jan=20Kl=C3=B6tzke:=20*=20Current?= =?UTF-8?q?=20linking=20scheme=20does=20not=20always=20export=20arch=20spe?= =?UTF-8?q?cific=20symbols=20from=20the=20=20=20kernel.=20Merging=20all=20?= =?UTF-8?q?compiled=20arch=20stuff=20into=20a=20single=20.o=20file=20(and?= =?UTF-8?q?=20linking=20=20=20that=20to=20the=20kernel)=20fixes=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25679 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/Jamfile | 4 ++-- src/system/kernel/arch/m68k/Jamfile | 2 +- src/system/kernel/arch/ppc/Jamfile | 2 +- src/system/kernel/arch/x86/Jamfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index cc8a13cfc7..b51b335687 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -76,7 +76,7 @@ KernelLd kernel_$(TARGET_ARCH) : kernel_util.o kernel_vm.o - lib$(TARGET_ARCH).a + kernel_arch_$(TARGET_ARCH).o kernel_platform_$(TARGET_BOOT_PLATFORM).o linkhack.so @@ -109,7 +109,7 @@ KernelLd kernel.so : kernel_util.o kernel_vm.o - lib$(TARGET_ARCH).a + kernel_arch_$(TARGET_ARCH).o kernel_platform_$(TARGET_BOOT_PLATFORM).o linkhack.so diff --git a/src/system/kernel/arch/m68k/Jamfile b/src/system/kernel/arch/m68k/Jamfile index 15f6a62c8b..3ea9241052 100644 --- a/src/system/kernel/arch/m68k/Jamfile +++ b/src/system/kernel/arch/m68k/Jamfile @@ -23,7 +23,7 @@ KernelMergeObject arch_m68k_060.o : : $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -m68060 ; -KernelStaticLibrary libm68k : +KernelMergeObject kernel_arch_m68k.o : arch_atomic.c arch_cpu.cpp arch_cpu_asm.S diff --git a/src/system/kernel/arch/ppc/Jamfile b/src/system/kernel/arch/ppc/Jamfile index 2a461150c0..4b972da04d 100644 --- a/src/system/kernel/arch/ppc/Jamfile +++ b/src/system/kernel/arch/ppc/Jamfile @@ -5,7 +5,7 @@ UsePrivateKernelHeaders ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ; -KernelStaticLibrary libppc : +KernelMergeObject kernel_arch_ppc.o : arch_atomic.c arch_cpu.cpp arch_cpu_asm.S diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile index 04e80a955c..bc76e30b12 100644 --- a/src/system/kernel/arch/x86/Jamfile +++ b/src/system/kernel/arch/x86/Jamfile @@ -9,7 +9,7 @@ UsePrivateKernelHeaders ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ; -KernelStaticLibrary libx86 : +KernelMergeObject kernel_arch_x86.o : arch_commpage.cpp arch_cpu.c arch_debug.cpp