Chameleon

Chameleon Commit Details

Date:2012-08-17 13:12:57 (6 years 3 months ago)
Author:armel cadet-petit
Commit:2046
Parents: 2045
Message:minor change made to MakeInc.dir
Changes:
A/branches/cparm/i386/boot2/fake_crt.c
M/branches/cparm/i386/boot2/Makefile
M/branches/cparm/i386/MakeInc.dir
M/branches/cparm/Chameleon.xcodeproj/project.pbxproj
M/branches/cparm/CHANGES

File differences

branches/cparm/Chameleon.xcodeproj/project.pbxproj
99
1010
1111
12
1213
1314
1415
......
917918
918919
919920
921
920922
921923
922924
/* Begin PBXFileReference section */
AB0E930C14C6223500F798D7 /* cpu_intel_amd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpu_intel_amd.c; sourceTree = "<group>"; };
AB22095D15334C9E00AA9851 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = "<group>"; };
AB3117CF15DBCBDE00DA0817 /* fake_crt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fake_crt.c; sourceTree = "<group>"; };
AB42D02115187F2C0078E84A /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = "<group>"; };
AB42D02215187F2C0078E84A /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = "<group>"; };
AB42D02315187F2C0078E84A /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = "<group>"; };
AB43B2D414C37E520018D529 /* options.c */,
AB43B2D514C37E520018D529 /* options.h */,
AB43B2D614C37E520018D529 /* prompt.c */,
AB3117CF15DBCBDE00DA0817 /* fake_crt.c */,
);
path = boot2;
sourceTree = "<group>";
branches/cparm/CHANGES
1
1
2
3
4
25
36
47
- Security fixes
- Added fake_crt.c to fix a linker issue ... but it still dont work.
- Added minor changes to makeinc.dir
- Security fixes
- Added beta support for Xcode 4.4
- Added memory info to the nvidia plist structure, so now one can add several cards to the plist and set a customized name and memory info for each cards
branches/cparm/i386/MakeInc.dir
1919
2020
2121
22
2223
2324
2425
......
3940
4041
4142
43
44
4245
4346
4447
......
5154
5255
5356
57
58
59
60
61
62
63
64
65
66
67
68
69
70
5471
5572
5673
# clearly handles it appropriately so I have no idea why Apple omitted it.
#OMIT_FRAME_POINTER_CFLAG=-fomit-frame-pointer
OMIT_FRAME_POINTER_CFLAG=
HAVE_MD = YES
installsrc:: $(SRCROOT)
cp $(ALLSRC) $(SRCROOT)
.SUFFIXES: .s .i .c .o
ifeq ($(HAVE_MD),YES)
.c.o .m.o:
$(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d
$(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
$(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d
$(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
else
.c.o .m.o:
$(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o
$(OBJROOT)/%.o: %.c
$(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o
$(OBJROOT)/%.o: %.m
$(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o
endif
# Use GCC or LLVM-GCC for assembly files
.s.o:
gcc $(CPPFLAGS) $(GFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $<
branches/cparm/i386/boot2/fake_crt.c
1
2
3
4
5
6
7
8
9
10
11
12
/*
* Copyright (c) 2012 cparm <armelcadetpetit@gmail.com>. All rights reserved.
*
*/
#include "libsa.h"
void start(void) asm("start");
void start(void)
{
}
branches/cparm/i386/boot2/Makefile
8686
8787
8888
89
89
9090
9191
9292
@echo "\t[LD] boot.sys"
@$(BINROOT)/ld_classic -static -segalign 20 -segaddr __INIT $(BOOT2ADDR) -preload \
-arch i386 \
-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) #-e boot2
-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) #-e start
@echo "\t[MACHOCONV] boot"
@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot #&> /dev/null

Archive Download the corresponding diff file

Revision: 2046