Chameleon

Chameleon Commit Details

Date:2011-08-03 03:38:48 (12 years 8 months ago)
Author:Evan Lojewski
Commit:1258
Parents: 1257
Message:Arch rules update
Changes:
M/branches/xZen/src/arch/x86_64/Make.rules
M/branches/xZen/src/arch/ppc/Make.rules
M/branches/xZen/src/Make.rules
M/branches/xZen/src/arch/i386/Make.rules
M/branches/xZen/src/arch/armv5/Make.rules

File differences

branches/xZen/src/Make.rules
11
22
33
4
4
55
66
77
-include $(SRCROOT)/auto.conf␊
␊
ifneq ($(ARCH),)␊
include ${SRCROOT}/${ARCH}/Make.rules␊
include ${SRCROOT}/arch/${ARCH}/Make.rules␊
endif␊
␊
#print transformed OBJECTS␊
branches/xZen/src/arch/ppc/Make.rules
1
2
1
2
33
44
55
......
1212
1313
1414
15
15
1616
17
17
1818
1919
2020
21
21
2222
23
23
2424
2525
2626
27
27
2828
29
29
3030
3131
3232
33
33
3434
35
35
3636
3737
3838
3939
40
41
40
41
PPC_AS = /usr/bin/as -arch ppc␊
PPC_LD = /usr/bin/ld -arch ppc␊
PPC_AS = /usr/bin/as -arch ${ARCH}␊
PPC_LD = /usr/bin/ld -arch ${ARCH}␊
PPC_CC = /usr/bin/gcc-4.2␊
PPC_CPP = /usr/bin/g++-4.2␊
␊
␊
␊
##### PPC Rules #####␊
$(OBJROOT)/%.ppco: %.c $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.c $(OBJROOT)␊
␉@echo "\t[CC:PPC] $<"␊
␉@$(PPC_CC) -arch ppc $(PPC_CFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉@$(PPC_CC) -arch ${ARCH} $(PPC_CFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.ppco: %.m $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.m $(OBJROOT)␊
␉@echo "\t[M:PPC] $<"␊
␉@$(PPC_CC) -arch ppc $(PPC_CFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉@$(PPC_CC) -arch ${ARCH} $(PPC_CFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.ppco: %.cpp $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.cpp $(OBJROOT)␊
␉@echo "\t[CPP:PPC] $<"␊
␉@$(PPC_CPP) -arch ppc $(PPC_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉@$(PPC_CPP) -arch ${ARCH} $(PPC_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␉␊
$(OBJROOT)/%.ppco: %.s␊
$(OBJROOT)/%.${ARCH}o: %.s␊
␉@echo "\t[AS:PPC] $<"␊
␉@$(PPC_CC) $(CPPFLAGS) -c $(INC) -arch ppc -o $@ $< \␊
␉@$(PPC_CC) -arch ${ARCH} $(CPPFLAGS) -c $(INC) -arch ppc -o $@ $< \␊
␉␉ -MD -dependency-file $*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $*.d␊
␊
␉␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .ppco, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .ppco, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))␊
branches/xZen/src/arch/i386/Make.rules
44
55
66
7
7
88
99
1010
1111
1212
13
13
1414
1515
1616
1717
1818
19
19
2020
2121
2222
2323
2424
25
25
2626
2727
2828
2929
3030
31
32
33
31
32
X86_CPP = /usr/bin/g++-4.2␊
␊
##### i386 Rules #####␊
$(OBJROOT)/%.i386o: %.c $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.c $(OBJROOT)␊
␉@echo "\t[CC:I386] $<"␊
␉@$(X86_CC) -arch i386 $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.i386o: %.m $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.m $(OBJROOT)␊
␉@echo "\t[M:I386] $<"␊
␉@$(X86_CC) -arch i386 $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.i386o: %.cpp $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.cpp $(OBJROOT)␊
␉@echo "\t[CPP:I386] $<"␊
␉@$(X86_CPP) -arch i386 $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.i386o: %.s␊
$(OBJROOT)/%.${ARCH}o: %.s␊
␉@echo "\t[AS:I386] $<"␊
␉@$(X86_CC) $(CPPFLAGS) -c $(INC) -arch i386 -o $@ $< \␊
␉␉ -MD -dependency-file $*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $*.d␊
␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .i386o , $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .i386o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o , $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))␊
branches/xZen/src/arch/armv5/Make.rules
1
2
1
32
4
5
6
7
3
4
5
6
87
98
109
......
1514
1615
1716
18
17
1918
20
19
2120
2221
2322
24
23
2524
26
25
2726
2827
2928
30
29
3130
32
31
3332
3433
3534
36
35
3736
38
37
3938
4039
4140
4241
43
44
42
43
ARM_ARCH = armv5␊
ARM_CPU = arm926ej-s␊
CPU = arm926ej-s␊
␊
ARM_AS = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/as -arch ${ARM_ARCH}␊
ARM_LD = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ld -arch ${ARM_ARCH}␊
ARM_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -mcpu=${ARM_CPU}␊
ARM_CPP = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -mcpu=${ARM_CPU}␊
ARM_AS = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/as -arch ${ARCH}␊
ARM_LD = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ld -arch ${ARCH}␊
ARM_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -mcpu=${CPU}␊
ARM_CPP = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -mcpu=${CPU}␊
␊
ARM_SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk/␊
AMR_CFLAGS += -I"$(ARM_SDK)/usr/include"␊
␊
␊
##### ARM Rules #####␊
$(OBJROOT)/%.armo: %.c $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.c $(OBJROOT)␊
␉@echo "\t[CC:ARM] $<"␊
␉@$(ARM_CC) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉@$(ARM_CC) -arch ${ARCH} ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.armo: %.m $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.m $(OBJROOT)␊
␉@echo "\t[M:ARM] $<"␊
␉@$(ARM_CC) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉@$(ARM_CC) -arch ${ARCH} ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.armo: %.cpp $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.cpp $(OBJROOT)␊
␉@echo "\t[CPP:ARM] $<"␊
␉@$(ARM_CPP) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉@$(ARM_CPP) -arch ${ARCH} ${AMR_CFLAGS} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␉␊
$(OBJROOT)/%.armo: %.s␊
$(OBJROOT)/%.${ARCH}o: %.s␊
␉@echo "\t[AS:I386] $<"␊
␉@$(ARM_CC) -arch ${ARM_ARCH} $(CPPFLAGS) -c $(INC) -o $@ $< \␊
␉@$(ARM_CC) -arch ${ARCH} $(CPPFLAGS) -c $(INC) -o $@ $< \␊
␉␉ -MD -dependency-file $*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $*.d␊
␊
␉␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .armo, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .armo, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))␊
branches/xZen/src/arch/x86_64/Make.rules
1
2
1
2
33
44
55
66
77
8
8
99
10
10
1111
1212
1313
14
14
1515
16
16
1717
1818
1919
20
20
2121
22
22
2323
2424
2525
26
26
2727
28
28
2929
3030
3131
3232
33
33
3434
35
35
X86_AS = /usr/bin/as␊
X86_LD = /usr/bin/ld␊
X86_AS = /usr/bin/as -arch ${ARCH}␊
X86_LD = /usr/bin/ld -arch ${ARCH}␊
X86_CC = /usr/bin/gcc-4.2␊
X86_CPP = /usr/bin/g++-4.2␊
␊
##### x86_64 Rules #####␊
␊
$(OBJROOT)/%.x86_64o: %.c $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.c $(OBJROOT)␊
␉@echo "\t[CC:X86_64] $<"␊
␉@$(X86_CC) -arch x86_64 $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉@$(X86_CC) -arch ${ARCH} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.x86_64o: %.m $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.m $(OBJROOT)␊
␉@echo "\t[M:X86_64] $<"␊
␉@$(X86_CC) -arch x86_64 $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉@$(X86_CC) -arch ${ARCH} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␊
$(OBJROOT)/%.x86_64o: %.x86_64 $(OBJROOT)␊
$(OBJROOT)/%.${ARCH}o: %.cpp $(OBJROOT)␊
␉@echo "\t[CPP:X86_64] $<"␊
␉@$(X86_CPP) -arch i386 $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉@$(X86_CPP) -arch ${ARCH} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \␊
␉ -MD -dependency-file $(OBJROOT)/$*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d␊
␉␊
$(OBJROOT)/%.x86_64o: %.s␊
$(OBJROOT)/%.${ARCH}o: %.s␊
␉@echo "\t[AS:X86_64] $<"␊
␉@$(CC) $(CPPFLAGS) -c $(INC) -arch x86_64 -o $@ $< \␊
␉@$(CC) -arch ${ARCH} $(CPPFLAGS) -c $(INC) -arch x86_64 -o $@ $< \␊
␉␉ -MD -dependency-file $*.d␊
␉@md -u $(OBJROOT)/Makedep -f -d $*.d␊
␊
␉␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .x86_64o, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS)))␊
␊
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .x86_64o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))
MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS)))

Archive Download the corresponding diff file

Revision: 1258