Patch by Jan Klötzke:
* Current linking scheme does not always export arch specific symbols from the kernel. Merging all compiled arch stuff into a single .o file (and linking that to the kernel) fixes it. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25679 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user