Chameleon

Chameleon Commit Details

Date:2011-08-05 16:31:50 (8 years 18 days ago)
Author:Evan Lojewski
Commit:1282
Parents: 1281
Message:Enable arch specfic code in modules
Changes:
M/branches/xZenu/src/arch/i386/Make.rules
M/branches/xZenu/src/modules/MakeInc.dir
M/branches/xZenu/src/arch/armv5/Make.rules
M/branches/xZenu/src/modules/ModuleSystem/Makefile
M/branches/xZenu/src/arch/x86_64/Make.rules
M/branches/xZenu/src/arch/ppc/Make.rules
M/branches/xZenu/src/modules/ModuleSystem/linker.c

File differences

branches/xZenu/src/modules/MakeInc.dir
4444
4545
4646
47
48
4749
4850
4951
......
9294
9395
9496
95
96
97
98
9799
98100
99101
LIBSAIODIR = ../../libsaio
BOOT2DIR = ../../boot2
VPATH = ${ARCH}
MODULE_INCLUDES := $(foreach x,ModuleSystem $(MODULE_DEPENDENCIES),-I$(SRCROOT)/modules/$(x)/include/)
endif
dylib_LINKER: ${OBJROOT} $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h $(SYMROOT)/$(MODULE_NAME).${ARCH}.linker.dylib
dylib: ${OBJROOT} $(SYMROOT)/$(MODULE_NAME).${ARCH}.dylib
dylib_LINKER: ${OBJROOT} ${MODULE_OBJECTS} $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h $(SYMROOT)/$(MODULE_NAME).${ARCH}.linker.dylib
dylib: ${OBJROOT} ${MODULE_OBJECTS} $(SYMROOT)/$(MODULE_NAME).${ARCH}.dylib
branches/xZenu/src/modules/ModuleSystem/linker.c
154154
155155
156156
157
158157
159158
160159
/********************************************************************************/
/*dyld / Linker Interface*/
/********************************************************************************/
void dyld_stub_binder() __attribute__((alias("dyld_stub_binder")));
void dyld_stub_binder()
{
printf("ERROR: dyld_stub_binder was called, should have been take care of by the linker.\n");
branches/xZenu/src/modules/ModuleSystem/Makefile
88
99
1010
11
12
11
12
1313
1414
DIR = ModuleSystem
MODULE_OBJS = modules_support linker
#macho modules
MODULE_OBJS = linker
I386_OBJS = modules_support
include ../MakeInc.dir
branches/xZenu/src/arch/ppc/Make.rules
4141
4242
4343
44
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(PPC_OBJS)))
branches/xZenu/src/arch/i386/Make.rules
4141
4242
4343
44
44
45
ACTUAL_OBJECTS = $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))
MODULE_OBJECTS = $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS = $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(I386_OBJS)))
branches/xZenu/src/arch/armv5/Make.rules
4242
4343
4444
45
45
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(ARMV5_OBJS)))
branches/xZenu/src/arch/x86_64/Make.rules
3434
3535
3636
37
37
38
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(X86_64_OBJS)))

Archive Download the corresponding diff file

Revision: 1282