Chameleon

Chameleon Commit Details

Date:2011-08-03 03:13:38 (8 years 3 months ago)
Author:Evan Lojewski
Commit:1254
Parents: 1253
Message:Branch update - convert arm to armv5, NOTE: must use Xcode3.2.5 to compile properly
Changes:
M/branches/xZen/src/arm/Make.rules
M/branches/xZen/src/modules/Makefile
M/branches/xZen/Makefile
M/branches/xZen/src/Make.rules
M/branches/xZen/src/util/Makefile
M/branches/xZen/src/util/fdisk/Makefile
M/branches/xZen/src/modules/MakeInc.dir

File differences

branches/xZen/src/arm/Make.rules
1
2
3
4
1
2
53
6
4
5
6
7
8
9
710
811
912
......
1417
1518
1619
17
20
1821
1922
2023
2124
2225
23
26
2427
2528
2629
2730
2831
29
32
3033
3134
3235
3336
3437
35
38
3639
3740
3841
ARM_AS = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/as -arch arm
ARM_LD = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ld -arch arm
ARM_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
ARM_CPP = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2
ARM_ARCH = armv5
ARM_CPU = arm926ej-s
ARM_SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/
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_SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk/
AMR_CFLAGS += -I"$(ARM_SDK)/usr/include"
ARM_LDFLAGS += -L"$(ARM_SDK)/usr/lib"
ARM_LDFLAGS += -L"$(ARM_SDK)/usr/lib/system/"
##### ARM Rules #####
$(OBJROOT)/%.armo: %.c $(OBJROOT)
@echo "\t[CC:ARM] $<"
@$(ARM_CC) -arch arm ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \
@$(ARM_CC) -arch ${ARM_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)
@echo "\t[M:ARM] $<"
@$(ARM_CC) -arch arm ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \
@$(ARM_CC) -arch ${ARM_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)
@echo "\t[CPP:ARM] $<"
@$(ARM_CPP) -arch arm ${AMR_CFLAGS} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \
@$(ARM_CPP) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \
-MD -dependency-file $(OBJROOT)/$*.d
@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
$(OBJROOT)/%.armo: %.s
@echo "\t[AS:I386] $<"
@$(ARM_CC) $(CPPFLAGS) -c $(INC) -arch arm -o $@ $< \
@$(ARM_CC) -arch ${ARM_ARCH} $(CPPFLAGS) -c $(INC) -o $@ $< \
-MD -dependency-file $*.d
@md -u $(OBJROOT)/Makedep -f -d $*.d
branches/xZen/src/Make.rules
11
22
3
34
45
56
-include $(SRCROOT)/auto.conf
-include ${SRCROOT}/i386/Make.rules
#-include ${SRCROOT}/x86_64/Make.rules
-include ${SRCROOT}/ppc/Make.rules
branches/xZen/src/modules/MakeInc.dir
133133
134134
135135
136
136
137137
138138
139139
140140
141141
142142
143
143
144144
145145
146146
......
149149
150150
151151
152
152
153153
154154
155155
-o $(SYMROOT)/$(MODULE_NAME).ppc.dylib
@echo "\t[LD:ARM] $(MODULE_NAME).dylib"
@ld -arch arm -undefined dynamic_lookup \
@ld -arch ${ARM_ARCH} -undefined dynamic_lookup \
-dylib -read_only_relocs suppress \
-S -x -Z -dead_strip_dylibs \
-no_uuid \
-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
-final_output $(MODULE_NAME) \
$(filter %.armo,$^) \
/Developer/Platforms/iPhoneOS.platform//Developer/SDKs/iPhoneOS4.3.sdk/usr/lib/dylib1.o \
/Developer/Platforms/iPhoneOS.platform//Developer/SDKs/iPhoneOS4.2.sdk/usr/lib/dylib1.o \
-macosx_version_min 10.6 \
-sectcreate __INFO __author $(OBJROOT)/$(MODULE_NAME).author \
-sectcreate __INFO __description $(OBJROOT)/$(MODULE_NAME).desc \
@echo "\t[LIPO] $(@F)"
@lipo -create -arch i386 $(SYMROOT)/$(MODULE_NAME).i386.dylib \
-arch ppc $(SYMROOT)/$(MODULE_NAME).ppc.dylib \
-arch arm $(SYMROOT)/$(MODULE_NAME).arm.dylib \
-arch ${ARM_ARCH} $(SYMROOT)/$(MODULE_NAME).arm.dylib \
-output $(SYMROOT)/$(MODULE_NAME).dylib
@rm $(SYMROOT)/$(MODULE_NAME).i386.dylib $(SYMROOT)/$(MODULE_NAME).ppc.dylib $(SYMROOT)/$(MODULE_NAME).arm.dylib
branches/xZen/src/modules/Makefile
6262
6363
6464
65
66
67
@echo "// Autogenerated - do not modify" > $@
@echo "void start_built_in_modules(); " > $@
endif
.PHONEY: $(SYMROOT)/boot_modules.c
.PHONEY: $(SYMROOT)/boot_modules.h
branches/xZen/src/util/fdisk/Makefile
2222
2323
2424
25
26
25
26
2727
2828
2929
3030
3131
3232
33
33
3434
3535
3636
$(PROGRAM): $(ACTUAL_OBJECTS)
@echo "\t[LD:I386] $(@F)"
@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F).i386 $(OBJROOT)/*.i386o
@echo "\t[LD:X86_64] $(@F)"
@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/*.x86_64o
@#echo "\t[LD:X86_64] $(@F)"
@#$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/*.x86_64o
@echo "\t[LD:PPC] $(@F)"
@$(PPC_CC) $(CFLAGS) $(PPC_LDFLAGS) $(LDFLAGS) $(DEFINES) -arch ppc -o $(SYMROOT)/$(@F).ppc $(OBJROOT)/*.ppco
@#echo "\t[LD:ARM] $(@F)"
@#$(ARM_CC) $(CFLAGS) $(ARM_LDFLAGS) $(LDFLAGS) $(DEFINES) -arch arm -o $(SYMROOT)/$(@F).arm $(OBJROOT)/*.armo
@echo "\t[LIPO] $(@F)"
@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch x86_64 $(SYMROOT)/$(@F).x86_64 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@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
branches/xZen/src/util/Makefile
1414
1515
1616
17
17
1818
1919
2020
......
3333
3434
3535
36
3736
3837
3938
40
4139
4240
4341
44
4542
4643
4744
48
49
45
46
5047
5148
5249
......
5451
5552
5653
57
58
54
55
5956
6057
6158
DIR = util
PROGRAMS = machOconv dyldsymboltool
OBJECTS = dyldsymboltool machOconv
OBJECTS = machOconv dyldsymboltool
ifeq (${CONFIG_BDMESG}, y)
PROGRAMS += bdmesg
DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
include ${ROOT}/Make.rules
all: $(DIRS_NEEDED) $(SYMPROG) fdisk440
$(SYMPROG): ${ACTUAL_OBJECTS}
@echo "\t[LD:I386] $(@F)"
@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F).i386 $(OBJROOT)/$(@F).i386o
@echo "\t[LD:X86_64] $(@F)"
@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/$(@F).x86_64o
@#echo "\t[LD:X86_64] $(@F)"
@#$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/$(@F).x86_64o
@echo "\t[LD:PPC] $(@F)"
@$(PPC_CC) $(CFLAGS) $(PPC_LDFLAGS) $(LDFLAGS) $(DEFINES) -arch ppc -o $(SYMROOT)/$(@F).ppc $(OBJROOT)/$(@F).ppco
@#echo "\t[LD:ARM] $(@F)"
@echo "\t[LIPO] $(@F)"
@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch x86_64 $(SYMROOT)/$(@F).x86_64 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)
@$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).x86_64 $(SYMROOT)/$(@F).ppc
@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)
@$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).ppc
.PHONY: fdisk440
fdisk440:
branches/xZen/Makefile
88
99
1010
11
12
1113
1214
1315
......
2931
3032
3133
34
3235
3336
3437
include Make.rules
ARCHS="i386 ppc arm"
THEME = default
REVISION = `svnversion -n | tr -d [:alpha:] > revision`
if [ -d $$i ]; then \
echo ================= make $@ for $$i =================; \
( ROOT=$(ROOT); \
ARCHS=$(ARCHS) \
cd $$i; ${MAKE} \
$@ \
) || exit $$?; \

Archive Download the corresponding diff file

Revision: 1254