Chameleon Commit Details - 1285 - Chameleon open source boot loader project.

Date:

2011-08-05 21:53:02 (12 years 8 months ago)

Author:

Evan Lojewski

Commit:

1285

Parents:

1284

Message:

Utils folder compiled with native toolchain.

Changes:

M	/branches/xZenu/src/util/dyldsymboltool.c
M	/branches/xZenu/Make.rules
M	/branches/xZenu/src/arch/i386/boot2/Makefile
M	/branches/xZenu/src/util/Makefile
M	/branches/xZenu/src/util/fdisk/Makefile

File differences

-26
27 27
28 28
29
29 30
31
30 32
31 33
32 34
+␉    -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
NATIVE_OBJECTS = $(addsuffix .o, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
␊
␊
$(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT):␊
␉@echo "\t[MKDIR] $@"␊
␉@$(MKDIRS) $@␊
 ␉    -MD -dependency-file $(OBJROOT)/$*.d␊
 ␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
 ␊
+NATIVE_OBJECTS = $(addsuffix .o, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
 ␊
+␊
 $(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT):␊
 ␉@echo "\t[MKDIR] $@"␊
 ␉@$(MKDIRS) $@␊

-19
20 20
21 21
22 
22
23 23
24 
24
25 25
26 
27 
28 
29 
30 26
31 27
32 28
+␊
all: $(SYMROOT) $(OBJROOT) $(PROGRAM)␊
␊
$(PROGRAM): $(ACTUAL_OBJECTS)␊
$(PROGRAM): $(NATIVE_OBJECTS)␊
␉@echo "\t[LD:${ARCH}] $(@F)"␊
␉@$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch ${ARCH} -o $(SYMROOT)/$(@F).${ARCH} $(ACTUAL_OBJECTS)␊
␉@$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) $(NATIVE_OBJECTS)␊
␊
␉@#echo "\t[LIPO] $(@F)"␊
␉@#lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)␊
␉@#$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).x86_64 $(SYMROOT)/$(@F).ppc␊
␊
else␊
all:␊
endif␊
 ␊
 all: $(SYMROOT) $(OBJROOT) $(PROGRAM)␊
 ␊
-$(PROGRAM): $(ACTUAL_OBJECTS)␊
+$(PROGRAM): $(NATIVE_OBJECTS)␊
 ␉@echo "\t[LD:${ARCH}] $(@F)"␊
-␉@$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch ${ARCH} -o $(SYMROOT)/$(@F).${ARCH} $(ACTUAL_OBJECTS)␊
+␉@$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) $(NATIVE_OBJECTS)␊
 ␊
-␉@#echo "\t[LIPO] $(@F)"␊
-␉@#lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)␊
-␉@#$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).x86_64 $(SYMROOT)/$(@F).ppc␊
-␊
 else␊
 all:␊
 endif␊

-154
155 155
156 156
157 
157
158 158
159 159
160 160
+␉␉␉␉␉, 1, outfile);␊
␉␊
␉char* symtab = malloc(dylib.symtab.stroff + dylib.symtab.strsize - sizeof(dylib) + 1); // Add extra 1 for last symbol␊
␉bzero(symtab, dylib.symtab.nsyms * sizeof(struct nlist) + dylib.symtab.strsize + 1);␊
␉memset(symtab, 0, dylib.symtab.nsyms * sizeof(struct nlist) + dylib.symtab.strsize + 1);␊
␉char* orig = symtab;␊
␉␊
␉//symtab += offset;␊
 ␉␉␉␉␉, 1, outfile);␊
 ␉␊
 ␉char* symtab = malloc(dylib.symtab.stroff + dylib.symtab.strsize - sizeof(dylib) + 1); // Add extra 1 for last symbol␊
-␉bzero(symtab, dylib.symtab.nsyms * sizeof(struct nlist) + dylib.symtab.strsize + 1);␊
+␉memset(symtab, 0, dylib.symtab.nsyms * sizeof(struct nlist) + dylib.symtab.strsize + 1);␊
 ␉char* orig = symtab;␊
 ␉␊
 ␉//symtab += offset;␊